diff -r e3ab7820777b -r 097e38daa03a Admin/java/build --- 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"