# HG changeset patch
# User wenzelm
# Date 1441726486 -7200
# Node ID 8f7d802b7a711ccbc9c0207aa82bda06692321db
# Parent  80ac5e17772d83f9cf66f6b3d7022d5a4a88ce0c
clarified Java runtime options (NB: ISABELLE_JAVA_PLATFORM is determined later via component);

diff -r 80ac5e17772d -r 8f7d802b7a71 Admin/lib/Tools/build_doc
--- a/Admin/lib/Tools/build_doc	Tue Sep 08 15:37:13 2015 +0200
+++ b/Admin/lib/Tools/build_doc	Tue Sep 08 17:34:46 2015 +0200
@@ -4,6 +4,17 @@
 #
 # DESCRIPTION: build Isabelle documentation
 
+## settings
+
+case "$ISABELLE_JAVA_PLATFORM" in
+  x86-*)
+    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS32"
+    ;;
+  x86_64-*)
+    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS64"
+    ;;
+esac
+
 
 ## diagnostics
 
diff -r 80ac5e17772d -r 8f7d802b7a71 NEWS
--- a/NEWS	Tue Sep 08 15:37:13 2015 +0200
+++ b/NEWS	Tue Sep 08 17:34:46 2015 +0200
@@ -21,12 +21,6 @@
 At least one Debugger view needs to be active to have any effect on the
 running ML program.
 
-* Java runtime options are determined separately for 32 vs. 64 bit
-platforms. The "isabelle jedit" command-line tool is subject to settings
-variables JEDIT_JAVA_SYSTEM_OPTIONS and JEDIT_JAVA_OPTIONS32 /
-JEDIT_JAVA_OPTIONS64. The desktop application uses a separate option
-file, depending on the platform family.
-
 
 *** Isar ***
 
@@ -351,6 +345,19 @@
 * Java runtime environment for x86_64-windows allows to use larger heap
 space.
 
+* Java runtime options are determined separately for 32bit vs. 64bit
+platforms as follows.
+
+  - Isabelle desktop application: platform-specific files that are
+    associated with the main app bundle
+
+  - isabelle jedit: settings
+    JEDIT_JAVA_SYSTEM_OPTIONS
+    JEDIT_JAVA_OPTIONS32 vs. JEDIT_JAVA_OPTIONS64
+
+  - isabelle build: settings
+    ISABELLE_BUILD_JAVA_OPTIONS32 vs. ISABELLE_BUILD_JAVA_OPTIONS64
+
 
 
 New in Isabelle2015 (May 2015)
diff -r 80ac5e17772d -r 8f7d802b7a71 etc/settings
--- a/etc/settings	Tue Sep 08 15:37:13 2015 +0200
+++ b/etc/settings	Tue Sep 08 17:34:46 2015 +0200
@@ -39,14 +39,8 @@
 
 ISABELLE_BUILD_OPTIONS=""
 
-case "$ISABELLE_JAVA_PLATFORM" in
-  x86_64-*)
-    ISABELLE_BUILD_JAVA_OPTIONS="-Djava.awt.headless=true -Xms128m -Xmx1024m -Xss1m"
-    ;;
-  *)
-    ISABELLE_BUILD_JAVA_OPTIONS="-Djava.awt.headless=true -Xms512m -Xmx4096m -Xss4m"
-    ;;
-esac
+ISABELLE_BUILD_JAVA_OPTIONS32="-Djava.awt.headless=true -Xms128m -Xmx1024m -Xss1m"
+ISABELLE_BUILD_JAVA_OPTIONS64="-Djava.awt.headless=true -Xms512m -Xmx4096m -Xss4m"
 
 
 ###
diff -r 80ac5e17772d -r 8f7d802b7a71 lib/Tools/build
--- a/lib/Tools/build	Tue Sep 08 15:37:13 2015 +0200
+++ b/lib/Tools/build	Tue Sep 08 17:34:46 2015 +0200
@@ -4,6 +4,17 @@
 #
 # DESCRIPTION: build and manage Isabelle sessions
 
+## settings
+
+case "$ISABELLE_JAVA_PLATFORM" in
+  x86-*)
+    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS32"
+    ;;
+  x86_64-*)
+    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS64"
+    ;;
+esac
+
 
 ## diagnostics
 
diff -r 80ac5e17772d -r 8f7d802b7a71 lib/Tools/console
--- a/lib/Tools/console	Tue Sep 08 15:37:13 2015 +0200
+++ b/lib/Tools/console	Tue Sep 08 17:34:46 2015 +0200
@@ -4,6 +4,20 @@
 #
 # DESCRIPTION: run Isabelle process with raw ML console and line editor
 
+## settings
+
+case "$ISABELLE_JAVA_PLATFORM" in
+  x86-*)
+    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS32"
+    ;;
+  x86_64-*)
+    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS64"
+    ;;
+esac
+
+
+## diagnostics
+
 PRG="$(basename "$0")"
 
 function usage()