more robust determination of java executable;
authorwenzelm
Tue Nov 16 22:13:54 2010 +0100 (2010-11-16)
changeset 40571fbac01813bff
parent 40570 bf8f92bdf630
child 40572 2315c3daee74
more robust determination of java executable;
Isabelle
etc/settings
     1.1 --- a/Isabelle	Tue Nov 16 21:54:52 2010 +0100
     1.2 +++ b/Isabelle	Tue Nov 16 22:13:54 2010 +0100
     1.3 @@ -24,6 +24,6 @@
     1.4  [ -e "$ISABELLE_HOME/Admin/build" ] && "$ISABELLE_HOME/Admin/build" jars
     1.5  
     1.6  CLASSPATH="$(jvmpath "$CLASSPATH")"
     1.7 -exec "$ISABELLE_JAVA" \
     1.8 +exec "$ISABELLE_TOOL" java \
     1.9    "-Disabelle.home=$(jvmpath "$ISABELLE_HOME")" \
    1.10    -jar "$(jvmpath "$ISABELLE_HOME/lib/classes/isabelle-scala.jar")" "$@"
     2.1 --- a/etc/settings	Tue Nov 16 21:54:52 2010 +0100
     2.2 +++ b/etc/settings	Tue Nov 16 22:13:54 2010 +0100
     2.3 @@ -55,7 +55,11 @@
     2.4  ### JVM components (Scala or Java)
     2.5  ###
     2.6  
     2.7 -ISABELLE_JAVA="java"
     2.8 +if [ -n "$JAVA_HOME" ]; then
     2.9 +  ISABELLE_JAVA="$JAVA_HOME/bin/java"
    2.10 +else
    2.11 +  ISABELLE_JAVA="java"
    2.12 +fi
    2.13  
    2.14  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    2.15