refer to THIS_JAVA dynamically, and treat ISABELLE_JAVA as static default -- relevant for nested JVM invocation within an existing Isabelle enviroment;
authorwenzelm
Tue, 20 Apr 2010 11:26:25 +0200
changeset 36212ebfa4bb0d50f
parent 36211 27137425b102
child 36213 4df49260bd82
refer to THIS_JAVA dynamically, and treat ISABELLE_JAVA as static default -- relevant for nested JVM invocation within an existing Isabelle enviroment;
etc/settings
lib/Tools/java
     1.1 --- a/etc/settings	Tue Apr 20 06:53:50 2010 +0200
     1.2 +++ b/etc/settings	Tue Apr 20 11:26:25 2010 +0200
     1.3 @@ -55,7 +55,7 @@
     1.4  ### JVM components (Scala or Java)
     1.5  ###
     1.6  
     1.7 -ISABELLE_JAVA="${THIS_JAVA:-java}"
     1.8 +ISABELLE_JAVA="java"
     1.9  ISABELLE_SCALA="scala"
    1.10  
    1.11  [ -z "$SCALA_HOME" ] && SCALA_HOME=$(choosefrom \
     2.1 --- a/lib/Tools/java	Tue Apr 20 06:53:50 2010 +0200
     2.2 +++ b/lib/Tools/java	Tue Apr 20 11:26:25 2010 +0200
     2.3 @@ -5,4 +5,4 @@
     2.4  # DESCRIPTION: invoke Java within the Isabelle environment
     2.5  
     2.6  CLASSPATH="$(jvmpath "$CLASSPATH")"
     2.7 -exec "$ISABELLE_JAVA" "$@"
     2.8 +exec "${THIS_JAVA:-ISABELLE_JAVA}" "$@"