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.
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 36212 ebfa4bb0d50f
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 file | annotate | diff | comparison | revisions
lib/Tools/java file | annotate | diff | comparison | revisions 
--- a/etc/settings	Tue Apr 20 06:53:50 2010 +0200
+++ b/etc/settings	Tue Apr 20 11:26:25 2010 +0200
@@ -55,7 +55,7 @@
 ### JVM components (Scala or Java)
 ###
 
-ISABELLE_JAVA="${THIS_JAVA:-java}"
+ISABELLE_JAVA="java"
 ISABELLE_SCALA="scala"
 
 [ -z "$SCALA_HOME" ] && SCALA_HOME=$(choosefrom \
--- a/lib/Tools/java	Tue Apr 20 06:53:50 2010 +0200
+++ b/lib/Tools/java	Tue Apr 20 11:26:25 2010 +0200
@@ -5,4 +5,4 @@
 # DESCRIPTION: invoke Java within the Isabelle environment
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
-exec "$ISABELLE_JAVA" "$@"
+exec "${THIS_JAVA:-ISABELLE_JAVA}" "$@"
isabelle