options file for x86_64 only (amending 03a96b8c7c06);
authorwenzelm
Tue, 23 Jan 2018 17:58:09 +0100
changeset 67492 954f44210b92
parent 67491 59527ee2d6da
child 67493 c4e9e0c50487
options file for x86_64 only (amending 03a96b8c7c06);
Admin/Linux/Isabelle.run
--- a/Admin/Linux/Isabelle.run	Tue Jan 23 17:04:52 2018 +0100
+++ b/Admin/Linux/Isabelle.run	Tue Jan 23 17:58:09 2018 +0100
@@ -20,11 +20,7 @@
 # Java runtime options
 
 ISABELLE_NAME="$(basename "$0" .run)"
-if [ -z "$ISABELLE_PLATFORM64" ]; then
-  declare -a JAVA_OPTIONS=($(perl -p -e 's,#.*$,,g;' "$ISABELLE_HOME/${ISABELLE_NAME}.options32"))
-else
-  declare -a JAVA_OPTIONS=($(perl -p -e 's,#.*$,,g;' "$ISABELLE_HOME/${ISABELLE_NAME}.options64"))
-fi
+declare -a JAVA_OPTIONS=($(perl -p -e 's,#.*$,,g;' "$ISABELLE_HOME/${ISABELLE_NAME}.options"))
 
 
 # main
@@ -32,9 +28,9 @@
 #paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
 unset XMODIFIERS
 
-exec "$ISABELLE_HOME/contrib/jdk/${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}/jre/bin/java" \
+exec "$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/bin/java" \
   "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
-  "-Djava.ext.dirs=$ISABELLE_HOME/contrib/jdk/${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}/jre/lib/ext" \
+  "-Djava.ext.dirs=$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/lib/ext" \
   -classpath "{CLASSPATH}" \
   "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
   isabelle.Main "$@"