From 784ded8d9d446cd09e7195209a10c01b49500517 Mon Sep 17 00:00:00 2001 From: alexkasko Date: Fri, 16 Aug 2013 22:55:09 +0300 Subject: [PATCH] jdk7 u40 icedtea 2.4.1 release --- build-linux-amd64.sh | 3 ++- build-linux-i586.sh | 3 ++- build-macosx-x86_64.sh | 5 +++- build-windows-amd64.bat | 2 +- build-windows-i586.bat | 2 +- installer/build-image.sh | 14 ++++++----- installer/build-installer.sh | 10 ++++---- .../linux-amd64/default-install-dir-linux.txt | 2 +- installer/linux-amd64/izpack.xml | 2 +- .../linux-i586/default-install-dir-linux.txt | 2 +- installer/linux-i586/izpack.xml | 2 +- .../default-install-dir-macosx.txt | 2 +- .../windows-amd64/default-install-dir-win.txt | 2 +- installer/windows-amd64/izpack.xml | 22 ++++++++--------- .../windows-i586/default-install-dir-win.txt | 2 +- installer/windows-i586/izpack.xml | 24 +++++++++---------- make-and-bundle.sh | 12 +++++----- 17 files changed, 60 insertions(+), 51 deletions(-) diff --git a/build-linux-amd64.sh b/build-linux-amd64.sh index 4a6a24c..6f76e83 100755 --- a/build-linux-amd64.sh +++ b/build-linux-amd64.sh @@ -9,12 +9,13 @@ export LANG=C export ANT_HOME="$OUB_DIR"/utils/ant export PATH=$ANT_HOME/bin:$PATH export ALT_CACERTS_FILE="$OUB_DIR"/libs/cacerts/cacerts -export ALT_BOOTDIR=/home/obf/openjdk7 +export ALT_BOOTDIR=/home/obf/jdk7 export ALLOW_DOWNLOADS=false export MILESTONE=u40-unofficial export BUILD_NUMBER=b1 export STATIC_CXX=true export UNLIMITED_CRYPTO=true +export FULL_DEBUG_SYMBOLS=0 export RHINO_JAR="$OUB_DIR"/libs/rhino/rhino-jdk7.jar export FT2_LIBS=-lfreetype export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2' diff --git a/build-linux-i586.sh b/build-linux-i586.sh index 4a6a24c..6f76e83 100755 --- a/build-linux-i586.sh +++ b/build-linux-i586.sh @@ -9,12 +9,13 @@ export LANG=C export ANT_HOME="$OUB_DIR"/utils/ant export PATH=$ANT_HOME/bin:$PATH export ALT_CACERTS_FILE="$OUB_DIR"/libs/cacerts/cacerts -export ALT_BOOTDIR=/home/obf/openjdk7 +export ALT_BOOTDIR=/home/obf/jdk7 export ALLOW_DOWNLOADS=false export MILESTONE=u40-unofficial export BUILD_NUMBER=b1 export STATIC_CXX=true export UNLIMITED_CRYPTO=true +export FULL_DEBUG_SYMBOLS=0 export RHINO_JAR="$OUB_DIR"/libs/rhino/rhino-jdk7.jar export FT2_LIBS=-lfreetype export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2' diff --git a/build-macosx-x86_64.sh b/build-macosx-x86_64.sh index 81cd329..ab00982 100755 --- a/build-macosx-x86_64.sh +++ b/build-macosx-x86_64.sh @@ -9,10 +9,13 @@ export LANG=C export ANT_HOME="$OUB_DIR"/utils/ant export PATH=$ANT_HOME/bin:$PATH export ALT_CACERTS_FILE="$OUB_DIR"/libs/cacerts/cacerts -export ALT_BOOTDIR=/Users/obf/openjdk7 +export ALT_BOOTDIR=/Users/obf/jdk7 +export ALLOW_DOWNLOADS=false export MILESTONE=u40-unofficial export BUILD_NUMBER=b1 +#export STATIC_CXX=true export UNLIMITED_CRYPTO=true +export FULL_DEBUG_SYMBOLS=0 export RHINO_JAR="$OUB_DIR"/libs/rhino/rhino-jdk7.jar export FT2_CFLAGS='-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2' export DISABLE_INTREE_EC=true diff --git a/build-windows-amd64.bat b/build-windows-amd64.bat index c09fcf1..f233b4a 100755 --- a/build-windows-amd64.bat +++ b/build-windows-amd64.bat @@ -51,7 +51,7 @@ set DISABLE_INTREE_EC=true rem debug settings rem set DEBUG_CLASSFILES=true -rem set FULL_DEBUG_SYMBOLS=0 +set FULL_DEBUG_SYMBOLS=0 rem set compiler environment manually set WINDOWSSDKDIR=%WINSDK% diff --git a/build-windows-i586.bat b/build-windows-i586.bat index d9b3b77..9261c2a 100755 --- a/build-windows-i586.bat +++ b/build-windows-i586.bat @@ -51,7 +51,7 @@ set DISABLE_INTREE_EC=true rem debug settings rem set DEBUG_CLASSFILES=true -rem set FULL_DEBUG_SYMBOLS=0 +set FULL_DEBUG_SYMBOLS=0 rem set compiler environment manually set WINDOWSSDKDIR=%WINSDK% diff --git a/installer/build-image.sh b/installer/build-image.sh index e760e8f..6ada675 100755 --- a/installer/build-image.sh +++ b/installer/build-image.sh @@ -3,7 +3,8 @@ set -e # get installer builder dir IMAGE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -OBF_DIR="$( dirname "$IMAGE_DIR" )" +OUB_DIR="$( dirname "$IMAGE_DIR" )" +OBF_DIR="$( dirname "$OUB_DIR" )" # check argument SRC_DIR_RELATIVE=$1 @@ -48,14 +49,15 @@ JDK_IMAGE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image echo "Packing OpenJDK image: $JDK_IMAGE" JAVA="$JDK_IMAGE"/bin/java -VERSION=`"$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}'` -if [ -z "$VERSION" ] ; then +OPENJDK_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==1{print substr($3,2,length($3)-2)}' )" +ICEDTEA_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}' )" +if [ -z "$OPENJDK_VERSION" ] ; then echo "Error: cannot get 'java -version' from $JAVA" exit 1 fi # pack image -IMAGE_NAME=openjdk-"$VERSION"-"$PLATFORM"-image +IMAGE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-image WORK_DIR="$IMAGE_DIR"/target if [ ! -d "$WORK_DIR" ]; then mkdir "$WORK_DIR" @@ -71,12 +73,12 @@ popd > /dev/null if [ "macosx-x86_64" == "$PLATFORM" ] ; then # pack bundle JDK_BUNDLE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-bundle - BUNDLE_NAME=openjdk-"$VERSION"-"$PLATFORM"-bundle + BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-bundle CURDIR=`pwd` pushd "$WORK_DIR" > /dev/null cp -r "$JDK_BUNDLE" . mv j2sdk-server-bundle "$BUNDLE_NAME" - cp "$OBF_DIR"/installer/macosx-x86_64/install_bundle.sh "$BUNDLE_NAME" + cp "$OBF_DIR"/oub/installer/macosx-x86_64/install_bundle.sh "$BUNDLE_NAME" $ZIP "$BUNDLE_NAME".zip "$BUNDLE_NAME" mv "$BUNDLE_NAME".zip "$CURDIR" popd > /dev/null diff --git a/installer/build-installer.sh b/installer/build-installer.sh index 68aa7c4..e088250 100755 --- a/installer/build-installer.sh +++ b/installer/build-installer.sh @@ -3,7 +3,8 @@ set -e # get installer builder dir INSTALLER_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -OBF_DIR="$( dirname "$IMAGE_DIR" )" +OUB_DIR="$( dirname "$INSTALLER_DIR" )" +OBF_DIR="$( dirname "$OUB_DIR" )" NEED_EXEC=false # check argument @@ -53,8 +54,9 @@ JDK_IMAGE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image echo "Building installer for OpenJDK image: $JDK_IMAGE" JAVA="$JDK_IMAGE"/bin/java -VERSION=`"$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}'` -if [ -z "$VERSION" ] ; then +OPENJDK_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==1{print substr($3,2,length($3)-2)}' )" +ICEDTEA_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}' )" +if [ -z "$OPENJDK_VERSION" ] ; then echo "Error: cannot get 'java -version' from $JAVA" exit 1 fi @@ -78,7 +80,7 @@ if [ "true" == "$NEED_EXEC" ] ; then fi # launch izpack -BUNDLE_NAME=openjdk-"$VERSION"-"$PLATFORM"-installer +BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-installer INSTALLER_TARGET="$INSTALLER_DIR"/target/"$BUNDLE_NAME" rm -rf "$INSTALLER_TARGET" pushd "$INSTALLER_DIR" > /dev/null diff --git a/installer/linux-amd64/default-install-dir-linux.txt b/installer/linux-amd64/default-install-dir-linux.txt index d77b252..f23de1a 100644 --- a/installer/linux-amd64/default-install-dir-linux.txt +++ b/installer/linux-amd64/default-install-dir-linux.txt @@ -1 +1 @@ -$USER_HOME/openjdk7_u6_x64 +$USER_HOME/openjdk_1.7.0_u40_2.4.1_64 diff --git a/installer/linux-amd64/izpack.xml b/installer/linux-amd64/izpack.xml index d209d2a..2d9c6c6 100644 --- a/installer/linux-amd64/izpack.xml +++ b/installer/linux-amd64/izpack.xml @@ -49,7 +49,7 @@ ${JRE_EXECUTABLES} OpenJDK Development Kit installation files - + ${JDK_EXECUTABLES} diff --git a/installer/linux-i586/default-install-dir-linux.txt b/installer/linux-i586/default-install-dir-linux.txt index c57c597..328d525 100644 --- a/installer/linux-i586/default-install-dir-linux.txt +++ b/installer/linux-i586/default-install-dir-linux.txt @@ -1 +1 @@ -$USER_HOME/openjdk7_u6 +$USER_HOME/openjdk_1.7.0_u40_2.4.1 diff --git a/installer/linux-i586/izpack.xml b/installer/linux-i586/izpack.xml index 48773b1..6edb8ba 100644 --- a/installer/linux-i586/izpack.xml +++ b/installer/linux-i586/izpack.xml @@ -49,7 +49,7 @@ ${JRE_EXECUTABLES} OpenJDK Development Kit installation files - + ${JDK_EXECUTABLES} diff --git a/installer/macosx-x86_64/default-install-dir-macosx.txt b/installer/macosx-x86_64/default-install-dir-macosx.txt index f4b07c8..328d525 100644 --- a/installer/macosx-x86_64/default-install-dir-macosx.txt +++ b/installer/macosx-x86_64/default-install-dir-macosx.txt @@ -1 +1 @@ -$USER_HOME/OpenJDK7_u6 +$USER_HOME/openjdk_1.7.0_u40_2.4.1 diff --git a/installer/windows-amd64/default-install-dir-win.txt b/installer/windows-amd64/default-install-dir-win.txt index 83b62e9..d28f5dd 100644 --- a/installer/windows-amd64/default-install-dir-win.txt +++ b/installer/windows-amd64/default-install-dir-win.txt @@ -1 +1 @@ -$USER_HOME\OpenJDK6_1.12.6_64 +$USER_HOME\openjdk_1.7.0_u40_2.4.1_64 diff --git a/installer/windows-amd64/izpack.xml b/installer/windows-amd64/izpack.xml index d24ce58..1ef5ddc 100644 --- a/installer/windows-amd64/izpack.xml +++ b/installer/windows-amd64/izpack.xml @@ -47,7 +47,7 @@ OpenJDK Development Kit installation files - + @@ -117,18 +117,18 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j stage="postinstall" keep="true"> - + - + -Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0" with indofmation about this installation. These entries may be used by java application launchers (e.g. launch4j). Key will be added to global registry branch and may require administrator privileges. On uninstallation registry values under this key will be cleared, but key itself will be left intact. +Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7" with information about this installation. These entries may be used by java application launchers (e.g. launch4j). Key will be added to global registry branch and may require administrator privileges. On uninstallation registry values under this key will be cleared, but key itself will be left intact. - + @@ -189,7 +189,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/ keep="true"> - + @@ -200,7 +200,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/ keep="true"> - + @@ -214,7 +214,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/ keep="true"> - + @@ -225,13 +225,13 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/ keep="true"> - + - + - + diff --git a/installer/windows-i586/default-install-dir-win.txt b/installer/windows-i586/default-install-dir-win.txt index 7400381..3382de0 100644 --- a/installer/windows-i586/default-install-dir-win.txt +++ b/installer/windows-i586/default-install-dir-win.txt @@ -1 +1 @@ -$USER_HOME\OpenJDK6_1.12.6 +$USER_HOME\openjdk_1.7.0_u40_2.4.1 diff --git a/installer/windows-i586/izpack.xml b/installer/windows-i586/izpack.xml index e4115b7..5a2bf0b 100644 --- a/installer/windows-i586/izpack.xml +++ b/installer/windows-i586/izpack.xml @@ -47,7 +47,7 @@ OpenJDK Development Kit installation files - + @@ -117,18 +117,18 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j stage="postinstall" keep="true"> - + - + -Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0" with indofmation about this installation. These entries may be used by java application launchers (e.g. launch4j). Key will be added to global registry branch and may require administrator privileges. On uninstallation registry values under this key will be cleared, but key itself will be left intact. -Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added to "HKEY_LOCAL_MACHINE/Software/Wow6432Node/JavaSoft/Java Runtime Environment/1.6.0" path instead due to registry redirection. +Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7" with information about this installation. These entries may be used by java application launchers (e.g. launch4j). Key will be added to global registry branch and may require administrator privileges. On uninstallation registry values under this key will be cleared, but key itself will be left intact. +Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added to "HKEY_LOCAL_MACHINE/Software/Wow6432Node/JavaSoft/Java Runtime Environment/1.7" path instead due to registry redirection. - + @@ -190,7 +190,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t keep="true"> - + @@ -201,7 +201,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t keep="true"> - + @@ -215,7 +215,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t keep="true"> - + @@ -226,13 +226,13 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t keep="true"> - + - + - + diff --git a/make-and-bundle.sh b/make-and-bundle.sh index ea4b374..69b54e7 100755 --- a/make-and-bundle.sh +++ b/make-and-bundle.sh @@ -15,12 +15,12 @@ if [ $? -ne 0 ] ; then exit 1 fi -make test >> "$LOG_FILE" 2>&1 -if [ $? -ne 0 ] ; then - echo "Build aborted with error on 'make test'" >> "$LOG_FILE" - echo error > "$FINISH_FLAG" - exit 1 -fi +#make test >> "$LOG_FILE" 2>&1 +#if [ $? -ne 0 ] ; then +# echo "Build aborted with error on 'make test'" >> "$LOG_FILE" +# echo error > "$FINISH_FLAG" +# exit 1 +#fi # Prepare bundles if [ ! -d "$OBF_DIR"/dist ] ; then