Skip to content
This repository has been archived by the owner on Oct 18, 2020. It is now read-only.

Commit

Permalink
jdk7 u40 icedtea 2.4.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
alexkasko committed Aug 16, 2013
1 parent 3a40417 commit 784ded8
Show file tree
Hide file tree
Showing 17 changed files with 60 additions and 51 deletions.
3 changes: 2 additions & 1 deletion build-linux-amd64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion build-linux-i586.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 4 additions & 1 deletion build-macosx-x86_64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion build-windows-i586.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
14 changes: 8 additions & 6 deletions installer/build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
10 changes: 6 additions & 4 deletions installer/build-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion installer/linux-amd64/default-install-dir-linux.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$USER_HOME/openjdk7_u6_x64
$USER_HOME/openjdk_1.7.0_u40_2.4.1_64
2 changes: 1 addition & 1 deletion installer/linux-amd64/izpack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ${JRE_EXECUTABLES}
</pack>
<pack name="OpenJDK Development Kit installation files" required="no">
<description>OpenJDK Development Kit installation files</description>
<fileset dir="j2sdk-image" targetdir="$INSTALL_PATH"/>
<fileset dir="j2sdk-server-image" targetdir="$INSTALL_PATH"/>
<file src="uninstall" targetdir="$INSTALL_PATH"/>
${JDK_EXECUTABLES}
</pack>
Expand Down
2 changes: 1 addition & 1 deletion installer/linux-i586/default-install-dir-linux.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$USER_HOME/openjdk7_u6
$USER_HOME/openjdk_1.7.0_u40_2.4.1
2 changes: 1 addition & 1 deletion installer/linux-i586/izpack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ${JRE_EXECUTABLES}
</pack>
<pack name="OpenJDK Development Kit installation files" required="no">
<description>OpenJDK Development Kit installation files</description>
<fileset dir="j2sdk-image" targetdir="$INSTALL_PATH"/>
<fileset dir="j2sdk-server-image" targetdir="$INSTALL_PATH"/>
<file src="uninstall" targetdir="$INSTALL_PATH"/>
${JDK_EXECUTABLES}
</pack>
Expand Down
2 changes: 1 addition & 1 deletion installer/macosx-x86_64/default-install-dir-macosx.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$USER_HOME/OpenJDK7_u6
$USER_HOME/openjdk_1.7.0_u40_2.4.1
2 changes: 1 addition & 1 deletion installer/windows-amd64/default-install-dir-win.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$USER_HOME\OpenJDK6_1.12.6_64
$USER_HOME\openjdk_1.7.0_u40_2.4.1_64
22 changes: 11 additions & 11 deletions installer/windows-amd64/izpack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</pack>
<pack name="OpenJDK Development Kit installation files" required="no">
<description>OpenJDK Development Kit installation files</description>
<fileset dir="j2sdk-image" targetdir="$INSTALL_PATH"/>
<fileset dir="j2sdk-server-image" targetdir="$INSTALL_PATH"/>
<file src="uninstall" targetdir="$INSTALL_PATH"/>
</pack>
<pack name="OpenJDK uninstaller files" required="yes">
Expand Down Expand Up @@ -117,18 +117,18 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j
stage="postinstall"
keep="true">
<args>
<arg value="\/m"/>
<arg value="JAVA_HOME"/>
<arg value="&quot;$INSTALL_PATH&quot;"/>
<arg value="-m"/>
</args>
</executable>
<executable targetfile="$INSTALL_PATH/uninstall/tools/setx.exe"
stage="uninstall"
keep="true">
<args>
<arg value="\/m"/>
<arg value="JAVA_HOME"/>
<arg value="&quot;&quot;"/>
<arg value="-m"/>
</args>
</executable>
<executable targetfile="$INSTALL_PATH/uninstall/tools/pathman.cmd"
Expand Down Expand Up @@ -168,14 +168,14 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j
required="no"
preselected="no">
<description>
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.
</description>
<executable targetfile="${ENV[WINDIR]}/system32/reg.exe"
stage="postinstall"
keep="true">
<args>
<arg value="add"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="JavaHome"/>
<arg value="\/t"/>
Expand All @@ -189,7 +189,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/
keep="true">
<args>
<arg value="delete"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="JavaHome"/>
<arg value="\/f"/>
Expand All @@ -200,7 +200,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/
keep="true">
<args>
<arg value="add"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="RuntimeLib"/>
<arg value="\/t"/>
Expand All @@ -214,7 +214,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/
keep="true">
<args>
<arg value="delete"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="RuntimeLib"/>
<arg value="\/f"/>
Expand All @@ -225,21 +225,21 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/
keep="true">
<args>
<arg value="add"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="MicroVersion"/>
<arg value="\/t"/>
<arg value="reg_dword"/>
<arg value="\/d"/>
<arg value="40"/>
<arg value="0"/>
</args>
</executable>
<executable targetfile="${ENV[WINDIR]}/system32/reg.exe"
stage="uninstall"
keep="true">
<args>
<arg value="delete"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="MicroVersion"/>
<arg value="\/f"/>
Expand Down
2 changes: 1 addition & 1 deletion installer/windows-i586/default-install-dir-win.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$USER_HOME\OpenJDK6_1.12.6
$USER_HOME\openjdk_1.7.0_u40_2.4.1
24 changes: 12 additions & 12 deletions installer/windows-i586/izpack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</pack>
<pack name="OpenJDK Development Kit installation files" required="no">
<description>OpenJDK Development Kit installation files</description>
<fileset dir="j2sdk-image" targetdir="$INSTALL_PATH"/>
<fileset dir="j2sdk-server-image" targetdir="$INSTALL_PATH"/>
<file src="uninstall" targetdir="$INSTALL_PATH"/>
</pack>
<pack name="OpenJDK uninstaller files" required="yes">
Expand Down Expand Up @@ -117,18 +117,18 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j
stage="postinstall"
keep="true">
<args>
<arg value="\/m"/>
<arg value="JAVA_HOME"/>
<arg value="&quot;$INSTALL_PATH&quot;"/>
<arg value="-m"/>
</args>
</executable>
<executable targetfile="$INSTALL_PATH/uninstall/tools/setx.exe"
stage="uninstall"
keep="true">
<args>
<arg value="\/m"/>
<arg value="JAVA_HOME"/>
<arg value="&quot;&quot;"/>
<arg value="-m"/>
</args>
</executable>
<executable targetfile="$INSTALL_PATH/uninstall/tools/pathman.cmd"
Expand Down Expand Up @@ -168,15 +168,15 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j
required="no"
preselected="no">
<description>
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.
</description>
<executable targetfile="${ENV[WINDIR]}/system32/reg.exe"
stage="postinstall"
keep="true">
<args>
<arg value="add"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="JavaHome"/>
<arg value="\/t"/>
Expand All @@ -190,7 +190,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t
keep="true">
<args>
<arg value="delete"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="JavaHome"/>
<arg value="\/f"/>
Expand All @@ -201,7 +201,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t
keep="true">
<args>
<arg value="add"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="RuntimeLib"/>
<arg value="\/t"/>
Expand All @@ -215,7 +215,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t
keep="true">
<args>
<arg value="delete"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="RuntimeLib"/>
<arg value="\/f"/>
Expand All @@ -226,21 +226,21 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t
keep="true">
<args>
<arg value="add"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="MicroVersion"/>
<arg value="\/t"/>
<arg value="reg_dword"/>
<arg value="\/d"/>
<arg value="40"/>
<arg value="0"/>
</args>
</executable>
<executable targetfile="${ENV[WINDIR]}/system32/reg.exe"
stage="uninstall"
keep="true">
<args>
<arg value="delete"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6.0&quot;"/>
<arg value="&quot;HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.7&quot;"/>
<arg value="\/v"/>
<arg value="MicroVersion"/>
<arg value="\/f"/>
Expand Down
12 changes: 6 additions & 6 deletions make-and-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 784ded8

Please sign in to comment.