updated to jdk-7u25;
authorwenzelm
Thu Sep 05 16:03:44 2013 +0200 (2013-09-05)
changeset 5341732ec957e5c3e
parent 53416 3a67ed19b755
child 53418 d47a7cebe6b2
updated to jdk-7u25;
less redundant directory structure;
Admin/components/components.sha1
Admin/components/main
Admin/java/build
     1.1 --- a/Admin/components/components.sha1	Thu Sep 05 13:09:31 2013 +0200
     1.2 +++ b/Admin/components/components.sha1	Thu Sep 05 16:03:44 2013 +0200
     1.3 @@ -18,6 +18,7 @@
     1.4  38d2d2a91c66714c18430e136e7e5191af3996e6  jdk-7u11.tar.gz
     1.5  d765bc4ad2f34d494429b2a8c1563c49db224944  jdk-7u13.tar.gz
     1.6  13a265e4b706ece26fdfa6fc9f4a3dd1366016d2  jdk-7u21.tar.gz
     1.7 +5080274f8721a18111a7f614793afe6c88726739  jdk-7u25.tar.gz
     1.8  ec740ee9ffd43551ddf1e5b91641405116af6291  jdk-7u6.tar.gz
     1.9  7d5b152ac70f720bb9e783fa45ecadcf95069584  jdk-7u9.tar.gz
    1.10  44775a22f42a9d665696bfb49e53c79371c394b0  jedit_build-20111217.tar.gz
     2.1 --- a/Admin/components/main	Thu Sep 05 13:09:31 2013 +0200
     2.2 +++ b/Admin/components/main	Thu Sep 05 16:03:44 2013 +0200
     2.3 @@ -3,7 +3,7 @@
     2.4  e-1.8
     2.5  exec_process-1.0.3
     2.6  Haskabelle-2013
     2.7 -jdk-7u21
     2.8 +jdk-7u25
     2.9  jedit_build-20130905
    2.10  jfreechart-1.0.14
    2.11  kodkodi-1.5.2
     3.1 --- a/Admin/java/build	Thu Sep 05 13:09:31 2013 +0200
     3.2 +++ b/Admin/java/build	Thu Sep 05 16:03:44 2013 +0200
     3.3 @@ -11,8 +11,8 @@
     3.4  
     3.5  ## parameters
     3.6  
     3.7 -VERSION="7u21"
     3.8 -FULL_VERSION="1.7.0_21"
     3.9 +VERSION="7u25"
    3.10 +FULL_VERSION="1.7.0_25"
    3.11  
    3.12  ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
    3.13  ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
    3.14 @@ -37,8 +37,6 @@
    3.15  
    3.16  Linux, Mac OS X, Windows work uniformly, depending on certain
    3.17  platform-specific subdirectories.
    3.18 -
    3.19 -Note that Java 1.7 on Mac OS X requires 64bit hardware!
    3.20  EOF
    3.21  
    3.22  
    3.23 @@ -53,10 +51,10 @@
    3.24      echo "### Java 1.7 unavailable on 32bit Macintosh!" >&2
    3.25      ;;
    3.26    x86_64-darwin)
    3.27 -    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/jdk${FULL_VERSION}.jdk/Contents/Home"
    3.28 +    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/Contents/Home"
    3.29      ;;
    3.30    *)
    3.31 -    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}/jdk${FULL_VERSION}"
    3.32 +    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}"
    3.33      ;;
    3.34  esac
    3.35  
    3.36 @@ -82,6 +80,18 @@
    3.37  tar -C "$DIR/x86_64-darwin" -xf "$ARCHIVE_DARWIN"
    3.38  tar -C "$DIR/x86-cygwin" -xf "$ARCHIVE_WINDOWS"
    3.39  
    3.40 +(
    3.41 +  cd "$DIR"
    3.42 +  for PLATFORM in x86-linux x86_64-linux x86-cygwin
    3.43 +  do
    3.44 +    mv "$PLATFORM/jdk${FULL_VERSION}"/* "$PLATFORM"/.
    3.45 +    rmdir "$PLATFORM/jdk${FULL_VERSION}"
    3.46 +  done
    3.47 +  PLATFORM=x86_64-darwin
    3.48 +  mv "$PLATFORM/jdk${FULL_VERSION}.jdk"/* "$PLATFORM"/.
    3.49 +  rmdir "$PLATFORM/jdk${FULL_VERSION}.jdk"
    3.50 +)
    3.51 +
    3.52  chgrp -R isabelle "$DIR"
    3.53  chmod -R a+r "$DIR"
    3.54  chmod -R a+X "$DIR"
    3.55 @@ -90,13 +100,13 @@
    3.56  
    3.57  echo "Sharing ..."
    3.58  (
    3.59 -  cd "$DIR/x86-linux/jdk${FULL_VERSION}"
    3.60 +  cd "$DIR/x86-linux"
    3.61    for FILE in $(find . -type f)
    3.62    do
    3.63      for OTHER in \
    3.64 -      "../../x86_64-linux/jdk${FULL_VERSION}/$FILE" \
    3.65 -      "../../x86_64-darwin/jdk${FULL_VERSION}.jdk/Contents/Home/$FILE" \
    3.66 -      "../../x86-cygwin/jdk${FULL_VERSION}/$FILE"
    3.67 +      "../../x86_64-linux/$FILE" \
    3.68 +      "../../x86_64-darwin/Contents/Home/$FILE" \
    3.69 +      "../../x86-cygwin/$FILE"
    3.70      do
    3.71        if cmp -s "$FILE" "$OTHER"
    3.72        then