updated to jdk-7u11;
authorwenzelm
Mon, 14 Jan 2013 19:45:14 +0100
changeset 50890 097e38daa03a
parent 50889 e3ab7820777b
child 50891 d1a0335b4231
updated to jdk-7u11;
Admin/components/components.sha1
Admin/components/main
Admin/java/build
--- a/Admin/components/components.sha1	Mon Jan 14 14:59:14 2013 +0100
+++ b/Admin/components/components.sha1	Mon Jan 14 19:45:14 2013 +0100
@@ -9,6 +9,7 @@
 ae7ee5becb26512f18c609e83b34612918bae5f0  exec_process-1.0.tar.gz
 683acd94761ef460cca1a628f650355370de5afb  hol-light-bundle-0.5-126.tar.gz
 8d83e433c1419e0c0cc5fd1762903d11b4a5752c  jdk-6u31.tar.gz
+38d2d2a91c66714c18430e136e7e5191af3996e6  jdk-7u11.tar.gz
 ec740ee9ffd43551ddf1e5b91641405116af6291  jdk-7u6.tar.gz
 7d5b152ac70f720bb9e783fa45ecadcf95069584  jdk-7u9.tar.gz
 44775a22f42a9d665696bfb49e53c79371c394b0  jedit_build-20111217.tar.gz
--- a/Admin/components/main	Mon Jan 14 14:59:14 2013 +0100
+++ b/Admin/components/main	Mon Jan 14 19:45:14 2013 +0100
@@ -2,7 +2,7 @@
 cvc3-2.4.1
 e-1.6
 exec_process-1.0.3
-jdk-7u9
+jdk-7u11
 jedit_build-20130104
 jfreechart-1.0.14
 kodkodi-1.5.2
--- a/Admin/java/build	Mon Jan 14 14:59:14 2013 +0100
+++ b/Admin/java/build	Mon Jan 14 19:45:14 2013 +0100
@@ -11,31 +11,13 @@
 
 ## parameters
 
-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="7u9"
-
-
-## variations on version
+VERSION="7u11"
+FULL_VERSION="1.7.0_11"
 
-case "$VERSION" in
-  *u?)
-    MAJOR="$(echo "$VERSION" | cut -du -f1)"
-    MINOR="0$(echo "$VERSION" | cut -du -f2)"
-    ;;
-  *u??)
-    MAJOR="$(echo "$VERSION" | cut -du -f1)"
-    MINOR="$(echo "$VERSION" | cut -du -f2)"
-    ;;
-  *)
-    fail "Bad version identifier: \"$VERSION\""
-    ;;
-esac
-
-FULL_VERSION="1.${MAJOR}.0_${MINOR}"
+ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
+ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
+ARCHIVE_DARWIN="jdk${FULL_VERSION}.jdk.tar.gz"
+ARCHIVE_WINDOWS="jdk${FULL_VERSION}.tar.gz"
 
 
 ## main
@@ -106,6 +88,7 @@
 
 find "$DIR/x86_64-darwin" -name "._*" -exec rm -f {} ";"
 
+echo "Sharing ..."
 (
   cd "$DIR/x86-linux/jdk${FULL_VERSION}"
   for FILE in $(find . -type f)
@@ -126,4 +109,5 @@
 
 # create archive
 
-tar -cz -f "${DIR}.tar.gz" "$DIR"
+echo "Archiving ..."
+tar -c -z -f "${DIR}.tar.gz" "$DIR" && echo "${DIR}.tar.gz"