# HG changeset patch
# User wenzelm
# Date 1378389824 -7200
# Node ID 32ec957e5c3e8347a31f932b885f1184a3015ae9
# Parent  3a67ed19b7553ba5c8855ca2e1b8c14d2e4108d9
updated to jdk-7u25;
less redundant directory structure;

diff -r 3a67ed19b755 -r 32ec957e5c3e Admin/components/components.sha1
--- a/Admin/components/components.sha1	Thu Sep 05 13:09:31 2013 +0200
+++ b/Admin/components/components.sha1	Thu Sep 05 16:03:44 2013 +0200
@@ -18,6 +18,7 @@
 38d2d2a91c66714c18430e136e7e5191af3996e6  jdk-7u11.tar.gz
 d765bc4ad2f34d494429b2a8c1563c49db224944  jdk-7u13.tar.gz
 13a265e4b706ece26fdfa6fc9f4a3dd1366016d2  jdk-7u21.tar.gz
+5080274f8721a18111a7f614793afe6c88726739  jdk-7u25.tar.gz
 ec740ee9ffd43551ddf1e5b91641405116af6291  jdk-7u6.tar.gz
 7d5b152ac70f720bb9e783fa45ecadcf95069584  jdk-7u9.tar.gz
 44775a22f42a9d665696bfb49e53c79371c394b0  jedit_build-20111217.tar.gz
diff -r 3a67ed19b755 -r 32ec957e5c3e Admin/components/main
--- a/Admin/components/main	Thu Sep 05 13:09:31 2013 +0200
+++ b/Admin/components/main	Thu Sep 05 16:03:44 2013 +0200
@@ -3,7 +3,7 @@
 e-1.8
 exec_process-1.0.3
 Haskabelle-2013
-jdk-7u21
+jdk-7u25
 jedit_build-20130905
 jfreechart-1.0.14
 kodkodi-1.5.2
diff -r 3a67ed19b755 -r 32ec957e5c3e Admin/java/build
--- a/Admin/java/build	Thu Sep 05 13:09:31 2013 +0200
+++ b/Admin/java/build	Thu Sep 05 16:03:44 2013 +0200
@@ -11,8 +11,8 @@
 
 ## parameters
 
-VERSION="7u21"
-FULL_VERSION="1.7.0_21"
+VERSION="7u25"
+FULL_VERSION="1.7.0_25"
 
 ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
 ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
@@ -37,8 +37,6 @@
 
 Linux, Mac OS X, Windows work uniformly, depending on certain
 platform-specific subdirectories.
-
-Note that Java 1.7 on Mac OS X requires 64bit hardware!
 EOF
 
 
@@ -53,10 +51,10 @@
     echo "### Java 1.7 unavailable on 32bit Macintosh!" >&2
     ;;
   x86_64-darwin)
-    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/jdk${FULL_VERSION}.jdk/Contents/Home"
+    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/Contents/Home"
     ;;
   *)
-    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}/jdk${FULL_VERSION}"
+    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}"
     ;;
 esac
 
@@ -82,6 +80,18 @@
 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
+  do
+    mv "$PLATFORM/jdk${FULL_VERSION}"/* "$PLATFORM"/.
+    rmdir "$PLATFORM/jdk${FULL_VERSION}"
+  done
+  PLATFORM=x86_64-darwin
+  mv "$PLATFORM/jdk${FULL_VERSION}.jdk"/* "$PLATFORM"/.
+  rmdir "$PLATFORM/jdk${FULL_VERSION}.jdk"
+)
+
 chgrp -R isabelle "$DIR"
 chmod -R a+r "$DIR"
 chmod -R a+X "$DIR"
@@ -90,13 +100,13 @@
 
 echo "Sharing ..."
 (
-  cd "$DIR/x86-linux/jdk${FULL_VERSION}"
+  cd "$DIR/x86-linux"
   for FILE in $(find . -type f)
   do
     for OTHER in \
-      "../../x86_64-linux/jdk${FULL_VERSION}/$FILE" \
-      "../../x86_64-darwin/jdk${FULL_VERSION}.jdk/Contents/Home/$FILE" \
-      "../../x86-cygwin/jdk${FULL_VERSION}/$FILE"
+      "../../x86_64-linux/$FILE" \
+      "../../x86_64-darwin/Contents/Home/$FILE" \
+      "../../x86-cygwin/$FILE"
     do
       if cmp -s "$FILE" "$OTHER"
       then