enforce our JAVA_HOME to avoid potential conflicts with other Java installations by the user;
authorwenzelm
Wed Apr 25 15:13:03 2012 +0200 (2012-04-25)
changeset 4774824550210de0b
parent 47745 de249b5ae6e2
child 47749 936df5d02dc9
enforce our JAVA_HOME to avoid potential conflicts with other Java installations by the user;
lib/Tools/scala
lib/Tools/scalac
lib/scripts/getsettings
     1.1 --- a/lib/Tools/scala	Wed Apr 25 14:24:27 2012 +0200
     1.2 +++ b/lib/Tools/scala	Wed Apr 25 15:13:03 2012 +0200
     1.3 @@ -6,8 +6,6 @@
     1.4  
     1.5  [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     1.6  
     1.7 -export JAVA_HOME="$ISABELLE_JDK_HOME"
     1.8 -
     1.9  CLASSPATH="$(jvmpath "$CLASSPATH")"
    1.10  isabelle_scala scala -Dfile.encoding=UTF-8 \
    1.11    "-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"
     2.1 --- a/lib/Tools/scalac	Wed Apr 25 14:24:27 2012 +0200
     2.2 +++ b/lib/Tools/scalac	Wed Apr 25 15:13:03 2012 +0200
     2.3 @@ -6,8 +6,6 @@
     2.4  
     2.5  [ -e "$ISABELLE_HOME/Admin/build" ] && { "$ISABELLE_HOME/Admin/build" jars || exit $?; }
     2.6  
     2.7 -export JAVA_HOME="$ISABELLE_JDK_HOME"
     2.8 -
     2.9  CLASSPATH="$(jvmpath "$CLASSPATH")"
    2.10  isabelle_scala scalac -Dfile.encoding=UTF-8 \
    2.11    "-Djava.ext.dirs=$("$ISABELLE_HOME/src/Tools/JVM/java_ext_dirs")" "$@"
     3.1 --- a/lib/scripts/getsettings	Wed Apr 25 14:24:27 2012 +0200
     3.2 +++ b/lib/scripts/getsettings	Wed Apr 25 15:13:03 2012 +0200
     3.3 @@ -203,6 +203,9 @@
     3.4    ML_IDENTIFIER="${ML_SYSTEM}_${ML_PLATFORM}"
     3.5  fi
     3.6  
     3.7 +#enforce JAVA_HOME
     3.8 +export JAVA_HOME="$ISABELLE_JDK_HOME"
     3.9 +
    3.10  ISABELLE_OUTPUT="$ISABELLE_OUTPUT/$ML_IDENTIFIER"
    3.11  
    3.12  set +o allexport