renamed ISABELLE_BUILD_JAVA_OPTIONS to ISABELLE_TOOL_JAVA_OPTIONS;

--- a/NEWS	Sun Apr 03 23:28:48 2016 +0200
+++ b/NEWS	Sun Apr 03 23:56:52 2016 +0200
@@ -259,6 +259,12 @@
 
 *** System ***
 
+* Many Isabelle tools that require a Java runtime system refer to the
+settings ISABELLE_TOOL_JAVA_OPTIONS32 / ISABELLE_TOOL_JAVA_OPTIONS64,
+depending on the underlying platform. The settings for "isabelle build"
+ISABELLE_BUILD_JAVA_OPTIONS32 / ISABELLE_BUILD_JAVA_OPTIONS64 have been
+discontinued. Potential INCOMPATIBILITY.
+
 * The Isabelle system environment always ensures that the main
 executables are found within the shell search $PATH: "isabelle" and
 "isabelle_scala_script".

--- a/bin/isabelle	Sun Apr 03 23:28:48 2016 +0200
+++ b/bin/isabelle	Sun Apr 03 23:56:52 2016 +0200
@@ -47,10 +47,10 @@
 
 case "$ISABELLE_JAVA_PLATFORM" in
   x86-*)
-    eval "declare -a JAVA_ARGS=($ISABELLE_BUILD_JAVA_OPTIONS32)"
+    eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS32)"
     ;;
   x86_64-*)
-    eval "declare -a JAVA_ARGS=($ISABELLE_BUILD_JAVA_OPTIONS64)"
+    eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS64)"
     ;;
 esac
 

--- a/etc/settings	Sun Apr 03 23:28:48 2016 +0200
+++ b/etc/settings	Sun Apr 03 23:56:52 2016 +0200
@@ -16,6 +16,9 @@
 
 ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
 
+ISABELLE_TOOL_JAVA_OPTIONS32="-Djava.awt.headless=true -Xms128m -Xmx1024m -Xss1m"
+ISABELLE_TOOL_JAVA_OPTIONS64="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss4m"
+
 classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
 
 #paranoia settings -- avoid intrusion of alien options
@@ -39,9 +42,6 @@
 
 ISABELLE_BUILD_OPTIONS=""
 
-ISABELLE_BUILD_JAVA_OPTIONS32="-Djava.awt.headless=true -Xms128m -Xmx1024m -Xss1m"
-ISABELLE_BUILD_JAVA_OPTIONS64="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss4m"
-
 
 ###
 ### Document preparation (cf. isabelle latex/document)

--- a/lib/Tools/console	Sun Apr 03 23:28:48 2016 +0200
+++ b/lib/Tools/console	Sun Apr 03 23:56:52 2016 +0200
@@ -8,14 +8,14 @@
 
 case "$ISABELLE_JAVA_PLATFORM" in
   x86-*)
-    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS32"
+    ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS32"
     ;;
   x86_64-*)
-    ISABELLE_BUILD_JAVA_OPTIONS="$ISABELLE_BUILD_JAVA_OPTIONS64"
+    ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS64"
     ;;
 esac
 
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_BUILD_JAVA_OPTIONS)"
+declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
 
 mkdir -p "$ISABELLE_TMP_PREFIX" || exit $?
 

--- a/src/Doc/System/Sessions.thy	Sun Apr 03 23:28:48 2016 +0200
+++ b/src/Doc/System/Sessions.thy	Sun Apr 03 23:56:52 2016 +0200
@@ -270,7 +270,6 @@
   Build and manage Isabelle sessions, depending on implicit settings:
 
   ISABELLE_BUILD_OPTIONS="..."
-  ISABELLE_BUILD_JAVA_OPTIONS="..."
 
   ML_PLATFORM="..."
   ML_HOME="..."

--- a/src/Pure/Tools/build.scala	Sun Apr 03 23:28:48 2016 +0200
+++ b/src/Pure/Tools/build.scala	Sun Apr 03 23:56:52 2016 +0200
@@ -693,8 +693,6 @@
       cat_lines(List(
         "ISABELLE_BUILD_OPTIONS=" +
           quote(Isabelle_System.getenv("ISABELLE_BUILD_OPTIONS")),
-        "ISABELLE_BUILD_JAVA_OPTIONS=" +
-          quote(Isabelle_System.getenv("ISABELLE_BUILD_JAVA_OPTIONS")),
         "",
         "ML_PLATFORM=" + quote(Isabelle_System.getenv("ML_PLATFORM")),
         "ML_HOME=" + quote(Isabelle_System.getenv("ML_HOME")),