# HG changeset patch
# User wenzelm
# Date 1289942034 -3600
# Node ID fbac01813bff852bb514686fa19e348bec977bd3
# Parent  bf8f92bdf6307f1edd875897eae2daf9a2114b75
more robust determination of java executable;

diff -r bf8f92bdf630 -r fbac01813bff Isabelle
--- a/Isabelle	Tue Nov 16 21:54:52 2010 +0100
+++ b/Isabelle	Tue Nov 16 22:13:54 2010 +0100
@@ -24,6 +24,6 @@
 [ -e "$ISABELLE_HOME/Admin/build" ] && "$ISABELLE_HOME/Admin/build" jars
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
-exec "$ISABELLE_JAVA" \
+exec "$ISABELLE_TOOL" java \
   "-Disabelle.home=$(jvmpath "$ISABELLE_HOME")" \
   -jar "$(jvmpath "$ISABELLE_HOME/lib/classes/isabelle-scala.jar")" "$@"
diff -r bf8f92bdf630 -r fbac01813bff etc/settings
--- a/etc/settings	Tue Nov 16 21:54:52 2010 +0100
+++ b/etc/settings	Tue Nov 16 22:13:54 2010 +0100
@@ -55,7 +55,11 @@
 ### JVM components (Scala or Java)
 ###
 
-ISABELLE_JAVA="java"
+if [ -n "$JAVA_HOME" ]; then
+  ISABELLE_JAVA="$JAVA_HOME/bin/java"
+else
+  ISABELLE_JAVA="java"
+fi
 
 classpath "$ISABELLE_HOME/lib/classes/Pure.jar"