Mercurial Mercurial > repos > isabelle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
direct scala toplevel tools to ISABELLE_JDK_HOME;
authorwenzelm
Thu, 12 Apr 2012 23:03:25 +0200
changeset 47441 2fa904af222f
parent 47440 22086019167b
child 47442 3efc06fc8d61
direct scala toplevel tools to ISABELLE_JDK_HOME;
lib/Tools/scala file | annotate | diff | comparison | revisions
lib/Tools/scalac file | annotate | diff | comparison | revisions 
--- 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")" "$@"
--- 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")" "$@"
isabelle