Admin/java/build
changeset 53417 32ec957e5c3e
parent 51776 8ea64fb16bae
child 53625 a49ce8d72a44
     1.1 --- a/Admin/java/build	Thu Sep 05 13:09:31 2013 +0200
     1.2 +++ b/Admin/java/build	Thu Sep 05 16:03:44 2013 +0200
     1.3 @@ -11,8 +11,8 @@
     1.4  
     1.5  ## parameters
     1.6  
     1.7 -VERSION="7u21"
     1.8 -FULL_VERSION="1.7.0_21"
     1.9 +VERSION="7u25"
    1.10 +FULL_VERSION="1.7.0_25"
    1.11  
    1.12  ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
    1.13  ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
    1.14 @@ -37,8 +37,6 @@
    1.15  
    1.16  Linux, Mac OS X, Windows work uniformly, depending on certain
    1.17  platform-specific subdirectories.
    1.18 -
    1.19 -Note that Java 1.7 on Mac OS X requires 64bit hardware!
    1.20  EOF
    1.21  
    1.22  
    1.23 @@ -53,10 +51,10 @@
    1.24      echo "### Java 1.7 unavailable on 32bit Macintosh!" >&2
    1.25      ;;
    1.26    x86_64-darwin)
    1.27 -    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/jdk${FULL_VERSION}.jdk/Contents/Home"
    1.28 +    ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/Contents/Home"
    1.29      ;;
    1.30    *)
    1.31 -    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}/jdk${FULL_VERSION}"
    1.32 +    ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}"
    1.33      ;;
    1.34  esac
    1.35  
    1.36 @@ -82,6 +80,18 @@
    1.37  tar -C "$DIR/x86_64-darwin" -xf "$ARCHIVE_DARWIN"
    1.38  tar -C "$DIR/x86-cygwin" -xf "$ARCHIVE_WINDOWS"
    1.39  
    1.40 +(
    1.41 +  cd "$DIR"
    1.42 +  for PLATFORM in x86-linux x86_64-linux x86-cygwin
    1.43 +  do
    1.44 +    mv "$PLATFORM/jdk${FULL_VERSION}"/* "$PLATFORM"/.
    1.45 +    rmdir "$PLATFORM/jdk${FULL_VERSION}"
    1.46 +  done
    1.47 +  PLATFORM=x86_64-darwin
    1.48 +  mv "$PLATFORM/jdk${FULL_VERSION}.jdk"/* "$PLATFORM"/.
    1.49 +  rmdir "$PLATFORM/jdk${FULL_VERSION}.jdk"
    1.50 +)
    1.51 +
    1.52  chgrp -R isabelle "$DIR"
    1.53  chmod -R a+r "$DIR"
    1.54  chmod -R a+X "$DIR"
    1.55 @@ -90,13 +100,13 @@
    1.56  
    1.57  echo "Sharing ..."
    1.58  (
    1.59 -  cd "$DIR/x86-linux/jdk${FULL_VERSION}"
    1.60 +  cd "$DIR/x86-linux"
    1.61    for FILE in $(find . -type f)
    1.62    do
    1.63      for OTHER in \
    1.64 -      "../../x86_64-linux/jdk${FULL_VERSION}/$FILE" \
    1.65 -      "../../x86_64-darwin/jdk${FULL_VERSION}.jdk/Contents/Home/$FILE" \
    1.66 -      "../../x86-cygwin/jdk${FULL_VERSION}/$FILE"
    1.67 +      "../../x86_64-linux/$FILE" \
    1.68 +      "../../x86_64-darwin/Contents/Home/$FILE" \
    1.69 +      "../../x86-cygwin/$FILE"
    1.70      do
    1.71        if cmp -s "$FILE" "$OTHER"
    1.72        then