--- a/Admin/components/components.sha1 Mon Oct 23 14:45:10 2017 +0200
+++ b/Admin/components/components.sha1 Mon Oct 23 20:21:36 2017 +0200
@@ -82,6 +82,7 @@
ae7df8bd0c18eb40237cf54cc28933f4893b9c92 jdk-8u121.tar.gz
51531a3a0c16e180ed95cb7d2bd680c2ec0aa553 jdk-8u131.tar.gz
e45edcf184f608d6f4a7b966d65a5d3289462693 jdk-8u144.tar.gz
+264e806b9300a4fb3b6e15ba0e2c664d4ea698c8 jdk-8u152.tar.gz
cfecb1383faaf027ffbabfcd77a0b6a6521e0969 jdk-8u20.tar.gz
44ffeeae219782d40ce6822b580e608e72fd4c76 jdk-8u31.tar.gz
4132cf52d5025bf330d53b96a5c6466fef432377 jdk-8u51.tar.gz
--- a/Admin/components/main Mon Oct 23 14:45:10 2017 +0200
+++ b/Admin/components/main Mon Oct 23 20:21:36 2017 +0200
@@ -4,7 +4,7 @@
cvc4-1.5-3
e-2.0-1
isabelle_fonts-20160830
-jdk-8u144
+jdk-8u152
jedit_build-20170319
jfreechart-1.0.14-1
jortho-1.0-2
--- a/Admin/lib/Tools/makedist_bundle Mon Oct 23 14:45:10 2017 +0200
+++ b/Admin/lib/Tools/makedist_bundle Mon Oct 23 20:21:36 2017 +0200
@@ -191,28 +191,19 @@
case "$PLATFORM_FAMILY" in
linux)
purge_target 'contrib -name "x86*-darwin" -o -name "x86*-cygwin" -o -name "x86*-windows"'
- purge_jdk "x86-linux"
purge_jdk "x86_64-linux"
- for PLATFORM in 32 64
- do
- (
- init_component "$JEDIT_HOME"
+ (
+ init_component "$JEDIT_HOME"
- echo "# Java runtime options for ${PLATFORM}bit platform"
- declare -a JAVA_ARGS
- if [ "$PLATFORM" = 32 ]; then
- eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS32)"
- else
- eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
- fi
- for ARG in "${JAVA_ARGS[@]}"
- do
- echo "$ARG"
- done
- echo "-Disabelle.jedit_server=${ISABELLE_NAME}"
- ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.options${PLATFORM}"
- done
+ echo "# Java runtime options"
+ eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
+ for ARG in "${JAVA_ARGS[@]}"
+ do
+ echo "$ARG"
+ done
+ echo "-Disabelle.jedit_server=${ISABELLE_NAME}"
+ ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.options"
LINUX_CLASSPATH=""
for ENTRY in "${DISTRIBITION_CLASSPATH[@]}"
@@ -258,9 +249,8 @@
(
init_component "$JEDIT_HOME"
- declare -a JAVA_ARGS=()
- echo -e "# Java runtime options for 64bit platform\r"
- eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
+ echo -e "# Java runtime options\r"
+ eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
for ARG in "${JAVA_ARGS[@]}"
do
echo -e "$ARG\r"
@@ -366,7 +356,7 @@
cat "$APP_TEMPLATE/Info.plist-part1"
declare -a OPTIONS=()
- eval "OPTIONS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
+ eval "OPTIONS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
for OPT in "${OPTIONS[@]}"
do
echo "<string>$OPT</string>"
--- a/NEWS Mon Oct 23 14:45:10 2017 +0200
+++ b/NEWS Mon Oct 23 20:21:36 2017 +0200
@@ -69,6 +69,10 @@
* Windows and Cygwin is for x86_64 only. Old 32bit platform support has
been discontinued.
+* Java runtime is for x86_64 only. Corresponding Isabelle settings have
+been renamed to ISABELLE_TOOL_JAVA_OPTIONS and JEDIT_JAVA_OPTIONS,
+instead of former 32/64 variants. INCOMPATIBILITY.
+
* Command-line tool "isabelle build" supports new options:
- option -B NAME: include session NAME and all descendants
- option -S: only observe changes of sources, not heap images
--- a/bin/isabelle Mon Oct 23 14:45:10 2017 +0200
+++ b/bin/isabelle Mon Oct 23 20:21:36 2017 +0200
@@ -45,13 +45,5 @@
isabelle_admin_build jars || exit $?
-case "$ISABELLE_JAVA_PLATFORM" in
- x86-*)
- eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS32)"
- ;;
- x86_64-*)
- eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS64)"
- ;;
-esac
-
+eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
exec isabelle java "${JAVA_ARGS[@]}" isabelle.Isabelle_Tool "$@"
--- a/bin/isabelle_java Mon Oct 23 14:45:10 2017 +0200
+++ b/bin/isabelle_java Mon Oct 23 20:21:36 2017 +0200
@@ -14,16 +14,7 @@
(
source "$ISABELLE_HOME/lib/scripts/getsettings" || exit 2
- case "$ISABELLE_JAVA_PLATFORM" in
- x86-*)
- ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS32"
- ;;
- x86_64-*)
- ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS64"
- ;;
- esac
-
- declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $ISABELLE_TOOL_JAVA_OPTIONS)"
+ eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $ISABELLE_TOOL_JAVA_OPTIONS)"
if [ -f "$ISABELLE_HOME/src/Tools/jEdit/dist/jedit.jar" ]; then
classpath "$ISABELLE_HOME/src/Tools/jEdit/dist/jedit.jar"
--- a/etc/settings Mon Oct 23 14:45:10 2017 +0200
+++ b/etc/settings Mon Oct 23 20:21:36 2017 +0200
@@ -16,8 +16,7 @@
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"
+ISABELLE_TOOL_JAVA_OPTIONS="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss4m"
classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
--- a/lib/Tools/console Mon Oct 23 14:45:10 2017 +0200
+++ b/lib/Tools/console Mon Oct 23 20:21:36 2017 +0200
@@ -6,16 +6,7 @@
isabelle_admin_build jars || exit $?
-case "$ISABELLE_JAVA_PLATFORM" in
- x86-*)
- ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS32"
- ;;
- x86_64-*)
- ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS64"
- ;;
-esac
-
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
+eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
mkdir -p "$ISABELLE_TMP_PREFIX" || exit $?
--- a/lib/Tools/java Mon Oct 23 14:45:10 2017 +0200
+++ b/lib/Tools/java Mon Oct 23 20:21:36 2017 +0200
@@ -4,11 +4,10 @@
#
# DESCRIPTION: invoke Java within the Isabelle environment
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
+eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
[ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
unset CLASSPATH
isabelle_java java "${JAVA_ARGS[@]}" \
-classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
-
--- a/lib/Tools/scala Mon Oct 23 14:45:10 2017 +0200
+++ b/lib/Tools/scala Mon Oct 23 20:21:36 2017 +0200
@@ -6,7 +6,7 @@
isabelle_admin_build jars || exit $?
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
+eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
declare -a SCALA_ARGS=()
for ARG in "${JAVA_ARGS[@]}"
do
--- a/src/Doc/System/Environment.thy Mon Oct 23 14:45:10 2017 +0200
+++ b/src/Doc/System/Environment.thy Mon Oct 23 20:21:36 2017 +0200
@@ -178,7 +178,7 @@
\<^descr>[@{setting_def ISABELLE_JAVA_PLATFORM}] identifies the hardware and
operating system platform for the Java installation of Isabelle. That is
- usually the (native) 64 bit variant: \<^verbatim>\<open>x86_64-linux\<close>, \<^verbatim>\<open>x86_64-darwin\<close>,
+ always the (native) 64 bit variant: \<^verbatim>\<open>x86_64-linux\<close>, \<^verbatim>\<open>x86_64-darwin\<close>,
\<^verbatim>\<open>x86_64-windows\<close>.
\<^descr>[@{setting_def ISABELLE_PATH}] is a list of directories (separated by
--- a/src/Pure/Admin/build_jdk.scala Mon Oct 23 14:45:10 2017 +0200
+++ b/src/Pure/Admin/build_jdk.scala Mon Oct 23 20:21:36 2017 +0200
@@ -46,9 +46,8 @@
}
}
val jdk_platforms =
- List(JDK_Platform("x86-linux", "bin/java", """.*ELF 32-bit.*80386.*""".r),
+ List(
JDK_Platform("x86_64-linux", "bin/java", """.*ELF 64-bit.*x86[-_]64.*""".r),
- JDK_Platform("x86-windows", "bin/java.exe", """.*PE32 executable.*80386.*""".r),
JDK_Platform("x86_64-windows", "bin/java.exe", """.*PE32\+ executable.*x86[-_]64.*""".r),
JDK_Platform("x86_64-darwin", "Contents/Home/bin/java", """.*Mach-O 64-bit.*x86[-_]64.*""".r))
@@ -74,26 +73,16 @@
case "$ISABELLE_PLATFORM_FAMILY" in
linux)
- ISABELLE_JAVA_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}"
+ ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
;;
windows)
- if [ ! -e "$COMPONENT/x86_64-windows" ]; then
- ISABELLE_JAVA_PLATFORM="x86-windows"
- elif "$COMPONENT/x86_64-windows/jre/bin/java" -version > /dev/null 2> /dev/null; then
- ISABELLE_JAVA_PLATFORM="x86_64-windows"
- else
- ISABELLE_JAVA_PLATFORM="x86-windows"
- fi
+ ISABELLE_JAVA_PLATFORM="$ISABELLE_WINDOWS_PLATFORM64"
ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
;;
macos)
- if [ -z "$ISABELLE_PLATFORM64" ]; then
- echo "### Java unavailable on 32bit Mac OS X" >&2
- else
- ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
- ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM/Contents/Home"
- fi
+ ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
+ ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM/Contents/Home"
;;
esac
"""
@@ -225,7 +214,7 @@
-D DIR target directory (default ".")
Build jdk component from tar.gz archives, with original jdk installations
- for Linux (x86, x86_64), Windows (x86, x86_64), Mac OS X (x86_64).
+ for x86_64 Linux, Windows, Mac OS X.
""",
"D:" -> (arg => target_dir = Path.explode(arg)))
--- a/src/Pure/Tools/build_docker.scala Mon Oct 23 14:45:10 2017 +0200
+++ b/src/Pure/Tools/build_docker.scala Mon Oct 23 20:21:36 2017 +0200
@@ -63,7 +63,6 @@
"""
RUN tar xzf Isabelle.tar.gz && \
mv """ + isabelle_name + """ Isabelle && \
- rm -rf Isabelle.tar.gz Isabelle/contrib/jdk/x86-linux && \
perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings && \
perl -pi -e 's,ISABELLE_LOGIC=.*,ISABELLE_LOGIC=""" + logic + """,g;' Isabelle/etc/settings && \
Isabelle/bin/isabelle build -s -b """ + logic +
--- a/src/Tools/jEdit/etc/settings Mon Oct 23 14:45:10 2017 +0200
+++ b/src/Tools/jEdit/etc/settings Mon Oct 23 20:21:36 2017 +0200
@@ -5,12 +5,10 @@
JEDIT_OPTIONS="-reuseview -nobackground -log=9"
-JEDIT_JAVA_OPTIONS32="-Xms128m -Xmx1024m -Xss4m"
-JEDIT_JAVA_OPTIONS64="-Xms512m -Xmx2560m -Xss8m"
+JEDIT_JAVA_OPTIONS="-Xms512m -Xmx2560m -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=""
ISABELLE_TOOLS="$ISABELLE_TOOLS:$JEDIT_HOME/lib/Tools"
ISABELLE_DOCS="$ISABELLE_DOCS:$JEDIT_HOME/dist/doc"
-
--- a/src/Tools/jEdit/lib/Tools/jedit Mon Oct 23 14:45:10 2017 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit Mon Oct 23 20:21:36 2017 +0200
@@ -5,18 +5,6 @@
# 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_BASE=(
@@ -212,7 +200,7 @@
done
}
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
+eval "declare -a JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
declare -a ARGS=()
--- a/src/Tools/jEdit/lib/Tools/jedit_client Mon Oct 23 14:45:10 2017 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit_client Mon Oct 23 20:21:36 2017 +0200
@@ -8,16 +8,7 @@
SERVER_NAME="${ISABELLE_IDENTIFIER:-Isabelle}"
-case "$ISABELLE_JAVA_PLATFORM" in
- x86_64-*)
- JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS64"
- ;;
- *)
- JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS32"
- ;;
-esac
-
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
+eval "declare -a JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
## diagnostics