# HG changeset patch
# User wenzelm
# Date 1440168477 -7200
# Node ID 5176de8f90dbc8a4507adbda8b33fe22130a70a8
# Parent  b1e324a0677cd8b0cabda545bc88c799df7cc079
updated to jdk-8u60, with support for x86_64-windows;

diff -r b1e324a0677c -r 5176de8f90db Admin/components/components.sha1
--- a/Admin/components/components.sha1	Fri Aug 21 15:02:42 2015 +0200
+++ b/Admin/components/components.sha1	Fri Aug 21 16:47:57 2015 +0200
@@ -48,6 +48,7 @@
 44ffeeae219782d40ce6822b580e608e72fd4c76  jdk-8u31.tar.gz
 4132cf52d5025bf330d53b96a5c6466fef432377  jdk-8u51.tar.gz
 c95ebf7777beb3e7ef10c0cf3f734cb78f9828e4  jdk-8u5.tar.gz
+74df343671deba03be7caa49de217d78b693f817  jdk-8u60.tar.gz
 44775a22f42a9d665696bfb49e53c79371c394b0  jedit_build-20111217.tar.gz
 a242a688810f2bccf24587b0062ce8027bf77fa2  jedit_build-20120304.tar.gz
 4c948dee53f74361c097c08f49a1a5ff9b17bd1d  jedit_build-20120307.tar.gz
diff -r b1e324a0677c -r 5176de8f90db Admin/components/main
--- a/Admin/components/main	Fri Aug 21 15:02:42 2015 +0200
+++ b/Admin/components/main	Fri Aug 21 16:47:57 2015 +0200
@@ -4,7 +4,7 @@
 e-1.8
 exec_process-1.0.3
 Haskabelle-2015
-jdk-8u51
+jdk-8u60
 jedit_build-20150228
 jfreechart-1.0.14-1
 jortho-1.0-2
diff -r b1e324a0677c -r 5176de8f90db Admin/java/build
--- a/Admin/java/build	Fri Aug 21 15:02:42 2015 +0200
+++ b/Admin/java/build	Fri Aug 21 16:47:57 2015 +0200
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+THIS="$(cd "$(dirname "$0")"; pwd)"
+
+
 ## diagnostics
 
 function fail()
@@ -11,13 +14,14 @@
 
 ## parameters
 
-VERSION="8u51"
-FULL_VERSION="1.8.0_51"
+VERSION="8u60"
+FULL_VERSION="1.8.0_60"
 
 ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
 ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
+ARCHIVE_WINDOWS32="jdk${FULL_VERSION}-w32.tar.gz"
+ARCHIVE_WINDOWS64="jdk${FULL_VERSION}-w64.tar.gz"
 ARCHIVE_DARWIN="jdk${FULL_VERSION}.jdk.tar.gz"
-ARCHIVE_WINDOWS="jdk${FULL_VERSION}.tar.gz"
 
 
 ## main
@@ -35,7 +39,7 @@
 for the original downloads, which are covered by the Oracle Binary
 Code License Agreement for Java SE.
 
-Linux, Windows Mac OS X, work uniformly, depending on certain
+Linux, Windows, Mac OS X all work uniformly, depending on certain
 platform-specific subdirectories.
 EOF
 
@@ -43,21 +47,7 @@
 # settings
 
 mkdir "$DIR/etc"
-cat >> "$DIR/etc/settings" << EOF
-# -*- shell-script -*- :mode=shellscript:
-
-case "\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}" in
-  x86-darwin)
-    echo "### Java unavailable on 32bit Macintosh!" >&2
-    ;;
-  x86_64-darwin)
-    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/Contents/Home"
-    ;;
-  *)
-    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}"
-    ;;
-esac
-EOF
+cp "$THIS/settings" "$DIR/etc/settings"
 
 
 # content
@@ -67,16 +57,17 @@
   function tar() { /usr/bin/gnutar "$@"; }
 fi
 
-mkdir "$DIR/x86-linux" "$DIR/x86_64-linux" "$DIR/x86_64-darwin" "$DIR/x86-cygwin"
+mkdir "$DIR/x86-linux" "$DIR/x86_64-linux" "$DIR/x86-windows" "$DIR/x86_64-windows" "$DIR/x86_64-darwin"
 
 tar -C "$DIR/x86-linux" -xf "$ARCHIVE_LINUX32"
 tar -C "$DIR/x86_64-linux" -xf "$ARCHIVE_LINUX64"
+tar -C "$DIR/x86-windows" -xf "$ARCHIVE_WINDOWS32"
+tar -C "$DIR/x86_64-windows" -xf "$ARCHIVE_WINDOWS64"
 tar -C "$DIR/x86_64-darwin" -xf "$ARCHIVE_DARWIN"
-tar -C "$DIR/x86-cygwin" -xf "$ARCHIVE_WINDOWS"
 
 (
   cd "$DIR"
-  for PLATFORM in x86-linux x86_64-linux x86-cygwin
+  for PLATFORM in x86-linux x86_64-linux x86-windows x86_64-windows
   do
     mv "$PLATFORM/jdk${FULL_VERSION}"/* "$PLATFORM"/.
     rmdir "$PLATFORM/jdk${FULL_VERSION}"
@@ -99,8 +90,9 @@
   do
     for OTHER in \
       "../x86_64-linux/$FILE" \
-      "../x86_64-darwin/Contents/Home/$FILE" \
-      "../x86-cygwin/$FILE"
+      "../x86-windows/$FILE" \
+      "../x86_64-windows/$FILE" \
+      "../x86_64-darwin/Contents/Home/$FILE"
     do
       if cmp -s "$FILE" "$OTHER"
       then
diff -r b1e324a0677c -r 5176de8f90db Admin/java/settings
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/java/settings	Fri Aug 21 16:47:57 2015 +0200
@@ -0,0 +1,26 @@
+# -*- shell-script -*- :mode=shellscript:
+
+case "$ISABELLE_PLATFORM_FAMILY" in
+  linux)
+    ISABELLE_JAVA_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}"
+    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_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
+    ;;
+esac
diff -r b1e324a0677c -r 5176de8f90db NEWS
--- a/NEWS	Fri Aug 21 15:02:42 2015 +0200
+++ b/NEWS	Fri Aug 21 16:47:57 2015 +0200
@@ -300,6 +300,9 @@
 * Poly/ML 5.5.3 runs natively on x86-windows, with somewhat larger heap
 space than former x86-cygwin.
 
+* Java runtime environment for x86_64-windows allows to use larger heap
+space.
+
 
 
 New in Isabelle2015 (May 2015)