clarified JEDIT_JAVA_OPTIONS: separate defaults for 32 vs. 64 bit;
--- a/src/Tools/jEdit/etc/settings Tue Sep 08 13:40:37 2015 +0200
+++ b/src/Tools/jEdit/etc/settings Tue Sep 08 13:52:13 2015 +0200
@@ -4,9 +4,9 @@
JEDIT_SETTINGS="$ISABELLE_HOME_USER/jedit"
JEDIT_OPTIONS="-reuseview -noserver -nobackground -log=9"
-#JEDIT_JAVA_OPTIONS="-Xms128m -Xmx512m -Xss1m"
-JEDIT_JAVA_OPTIONS="-Xms128m -Xmx1024m -Xss4m"
-#JEDIT_JAVA_OPTIONS="-Xms512m -Xmx4096m -Xss8m"
+
+JEDIT_JAVA_OPTIONS32="-Xms128m -Xmx1024m -Xss4m"
+JEDIT_JAVA_OPTIONS64="-Xms512m -Xmx4096m -Xss8m"
JEDIT_JAVA_SYSTEM_OPTIONS="-Duser.language=en -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.application.name=Isabelle"
ISABELLE_JEDIT_OPTIONS=""
--- a/src/Tools/jEdit/lib/Tools/jedit Tue Sep 08 13:40:37 2015 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit Tue Sep 08 13:52:13 2015 +0200
@@ -5,6 +5,18 @@
# DESCRIPTION: Isabelle/jEdit interface wrapper
+## settings
+
+case "$ISABELLE_JAVA_PLATFORM" in
+ x86_64-*)
+ JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS64"
+ ;;
+ *)
+ JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS32"
+ ;;
+esac
+
+
## sources
declare -a SOURCES=(
@@ -81,9 +93,7 @@
echo "Usage: isabelle $PRG [OPTIONS] [FILES ...]"
echo
echo " Options are:"
- echo " -J OPTION add JVM runtime option (defaults"
- echo " JEDIT_JAVA_SYSTEM_OPTIONS=$JEDIT_JAVA_SYSTEM_OPTIONS"
- echo " JEDIT_JAVA_OPTIONS=$JEDIT_JAVA_OPTIONS)"
+ echo " -J OPTION add JVM runtime option (default $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
echo " -b build only"
echo " -d DIR include session directory"
echo " -f fresh build"