# HG changeset patch
# User wenzelm
# Date 1334264605 -7200
# Node ID 2fa904af222fccac35a19812699cfecd7cebb765
# Parent  22086019167befc7e4a8705342e2e48293c79901
direct scala toplevel tools to ISABELLE_JDK_HOME;

diff -r 22086019167b -r 2fa904af222f lib/Tools/scala
--- a/lib/Tools/scala	Thu Apr 12 22:59:00 2012 +0200
+++ b/lib/Tools/scala	Thu Apr 12 23:03:25 2012 +0200
@@ -6,6 +6,8 @@
 
 [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
 
+export JAVA_HOME="$ISABELLE_JDK_HOME"
+
 CLASSPATH="$(jvmpath "$CLASSPATH")"
 isabelle_scala scala -Dfile.encoding=UTF-8 \
   "-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"
diff -r 22086019167b -r 2fa904af222f lib/Tools/scalac
--- a/lib/Tools/scalac	Thu Apr 12 22:59:00 2012 +0200
+++ b/lib/Tools/scalac	Thu Apr 12 23:03:25 2012 +0200
@@ -6,6 +6,8 @@
 
 [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
 
+export JAVA_HOME="$ISABELLE_JDK_HOME"
+
 CLASSPATH="$(jvmpath "$CLASSPATH")"
 isabelle_scala scalac -Dfile.encoding=UTF-8 \
   "-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"