# HG changeset patch
# User wenzelm
# Date 1354289651 -3600
# Node ID dceb1daa185c900d39632908654e4d883b9a8ac5
# Parent  4eea6572896eca5e94d82db0097c8075d4e06de7
updated to jdk-7u9;

diff -r 4eea6572896e -r dceb1daa185c Admin/component_repository/components.sha1
--- a/Admin/component_repository/components.sha1	Fri Nov 30 15:24:01 2012 +0100
+++ b/Admin/component_repository/components.sha1	Fri Nov 30 16:34:11 2012 +0100
@@ -8,6 +8,7 @@
 683acd94761ef460cca1a628f650355370de5afb  hol-light-bundle-0.5-126.tar.gz
 8d83e433c1419e0c0cc5fd1762903d11b4a5752c  jdk-6u31.tar.gz
 ec740ee9ffd43551ddf1e5b91641405116af6291  jdk-7u6.tar.gz
+7d5b152ac70f720bb9e783fa45ecadcf95069584  jdk-7u9.tar.gz
 44775a22f42a9d665696bfb49e53c79371c394b0  jedit_build-20111217.tar.gz
 a242a688810f2bccf24587b0062ce8027bf77fa2  jedit_build-20120304.tar.gz
 4c948dee53f74361c097c08f49a1a5ff9b17bd1d  jedit_build-20120307.tar.gz
diff -r 4eea6572896e -r dceb1daa185c Admin/components/main
--- a/Admin/components/main	Fri Nov 30 15:24:01 2012 +0100
+++ b/Admin/components/main	Fri Nov 30 16:34:11 2012 +0100
@@ -2,7 +2,7 @@
 cvc3-2.4.1
 e-1.6
 exec_process-1.0.3
-jdk-7u6
+jdk-7u9
 jedit_build-20120903
 kodkodi-1.5.2
 polyml-5.5.0
diff -r 4eea6572896e -r dceb1daa185c Admin/java/build
--- a/Admin/java/build	Fri Nov 30 15:24:01 2012 +0100
+++ b/Admin/java/build	Fri Nov 30 16:34:11 2012 +0100
@@ -11,12 +11,12 @@
 
 ## parameters
 
-ARCHIVE_LINUX32="jdk-7u6-linux-i586.tar.gz"
-ARCHIVE_LINUX64="jdk-7u6-linux-x64.tar.gz"
-ARCHIVE_DARWIN="jdk1.7.0_06.jdk.tar.gz"
-ARCHIVE_WINDOWS="jdk1.7.0_06.tar.gz"
+ARCHIVE_LINUX32="jdk-7u9-linux-i586.tar.gz"
+ARCHIVE_LINUX64="jdk-7u9-linux-x64.tar.gz"
+ARCHIVE_DARWIN="jdk1.7.0_09.jdk.tar.gz"
+ARCHIVE_WINDOWS="jdk1.7.0_09.tar.gz"
 
-VERSION="7u6"
+VERSION="7u9"
 
 
 ## variations on version
@@ -47,13 +47,16 @@
 # README
 
 cat >> "$DIR/README" << EOF
-This is JDK $FULL_VERSION for Linux, Mac OS X, Windows.
+This is JDK $FULL_VERSION as required for Isabelle.
 
 See http://www.oracle.com/technetwork/java/javase/downloads/index.html
 for the original downloads, which are covered by the Oracle Binary
 Code License Agreement for Java SE.
 
-Note that Java 1.7 requires 64bit hardware on Mac OS X.
+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
 
 
@@ -76,7 +79,12 @@
 esac
 
 if [ -n "\$ISABELLE_JDK_HOME" ]; then
-  ISABELLE_JAVA_EXT="\${ISABELLE_JDK_HOME}/jre/lib/ext"
+  if [ -d "\$ISABELLE_JDK_HOME" ]; then
+    ISABELLE_JAVA_EXT="\${ISABELLE_JDK_HOME}/jre/lib/ext"
+  else
+    echo "### Missing Java 1.7 platform directory: \"\$ISABELLE_JDK_HOME\"" >&2
+    unset ISABELLE_JDK_HOME
+  fi
 fi
 EOF
 
@@ -94,6 +102,8 @@
 chmod -R a+r "$DIR"
 chmod -R a+X "$DIR"
 
+find "$DIR/x86_64-darwin" -name "._*" -exec rm -f {} ";"
+
 (
   cd "$DIR/x86-linux/jdk${FULL_VERSION}"
   for FILE in $(find . -type f)