updated to jdk-8u152, which is for x86_64 only;
authorwenzelm
Mon Oct 23 19:30:39 2017 +0200 (19 months ago)
changeset 6690603a96b8c7c06
parent 66904 d9783ea1160c
child 66907 603a00f21817
updated to jdk-8u152, which is for x86_64 only;
Admin/components/components.sha1
Admin/components/main
Admin/lib/Tools/makedist_bundle
NEWS
bin/isabelle
bin/isabelle_java
etc/settings
lib/Tools/console
lib/Tools/java
lib/Tools/scala
src/Doc/System/Environment.thy
src/Pure/Admin/build_jdk.scala
src/Pure/Tools/build_docker.scala
src/Tools/jEdit/etc/settings
src/Tools/jEdit/lib/Tools/jedit
src/Tools/jEdit/lib/Tools/jedit_client
     1.1 --- a/Admin/components/components.sha1	Mon Oct 23 14:12:09 2017 +0200
     1.2 +++ b/Admin/components/components.sha1	Mon Oct 23 19:30:39 2017 +0200
     1.3 @@ -82,6 +82,7 @@
     1.4  ae7df8bd0c18eb40237cf54cc28933f4893b9c92  jdk-8u121.tar.gz
     1.5  51531a3a0c16e180ed95cb7d2bd680c2ec0aa553  jdk-8u131.tar.gz
     1.6  e45edcf184f608d6f4a7b966d65a5d3289462693  jdk-8u144.tar.gz
     1.7 +264e806b9300a4fb3b6e15ba0e2c664d4ea698c8  jdk-8u152.tar.gz
     1.8  cfecb1383faaf027ffbabfcd77a0b6a6521e0969  jdk-8u20.tar.gz
     1.9  44ffeeae219782d40ce6822b580e608e72fd4c76  jdk-8u31.tar.gz
    1.10  4132cf52d5025bf330d53b96a5c6466fef432377  jdk-8u51.tar.gz
     2.1 --- a/Admin/components/main	Mon Oct 23 14:12:09 2017 +0200
     2.2 +++ b/Admin/components/main	Mon Oct 23 19:30:39 2017 +0200
     2.3 @@ -4,7 +4,7 @@
     2.4  cvc4-1.5-3
     2.5  e-2.0-1
     2.6  isabelle_fonts-20160830
     2.7 -jdk-8u144
     2.8 +jdk-8u152
     2.9  jedit_build-20170319
    2.10  jfreechart-1.0.14-1
    2.11  jortho-1.0-2
     3.1 --- a/Admin/lib/Tools/makedist_bundle	Mon Oct 23 14:12:09 2017 +0200
     3.2 +++ b/Admin/lib/Tools/makedist_bundle	Mon Oct 23 19:30:39 2017 +0200
     3.3 @@ -191,28 +191,19 @@
     3.4  case "$PLATFORM_FAMILY" in
     3.5    linux)
     3.6      purge_target 'contrib -name "x86*-darwin" -o -name "x86*-cygwin" -o -name "x86*-windows"'
     3.7 -    purge_jdk "x86-linux"
     3.8      purge_jdk "x86_64-linux"
     3.9  
    3.10 -    for PLATFORM in 32 64
    3.11 -    do
    3.12 -      (
    3.13 -        init_component "$JEDIT_HOME"
    3.14 +    (
    3.15 +      init_component "$JEDIT_HOME"
    3.16  
    3.17 -        echo "# Java runtime options for ${PLATFORM}bit platform"
    3.18 -        declare -a JAVA_ARGS
    3.19 -        if [ "$PLATFORM" = 32 ]; then
    3.20 -          eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS32)"
    3.21 -        else
    3.22 -          eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
    3.23 -        fi
    3.24 -        for ARG in "${JAVA_ARGS[@]}"
    3.25 -        do
    3.26 -          echo "$ARG"
    3.27 -        done
    3.28 -        echo "-Disabelle.jedit_server=${ISABELLE_NAME}"
    3.29 -      ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.options${PLATFORM}"
    3.30 -    done
    3.31 +      echo "# Java runtime options"
    3.32 +      eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
    3.33 +      for ARG in "${JAVA_ARGS[@]}"
    3.34 +      do
    3.35 +        echo "$ARG"
    3.36 +      done
    3.37 +      echo "-Disabelle.jedit_server=${ISABELLE_NAME}"
    3.38 +    ) > "$ISABELLE_TARGET/${ISABELLE_NAME}.options"
    3.39  
    3.40      LINUX_CLASSPATH=""
    3.41      for ENTRY in "${DISTRIBITION_CLASSPATH[@]}"
    3.42 @@ -258,9 +249,8 @@
    3.43      (
    3.44        init_component "$JEDIT_HOME"
    3.45  
    3.46 -      declare -a JAVA_ARGS=()
    3.47 -      echo -e "# Java runtime options for 64bit platform\r"
    3.48 -      eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
    3.49 +      echo -e "# Java runtime options\r"
    3.50 +      eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
    3.51        for ARG in "${JAVA_ARGS[@]}"
    3.52        do
    3.53          echo -e "$ARG\r"
    3.54 @@ -366,7 +356,7 @@
    3.55          cat "$APP_TEMPLATE/Info.plist-part1"
    3.56  
    3.57          declare -a OPTIONS=()
    3.58 -        eval "OPTIONS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
    3.59 +        eval "OPTIONS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
    3.60          for OPT in "${OPTIONS[@]}"
    3.61          do
    3.62            echo "<string>$OPT</string>"
     4.1 --- a/NEWS	Mon Oct 23 14:12:09 2017 +0200
     4.2 +++ b/NEWS	Mon Oct 23 19:30:39 2017 +0200
     4.3 @@ -69,6 +69,10 @@
     4.4  * Windows and Cygwin is for x86_64 only. Old 32bit platform support has
     4.5  been discontinued.
     4.6  
     4.7 +* Java runtime is for x86_64 only. Corresponding Isabelle settings have
     4.8 +been renamed to ISABELLE_TOOL_JAVA_OPTIONS and JEDIT_JAVA_OPTIONS,
     4.9 +instead of former 32/64 variants. INCOMPATIBILITY.
    4.10 +
    4.11  * Command-line tool "isabelle build" supports new options:
    4.12    - option -B NAME: include session NAME and all descendants
    4.13    - option -S: only observe changes of sources, not heap images
     5.1 --- a/bin/isabelle	Mon Oct 23 14:12:09 2017 +0200
     5.2 +++ b/bin/isabelle	Mon Oct 23 19:30:39 2017 +0200
     5.3 @@ -45,13 +45,5 @@
     5.4  
     5.5  isabelle_admin_build jars || exit $?
     5.6  
     5.7 -case "$ISABELLE_JAVA_PLATFORM" in
     5.8 -  x86-*)
     5.9 -    eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS32)"
    5.10 -    ;;
    5.11 -  x86_64-*)
    5.12 -    eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS64)"
    5.13 -    ;;
    5.14 -esac
    5.15 -
    5.16 +eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
    5.17  exec isabelle java "${JAVA_ARGS[@]}" isabelle.Isabelle_Tool "$@"
     6.1 --- a/bin/isabelle_java	Mon Oct 23 14:12:09 2017 +0200
     6.2 +++ b/bin/isabelle_java	Mon Oct 23 19:30:39 2017 +0200
     6.3 @@ -14,16 +14,7 @@
     6.4  (
     6.5    source "$ISABELLE_HOME/lib/scripts/getsettings" || exit 2
     6.6  
     6.7 -  case "$ISABELLE_JAVA_PLATFORM" in
     6.8 -    x86-*)
     6.9 -      ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS32"
    6.10 -      ;;
    6.11 -    x86_64-*)
    6.12 -      ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS64"
    6.13 -      ;;
    6.14 -  esac
    6.15 -
    6.16 -  declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $ISABELLE_TOOL_JAVA_OPTIONS)"
    6.17 +  eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $ISABELLE_TOOL_JAVA_OPTIONS)"
    6.18  
    6.19    if [ -f "$ISABELLE_HOME/src/Tools/jEdit/dist/jedit.jar" ]; then
    6.20      classpath "$ISABELLE_HOME/src/Tools/jEdit/dist/jedit.jar"
     7.1 --- a/etc/settings	Mon Oct 23 14:12:09 2017 +0200
     7.2 +++ b/etc/settings	Mon Oct 23 19:30:39 2017 +0200
     7.3 @@ -16,8 +16,7 @@
     7.4  
     7.5  ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
     7.6  
     7.7 -ISABELLE_TOOL_JAVA_OPTIONS32="-Djava.awt.headless=true -Xms128m -Xmx1024m -Xss1m"
     7.8 -ISABELLE_TOOL_JAVA_OPTIONS64="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss4m"
     7.9 +ISABELLE_TOOL_JAVA_OPTIONS="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss4m"
    7.10  
    7.11  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    7.12  
     8.1 --- a/lib/Tools/console	Mon Oct 23 14:12:09 2017 +0200
     8.2 +++ b/lib/Tools/console	Mon Oct 23 19:30:39 2017 +0200
     8.3 @@ -6,16 +6,7 @@
     8.4  
     8.5  isabelle_admin_build jars || exit $?
     8.6  
     8.7 -case "$ISABELLE_JAVA_PLATFORM" in
     8.8 -  x86-*)
     8.9 -    ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS32"
    8.10 -    ;;
    8.11 -  x86_64-*)
    8.12 -    ISABELLE_TOOL_JAVA_OPTIONS="$ISABELLE_TOOL_JAVA_OPTIONS64"
    8.13 -    ;;
    8.14 -esac
    8.15 -
    8.16 -declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
    8.17 +eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
    8.18  
    8.19  mkdir -p "$ISABELLE_TMP_PREFIX" || exit $?
    8.20  
     9.1 --- a/lib/Tools/java	Mon Oct 23 14:12:09 2017 +0200
     9.2 +++ b/lib/Tools/java	Mon Oct 23 19:30:39 2017 +0200
     9.3 @@ -4,11 +4,10 @@
     9.4  #
     9.5  # DESCRIPTION: invoke Java within the Isabelle environment
     9.6  
     9.7 -declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
     9.8 +eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
     9.9  
    9.10  [ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
    9.11  unset CLASSPATH
    9.12  
    9.13  isabelle_java java "${JAVA_ARGS[@]}" \
    9.14    -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
    9.15 -
    10.1 --- a/lib/Tools/scala	Mon Oct 23 14:12:09 2017 +0200
    10.2 +++ b/lib/Tools/scala	Mon Oct 23 19:30:39 2017 +0200
    10.3 @@ -6,7 +6,7 @@
    10.4  
    10.5  isabelle_admin_build jars || exit $?
    10.6  
    10.7 -declare -a JAVA_ARGS; eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
    10.8 +eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
    10.9  declare -a SCALA_ARGS=()
   10.10  for ARG in "${JAVA_ARGS[@]}"
   10.11  do
    11.1 --- a/src/Doc/System/Environment.thy	Mon Oct 23 14:12:09 2017 +0200
    11.2 +++ b/src/Doc/System/Environment.thy	Mon Oct 23 19:30:39 2017 +0200
    11.3 @@ -178,7 +178,7 @@
    11.4  
    11.5    \<^descr>[@{setting_def ISABELLE_JAVA_PLATFORM}] identifies the hardware and
    11.6    operating system platform for the Java installation of Isabelle. That is
    11.7 -  usually the (native) 64 bit variant: \<^verbatim>\<open>x86_64-linux\<close>, \<^verbatim>\<open>x86_64-darwin\<close>,
    11.8 +  always the (native) 64 bit variant: \<^verbatim>\<open>x86_64-linux\<close>, \<^verbatim>\<open>x86_64-darwin\<close>,
    11.9    \<^verbatim>\<open>x86_64-windows\<close>.
   11.10  
   11.11    \<^descr>[@{setting_def ISABELLE_PATH}] is a list of directories (separated by
    12.1 --- a/src/Pure/Admin/build_jdk.scala	Mon Oct 23 14:12:09 2017 +0200
    12.2 +++ b/src/Pure/Admin/build_jdk.scala	Mon Oct 23 19:30:39 2017 +0200
    12.3 @@ -46,9 +46,8 @@
    12.4      }
    12.5    }
    12.6    val jdk_platforms =
    12.7 -    List(JDK_Platform("x86-linux", "bin/java", """.*ELF 32-bit.*80386.*""".r),
    12.8 +    List(
    12.9        JDK_Platform("x86_64-linux", "bin/java", """.*ELF 64-bit.*x86[-_]64.*""".r),
   12.10 -      JDK_Platform("x86-windows", "bin/java.exe", """.*PE32 executable.*80386.*""".r),
   12.11        JDK_Platform("x86_64-windows", "bin/java.exe", """.*PE32\+ executable.*x86[-_]64.*""".r),
   12.12        JDK_Platform("x86_64-darwin", "Contents/Home/bin/java", """.*Mach-O 64-bit.*x86[-_]64.*""".r))
   12.13  
   12.14 @@ -74,26 +73,16 @@
   12.15  
   12.16  case "$ISABELLE_PLATFORM_FAMILY" in
   12.17    linux)
   12.18 -    ISABELLE_JAVA_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}"
   12.19 +    ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
   12.20      ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
   12.21      ;;
   12.22    windows)
   12.23 -    if [ ! -e "$COMPONENT/x86_64-windows" ]; then
   12.24 -      ISABELLE_JAVA_PLATFORM="x86-windows"
   12.25 -    elif "$COMPONENT/x86_64-windows/jre/bin/java" -version > /dev/null 2> /dev/null; then
   12.26 -      ISABELLE_JAVA_PLATFORM="x86_64-windows"
   12.27 -    else
   12.28 -      ISABELLE_JAVA_PLATFORM="x86-windows"
   12.29 -    fi
   12.30 +    ISABELLE_JAVA_PLATFORM="$ISABELLE_WINDOWS_PLATFORM64"
   12.31      ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
   12.32      ;;
   12.33    macos)
   12.34 -    if [ -z "$ISABELLE_PLATFORM64" ]; then
   12.35 -      echo "### Java unavailable on 32bit Mac OS X" >&2
   12.36 -    else
   12.37 -      ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
   12.38 -      ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM/Contents/Home"
   12.39 -    fi
   12.40 +    ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
   12.41 +    ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM/Contents/Home"
   12.42      ;;
   12.43  esac
   12.44  """
   12.45 @@ -225,7 +214,7 @@
   12.46      -D DIR       target directory (default ".")
   12.47  
   12.48    Build jdk component from tar.gz archives, with original jdk installations
   12.49 -  for Linux (x86, x86_64), Windows (x86, x86_64), Mac OS X (x86_64).
   12.50 +  for x86_64 Linux, Windows, Mac OS X.
   12.51  """,
   12.52          "D:" -> (arg => target_dir = Path.explode(arg)))
   12.53  
    13.1 --- a/src/Pure/Tools/build_docker.scala	Mon Oct 23 14:12:09 2017 +0200
    13.2 +++ b/src/Pure/Tools/build_docker.scala	Mon Oct 23 19:30:39 2017 +0200
    13.3 @@ -63,7 +63,6 @@
    13.4  """
    13.5  RUN tar xzf Isabelle.tar.gz && \
    13.6    mv """ + isabelle_name + """ Isabelle && \
    13.7 -  rm -rf Isabelle.tar.gz Isabelle/contrib/jdk/x86-linux && \
    13.8    perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings && \
    13.9    perl -pi -e 's,ISABELLE_LOGIC=.*,ISABELLE_LOGIC=""" + logic + """,g;' Isabelle/etc/settings && \
   13.10    Isabelle/bin/isabelle build -s -b """ + logic +
    14.1 --- a/src/Tools/jEdit/etc/settings	Mon Oct 23 14:12:09 2017 +0200
    14.2 +++ b/src/Tools/jEdit/etc/settings	Mon Oct 23 19:30:39 2017 +0200
    14.3 @@ -5,12 +5,10 @@
    14.4  
    14.5  JEDIT_OPTIONS="-reuseview -nobackground -log=9"
    14.6  
    14.7 -JEDIT_JAVA_OPTIONS32="-Xms128m -Xmx1024m -Xss4m"
    14.8 -JEDIT_JAVA_OPTIONS64="-Xms512m -Xmx2560m -Xss8m"
    14.9 +JEDIT_JAVA_OPTIONS="-Xms512m -Xmx2560m -Xss8m"
   14.10  JEDIT_JAVA_SYSTEM_OPTIONS="-Duser.language=en -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.application.name=Isabelle"
   14.11  
   14.12  ISABELLE_JEDIT_OPTIONS=""
   14.13  
   14.14  ISABELLE_TOOLS="$ISABELLE_TOOLS:$JEDIT_HOME/lib/Tools"
   14.15  ISABELLE_DOCS="$ISABELLE_DOCS:$JEDIT_HOME/dist/doc"
   14.16 -
    15.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Mon Oct 23 14:12:09 2017 +0200
    15.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Mon Oct 23 19:30:39 2017 +0200
    15.3 @@ -5,18 +5,6 @@
    15.4  # DESCRIPTION: Isabelle/jEdit interface wrapper
    15.5  
    15.6  
    15.7 -## settings
    15.8 -
    15.9 -case "$ISABELLE_JAVA_PLATFORM" in
   15.10 -  x86_64-*)
   15.11 -    JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS64"
   15.12 -    ;;
   15.13 -  *)
   15.14 -    JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS32"
   15.15 -    ;;
   15.16 -esac
   15.17 -
   15.18 -
   15.19  ## sources
   15.20  
   15.21  declare -a SOURCES_BASE=(
   15.22 @@ -212,7 +200,7 @@
   15.23    done
   15.24  }
   15.25  
   15.26 -declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
   15.27 +eval "declare -a JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
   15.28  
   15.29  declare -a ARGS=()
   15.30  
    16.1 --- a/src/Tools/jEdit/lib/Tools/jedit_client	Mon Oct 23 14:12:09 2017 +0200
    16.2 +++ b/src/Tools/jEdit/lib/Tools/jedit_client	Mon Oct 23 19:30:39 2017 +0200
    16.3 @@ -8,16 +8,7 @@
    16.4  
    16.5  SERVER_NAME="${ISABELLE_IDENTIFIER:-Isabelle}"
    16.6  
    16.7 -case "$ISABELLE_JAVA_PLATFORM" in
    16.8 -  x86_64-*)
    16.9 -    JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS64"
   16.10 -    ;;
   16.11 -  *)
   16.12 -    JEDIT_JAVA_OPTIONS="$JEDIT_JAVA_OPTIONS32"
   16.13 -    ;;
   16.14 -esac
   16.15 -
   16.16 -declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
   16.17 +eval "declare -a JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
   16.18  
   16.19  
   16.20  ## diagnostics