diff --git a/build-linux-amd64.sh b/build-linux-amd64.sh index 2e4929b..07f7b88 100755 --- a/build-linux-amd64.sh +++ b/build-linux-amd64.sh @@ -9,21 +9,14 @@ 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/jdk7 +export ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk export ALLOW_DOWNLOADS=false -export MILESTONE=u40-unofficial -export BUILD_NUMBER=b60 -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' -export DISABLE_INTREE_EC=true +export MILESTONE=unofficial +export BUILD_NUMBER=b28 -"$OUB_DIR"/make-and-bundle.sh -i +"$OUB_DIR"/make-and-bundle.sh -export FULL_DEBUG_SYMBOLS=1 export DEBUG_CLASSFILES=true +export ALT_OUTPUTDIR="$OUB_DIR"/../openjdk/build.debug/linux-amd64/ -"$OUB_DIR"/make-and-bundle.sh -i -d -f +"$OUB_DIR"/make-and-bundle.sh -d -f diff --git a/build-linux-i586.sh b/build-linux-i586.sh index 2e4929b..ac11574 100755 --- a/build-linux-i586.sh +++ b/build-linux-i586.sh @@ -9,21 +9,14 @@ 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/jdk7 +export ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk export ALLOW_DOWNLOADS=false -export MILESTONE=u40-unofficial -export BUILD_NUMBER=b60 -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' -export DISABLE_INTREE_EC=true +export MILESTONE=unofficial +export BUILD_NUMBER=b28 -"$OUB_DIR"/make-and-bundle.sh -i +"$OUB_DIR"/make-and-bundle.sh -export FULL_DEBUG_SYMBOLS=1 export DEBUG_CLASSFILES=true +export ALT_OUTPUTDIR="$OUB_DIR"/../openjdk/build.debug/linux-i586/ -"$OUB_DIR"/make-and-bundle.sh -i -d -f +"$OUB_DIR"/make-and-bundle.sh -d -f diff --git a/build-macosx-x86_64.sh b/build-macosx-x86_64.sh deleted file mode 100755 index c81f4f4..0000000 --- a/build-macosx-x86_64.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -e -OUB_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -export LD_LIBRARY_PATH= -export CLASSPATH= -export JAVA_HOME= -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/jdk7 -export ALLOW_DOWNLOADS=false -export MILESTONE=u40-unofficial -export BUILD_NUMBER=b60 -#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 - -"$OUB_DIR"/make-and-bundle.sh -i - -export FULL_DEBUG_SYMBOLS=1 -export DEBUG_CLASSFILES=true - -"$OUB_DIR"/make-and-bundle.sh -i -d -f diff --git a/build-windows-amd64.bat b/build-windows-amd64.bat index 61803f5..072ad5c 100755 --- a/build-windows-amd64.bat +++ b/build-windows-amd64.bat @@ -10,66 +10,42 @@ set BAD_SLASH_SCRIPT_DIR=%~dp0 set SCRIPT_DIR=%BAD_SLASH_SCRIPT_DIR:\=/% set UTILS_DIR=%SCRIPT_DIR%utils set LIBS_DIR=%SCRIPT_DIR%libs -set VS=%UTILS_DIR%/winsdk71/vs2010e -set WINSDK=%UTILS_DIR%/winsdk71/sdk +set PSDK=c:/Program Files/Microsoft Platform SDK rem utils in path set MAKE_HOME=%UTILS_DIR%/make set PATH_PREPEND=%UTILS_DIR%/path_prepend set CYGWIN_HOME=%UTILS_DIR%/cygwin -set BOOTJDK_HOME=%SCRIPT_DIR%/../jdk7 +set BOOTJDK_HOME=%SCRIPT_DIR%/../jdk6 set ANT_HOME=%UTILS_DIR%/ant +rem path +set PATH=%PATH_PREPEND%;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;%MAKE_HOME%;%CYGWIN_HOME%/bin;%BOOTJDK_HOME%/bin;%ANT_HOME%/bin + rem ALT_* varibles set ALT_BOOTDIR=%BOOTJDK_HOME% -set ALT_COMPILER_PATH=%VS%/VC/Bin/x86_amd64 -set ALT_WINDOWSSDKDIR=%WINSDK% -set ALT_FREETYPE_LIB_PATH=%LIBS_DIR%/freetype/dist/7_64 +set ALT_COMPILER_PATH=%PSDK%/Bin/win64/x86/AMD64 +set ALT_MSDEVTOOLS_PATH=%PSDK%/Bin +set ALT_FREETYPE_LIB_PATH=%LIBS_DIR%/freetype/dist/6_64 set ALT_FREETYPE_HEADERS_PATH=%LIBS_DIR%/freetype/include -set ALT_MSVCRNN_DLL_PATH=%LIBS_DIR%/msvcr/7_64 +set ALT_UNICOWS_LIB_PATH=%LIBS_DIR%/unicows +set ALT_UNICOWS_DLL_PATH=%LIBS_DIR%/unicows +set ALT_MSVCRT_DLL_PATH=%LIBS_DIR%/msvcr/6_64 set ALT_DXSDK_PATH=%LIBS_DIR%/directx set ALT_CACERTS_FILE=%LIBS_DIR%/cacerts/cacerts -rem set ALT_PARALLEL_COMPILE_JOBS=1 -rem set HOTSPOT_BUILD_JOBS=1 rem other openjdk variables -rem set ALLOW_DOWNLOADS=true +set ALLOW_DOWNLOADS=false rem set NO_DOCS=true rem other variables -set UNLIMITED_CRYPTO=true set CYGWIN=nodosfilewarning -set MILESTONE=u40-unofficial -set BUILD_NUMBER=b60 - -rem icedtea specific -set USE_SYSTEM_GCONF=true -set USE_SYSTEM_GIO=true -set RHINO_JAR=%LIBS_DIR%/rhino/rhino-jdk7.jar -set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 -set DISABLE_INTREE_EC=true - -rem debug settings -set FULL_DEBUG_SYMBOLS=0 +set MILESTONE=unofficial +set BUILD_NUMBER=b28 +set STATIC_CXX=true -rem set compiler environment manually -set WINDOWSSDKDIR=%WINSDK% -set VS100COMNTOOLS=%VS%/Common7/Tools -set Configuration=Release -set WindowsSDKVersionOverride=v7.1 -set ToolsVersion=4.0 -set TARGET_CPU=x64 -set CURRENT_CPU=x64 -set PlatformToolset=Windows7.1SDK -set TARGET_PLATFORM=XP -rem set PROCESSOR_ARCHITECTURE=x86 -rem set PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH -rem set APPVER=5.01 -rem set CommandPromptType=Native -set LIB=%VS%/VC/Lib/amd64;%WINSDK%/Lib/x64 -set LIBPATH=%VS%/VC/Lib/amd64 -set PATH=%PATH_PREPEND%;%VS%/Common7/IDE;%VS%/Common7/Tools;%VS%/VC/Bin/x86_amd64;%VS%/VC/Bin;%VS%/VC/Bin/VCPackages;%WINSDK%/Bin;C:/WINDOWS/System32;C:/WINDOWS;C:/WINDOWS/System32/wbem;%MAKE_HOME%;%CYGWIN_HOME%/bin;%BOOTJDK_HOME%/bin;%ANT_HOME%/bin;%LIBS_DIR%/msvcr/7_64;%LIBS_DIR%/msvcr/7_32;%VS%/Common7/IDE -set INCLUDE=%VS%/VC/INCLUDE;%WINSDK%/INCLUDE;%WINSDK%/INCLUDE/gl; +rem set compiler environment +call "%PSDK%"/SetEnv.cmd /X64 /RETAIL rem uncomment next lines for manual builds rem echo OpenJDK build environment is ready @@ -80,10 +56,10 @@ rem echo Press any key to close window ... rem pause > nul rem start obf build -bash %SCRIPT_DIR%/make-and-bundle.sh -i +bash %SCRIPT_DIR%/make-and-bundle.sh rem debug build settings -set FULL_DEBUG_SYMBOLS=1 set DEBUG_CLASSFILES=true +set ALT_OUTPUTDIR=%SCRIPT_DIR%/../openjdk/build.debug/windows-amd64/ -bash %SCRIPT_DIR%/make-and-bundle.sh -i -d -f +bash %SCRIPT_DIR%/make-and-bundle.sh -d -f diff --git a/build-windows-i586.bat b/build-windows-i586.bat index 24ea5f6..c81bdcb 100755 --- a/build-windows-i586.bat +++ b/build-windows-i586.bat @@ -10,80 +10,58 @@ set BAD_SLASH_SCRIPT_DIR=%~dp0 set SCRIPT_DIR=%BAD_SLASH_SCRIPT_DIR:\=/% set UTILS_DIR=%SCRIPT_DIR%utils set LIBS_DIR=%SCRIPT_DIR%libs -set VS=%UTILS_DIR%/winsdk71/vs2010e -set WINSDK=%UTILS_DIR%/winsdk71/sdk +set VC=c:/Program Files/Microsoft Visual Studio .NET 2003 rem utils in path set MAKE_HOME=%UTILS_DIR%/make set PATH_PREPEND=%UTILS_DIR%/path_prepend set CYGWIN_HOME=%UTILS_DIR%/cygwin -set BOOTJDK_HOME=%SCRIPT_DIR%/../jdk7 +set BOOTJDK_HOME=%SCRIPT_DIR%/../jdk6 set ANT_HOME=%UTILS_DIR%/ant +rem path +set PATH=%PATH_PREPEND%;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;%MAKE_HOME%;%CYGWIN_HOME%/bin;%BOOTJDK_HOME%/bin;%ANT_HOME%/bin + rem ALT_* varibles set ALT_BOOTDIR=%BOOTJDK_HOME% -set ALT_COMPILER_PATH=%VS%/VC/Bin -set ALT_WINDOWSSDKDIR=%WINSDK% -set ALT_FREETYPE_LIB_PATH=%LIBS_DIR%/freetype/dist/7_32 +set ALT_COMPILER_PATH=%VC%/VC7/Bin +set ALT_MSDEVTOOLS_PATH=%VC%/Common7/Tools/Bin +set ALT_FREETYPE_LIB_PATH=%LIBS_DIR%/freetype/dist/6_32 set ALT_FREETYPE_HEADERS_PATH=%LIBS_DIR%/freetype/include -set ALT_MSVCRNN_DLL_PATH=%LIBS_DIR%/msvcr/7_32 +set ALT_UNICOWS_LIB_PATH=%LIBS_DIR%/unicows +set ALT_UNICOWS_DLL_PATH=%LIBS_DIR%/unicows +set ALT_MSVCRT_DLL_PATH=%LIBS_DIR%/msvcr/6_32 +set ALT_MSVCR71_DLL_PATH=%LIBS_DIR%/msvcr/6_32 set ALT_DXSDK_PATH=%LIBS_DIR%/directx set ALT_CACERTS_FILE=%LIBS_DIR%/cacerts/cacerts -rem set ALT_PARALLEL_COMPILE_JOBS=1 -rem set HOTSPOT_BUILD_JOBS=1 rem other openjdk variables -rem set ALLOW_DOWNLOADS=true +set ALLOW_DOWNLOADS=false rem set NO_DOCS=true rem other variables -set UNLIMITED_CRYPTO=true +rem set UNLIMITED_CRYPTO=true set CYGWIN=nodosfilewarning -set MILESTONE=u40-unofficial -set BUILD_NUMBER=b60 - -rem icedtea specific -set USE_SYSTEM_GCONF=true -set USE_SYSTEM_GIO=true -set RHINO_JAR=%LIBS_DIR%/rhino/rhino-jdk7.jar -set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 -set DISABLE_INTREE_EC=true - -rem debug settings -set FULL_DEBUG_SYMBOLS=0 +set MILESTONE=unofficial +set BUILD_NUMBER=b28 +set STATIC_CXX=true -rem set compiler environment manually -set WINDOWSSDKDIR=%WINSDK% -set VS100COMNTOOLS=%VS%/Common7/Tools -set Configuration=Release -set WindowsSDKVersionOverride=v7.1 -set ToolsVersion=4.0 -set TARGET_CPU=x86 -set CURRENT_CPU=x86 -set PlatformToolset=Windows7.1SDK -set TARGET_PLATFORM=XP -rem set PROCESSOR_ARCHITECTURE=x86 -rem set PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH -rem set APPVER=5.01 -rem set CommandPromptType=Native -set LIB=%VS%/VC/Lib;%WINSDK%/Lib -set LIBPATH=%VS%/VC/Lib -set PATH=%PATH_PREPEND%;%VS%/Common7/IDE;%VS%/Common7/Tools;%VS%/VC/Bin;%VS%/VC/Bin/VCPackages;%WINSDK%/Bin;C:/WINDOWS/system32;C:/WINDOWS;C:/WINDOWS/System32/Wbem;%MAKE_HOME%;%CYGWIN_HOME%/bin;%BOOTJDK_HOME%/bin;%ANT_HOME%/bin;%LIBS_DIR%/msvcr/7_32 -set INCLUDE=%VS%/VC/INCLUDE;%WINSDK%/INCLUDE;%WINSDK%/INCLUDE/gl; +rem set compiler environment +call "%VC%/Common7/Tools/vsvars32.bat" rem uncomment next lines for interactive build rem echo OpenJDK build environment is ready rem echo To start build go to sources root and type "make" -rem echo JDK binaries will be placed into "\build\windows-i585\j2sdk-image" +rem echo JDK binaries will be placed into "\build\windows-i586\j2sdk-image" rem bash rem echo Press any key to close window ... rem pause > nul rem start obf build -bash %SCRIPT_DIR%/make-and-bundle.sh -i +bash %SCRIPT_DIR%/make-and-bundle.sh rem debug build settings -set FULL_DEBUG_SYMBOLS=1 set DEBUG_CLASSFILES=true +set ALT_OUTPUTDIR=%SCRIPT_DIR%/../openjdk/build.debug/windows-i586/ -bash %SCRIPT_DIR%/make-and-bundle.sh -i -d -f +bash %SCRIPT_DIR%/make-and-bundle.sh -d -f diff --git a/host/cleanhg.sh b/host/cleanhg.sh new file mode 100755 index 0000000..65c620c --- /dev/null +++ b/host/cleanhg.sh @@ -0,0 +1,2 @@ +#!/bin/bash +find . -name .hg -exec rm -rf {} \; diff --git a/host/jdk6-linux-amd64.env b/host/jdk6-linux-amd64.env index ada1f4b..1446e9b 100644 --- a/host/jdk6-linux-amd64.env +++ b/host/jdk6-linux-amd64.env @@ -2,12 +2,12 @@ export VM_ADDRESS=192.168.42.1 export VM_NAME=jdk6-linux-amd64-obf export VM_OSTYPE=Debian_64 -export VM_MEMORY=1280 +export VM_MEMORY=1512 export VM_IOAPIC=on export VM_NICTYPE=82540EM export VM_MACADDR=080027CC317D export VM_OBF_DIR=/home/obf export VM_UNZIP=unzip -export VM_START_BUILD="nohup oub/build-linux-i586.sh >> build.log 2>&1 &" +export VM_START_BUILD="nohup oub/build-linux-amd64.sh >> build.log 2>&1 &" export VM_SHUTDOWN="/sbin/shutdown -h now" export VM_IDE_CONTROLLER=PIIX4 diff --git a/host/jdk6-windows-amd64.env b/host/jdk6-windows-amd64.env index d3198ed..ae9dcaa 100644 --- a/host/jdk6-windows-amd64.env +++ b/host/jdk6-windows-amd64.env @@ -2,7 +2,7 @@ export VM_ADDRESS=192.168.42.1 export VM_NAME=jdk6-windows-amd64-obf export VM_OSTYPE=Windows2003_64 -export VM_MEMORY=768 +export VM_MEMORY=1512 export VM_IOAPIC=on export VM_NICTYPE=82545EM export VM_MACADDR=auto diff --git a/host/jdk7-linux-amd64.env b/host/jdk7-linux-amd64.env index 89498c5..9d08a49 100644 --- a/host/jdk7-linux-amd64.env +++ b/host/jdk7-linux-amd64.env @@ -8,6 +8,6 @@ export VM_NICTYPE=82540EM export VM_MACADDR=080027CC317D export VM_OBF_DIR=/home/obf export VM_UNZIP=unzip -export VM_START_BUILD="nohup oub/build-linux-i586.sh >> build.log 2>&1 &" +export VM_START_BUILD="nohup oub/build-linux-amd64.sh >> build.log 2>&1 &" export VM_SHUTDOWN="/sbin/shutdown -h now" export VM_IDE_CONTROLLER=PIIX4 diff --git a/installer/build-image.sh b/installer/build-image.sh index b590455..ec2216e 100755 --- a/installer/build-image.sh +++ b/installer/build-image.sh @@ -56,40 +56,44 @@ pushd "$SRC_DIR_RELATIVE" > /dev/null SRC_DIR="$( pwd )" popd > /dev/null +if [ "true" == "$IS_DEBUG" ] ; then + BUILD_OUT_DIR=build.debug +else + BUILD_OUT_DIR=build +fi + # search for jdk image -if [ -d "$SRC_DIR"/build/windows-i586 ] ; then +if [ -d "$SRC_DIR"/"$BUILD_OUT_DIR"/windows-i586 ] ; then PLATFORM=windows-i586 ZIP=""$OBF_DIR"/zip/zip -qr" -elif [ -d "$SRC_DIR"/build/windows-amd64 ] ; then +elif [ -d "$SRC_DIR"/"$BUILD_OUT_DIR"/windows-amd64 ] ; then PLATFORM=windows-amd64 ZIP=""$OBF_DIR"/zip/zip -qr" -elif [ -d "$SRC_DIR"/build/linux-i586 ] ; then +elif [ -d "$SRC_DIR"/"$BUILD_OUT_DIR"/linux-i586 ] ; then PLATFORM=linux-i586 ZIP="zip -qry" -elif [ -d "$SRC_DIR"/build/linux-amd64 ] ; then +elif [ -d "$SRC_DIR"/"$BUILD_OUT_DIR"/linux-amd64 ] ; then PLATFORM=linux-amd64 ZIP="zip -qry" -elif [ -d "$SRC_DIR"/build/macosx-x86_64 ] ; then - PLATFORM=macosx-x86_64 - ZIP="zip -qry" - if [ ! -d "$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image ] ; then - # prepare server image - cp -r "$SRC_DIR"/build/"$PLATFORM"/j2sdk-image "$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image - rm -rf "$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image/demo - rm -rf "$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image/sample - fi else - echo "Error: OpenJDK binaries not found in $SRC_DIR/build" + echo "Error: OpenJDK binaries not found in $SRC_DIR/"$BUILD_OUT_DIR"" exit 1 fi +if [ ! -d "$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-server-image ] ; then + # prepare server image + cp -r "$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-image "$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-server-image + rm -rf "$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-server-image/demo + rm -rf "$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-server-image/sample +fi + # extract version -JDK_IMAGE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image +JDK_IMAGE="$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-server-image echo "Packing OpenJDK image: $JDK_IMAGE" JAVA="$JDK_IMAGE"/bin/java -OPENJDK_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==1{print substr($3,2,length($3)-2)}' )" +OPENJDK_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}' )" if [ "true" == "$IS_ICEDTEA" ] ; then ICEDTEA_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}' )" fi @@ -126,7 +130,7 @@ popd > /dev/null if [ "macosx-x86_64" == "$PLATFORM" ] ; then # pack bundle - JDK_BUNDLE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-bundle + JDK_BUNDLE="$SRC_DIR"/"$BUILD_OUT_DIR"/"$PLATFORM"/j2sdk-server-bundle if [ "true" == "$IS_ICEDTEA" ] ; then if [ "true" == "$IS_DEBUG" ] ; then BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-debug-bundle diff --git a/installer/build-installer.sh b/installer/build-installer.sh index 27d28ee..8e5df09 100755 --- a/installer/build-installer.sh +++ b/installer/build-installer.sh @@ -89,7 +89,7 @@ JDK_IMAGE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-image echo "Building installer for OpenJDK image: $JDK_IMAGE" JAVA="$JDK_IMAGE"/bin/java -OPENJDK_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==1{print substr($3,2,length($3)-2)}' )" +OPENJDK_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}' )" if [ "true" == "$IS_ICEDTEA" ] ; then ICEDTEA_VERSION="$( "$JAVA" -version 2>&1 | awk 'NR==2{print substr($5,0,length($5)-1)}' )" fi diff --git a/installer/linux-amd64/default-install-dir-linux.txt b/installer/linux-amd64/default-install-dir-linux.txt index a96c5d1..31c78df 100644 --- a/installer/linux-amd64/default-install-dir-linux.txt +++ b/installer/linux-amd64/default-install-dir-linux.txt @@ -1 +1 @@ -$USER_HOME/openjdk_1.7.0_u40_2.4.2_64 +$USER_HOME/openjdk_1.6.0_b28_64 diff --git a/installer/linux-amd64/izpack.xml b/installer/linux-amd64/izpack.xml index 55d5e61..f729feb 100644 --- a/installer/linux-amd64/izpack.xml +++ b/installer/linux-amd64/izpack.xml @@ -1,8 +1,8 @@ - OpenJDK 7 u40 unofficial linux-amd64 - (IcedTea 2.4.2) + OpenJDK 6 unofficial linux-amd64 + build 28 diff --git a/installer/linux-i586/default-install-dir-linux.txt b/installer/linux-i586/default-install-dir-linux.txt index 80ce832..4f72cc7 100644 --- a/installer/linux-i586/default-install-dir-linux.txt +++ b/installer/linux-i586/default-install-dir-linux.txt @@ -1 +1 @@ -$USER_HOME/openjdk_1.7.0_u40_2.4.2 +$USER_HOME/openjdk_1.6.0_b28 diff --git a/installer/linux-i586/izpack.xml b/installer/linux-i586/izpack.xml index 9f6e54c..e776751 100644 --- a/installer/linux-i586/izpack.xml +++ b/installer/linux-i586/izpack.xml @@ -1,8 +1,8 @@ - OpenJDK 7 u40 unofficial linux-i586 - (IcedTea 2.4.2) + OpenJDK 6 unofficial linux-i586 + build 28 diff --git a/installer/macosx-x86_64/.DS_Store b/installer/macosx-x86_64/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/installer/macosx-x86_64/.DS_Store and /dev/null differ diff --git a/installer/macosx-x86_64/customicons.xml b/installer/macosx-x86_64/customicons.xml deleted file mode 100644 index 311c152..0000000 --- a/installer/macosx-x86_64/customicons.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/installer/macosx-x86_64/default-install-dir-macosx.txt b/installer/macosx-x86_64/default-install-dir-macosx.txt deleted file mode 100644 index 80ce832..0000000 --- a/installer/macosx-x86_64/default-install-dir-macosx.txt +++ /dev/null @@ -1 +0,0 @@ -$USER_HOME/openjdk_1.7.0_u40_2.4.2 diff --git a/installer/macosx-x86_64/duke.png b/installer/macosx-x86_64/duke.png deleted file mode 100644 index 37d71ff..0000000 Binary files a/installer/macosx-x86_64/duke.png and /dev/null differ diff --git a/installer/macosx-x86_64/install b/installer/macosx-x86_64/install deleted file mode 100755 index b829749..0000000 Binary files a/installer/macosx-x86_64/install and /dev/null differ diff --git a/installer/macosx-x86_64/install.png b/installer/macosx-x86_64/install.png deleted file mode 100644 index 422e51d..0000000 Binary files a/installer/macosx-x86_64/install.png and /dev/null differ diff --git a/installer/macosx-x86_64/install_bundle.sh b/installer/macosx-x86_64/install_bundle.sh deleted file mode 100755 index 952bad4..0000000 --- a/installer/macosx-x86_64/install_bundle.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -mkdir -p ~/Library/Java/JavaVirtualMachines -cp -R "$CUR_DIR"/jdk1.7.0.jdk ~/Library/Java/JavaVirtualMachines -echo "Budle insalled into ~/Library/Java/JavaVirtualMachines/jdk1.7.0.jdk" diff --git a/installer/macosx-x86_64/izpack.xml b/installer/macosx-x86_64/izpack.xml deleted file mode 100644 index df18bd1..0000000 --- a/installer/macosx-x86_64/izpack.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - OpenJDK 7 u40 unofficial macosx-x86_64 - (IcedTea 2.4.2) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OpenJDK Runtime Environment installation files - -${JRE_EXECUTABLES} - - - OpenJDK Development Kit installation files - -${JDK_EXECUTABLES} - - - OpenJDK uninstaller files - - - - - Set "JAVA_HOME" environment variable through "~/.bash_profile" file - - - - - diff --git a/installer/macosx-x86_64/license.txt b/installer/macosx-x86_64/license.txt deleted file mode 100755 index b40a0f4..0000000 --- a/installer/macosx-x86_64/license.txt +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., 59 - Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/installer/macosx-x86_64/uninstall/tools/append_bash_profile.sh b/installer/macosx-x86_64/uninstall/tools/append_bash_profile.sh deleted file mode 100644 index 9fded8f..0000000 --- a/installer/macosx-x86_64/uninstall/tools/append_bash_profile.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -e -TOOLS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -UNINSTALL_DIR="$( dirname "$TOOLS_DIR" )" -JDK_DIR="$( dirname "$UNINSTALL_DIR" )" -DATE="$( date +%Y-%m-%d_%H:%M:%S )" - -if [ -f ~/.bash_profile ] ; then - echo "export JAVA_HOME="$JDK_DIR" # OpenJDK installer entry, added on "$DATE"" >> ~/.bash_profile -fi diff --git a/installer/macosx-x86_64/uninstall/tools/clear_bash_profile.sh b/installer/macosx-x86_64/uninstall/tools/clear_bash_profile.sh deleted file mode 100644 index 55c0dbc..0000000 --- a/installer/macosx-x86_64/uninstall/tools/clear_bash_profile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -DATE="$( date +%Y-%m-%d_%H:%M:%S )" - -if [ -f ~/.bash_profile ] ; then - echo "export JAVA_HOME=\"\" # OpenJDK uninstaller entry, added on "$DATE"" >> ~/.bash_profile -fi diff --git a/installer/macosx-x86_64/uninstall/uninstall b/installer/macosx-x86_64/uninstall/uninstall deleted file mode 100755 index fd57505..0000000 Binary files a/installer/macosx-x86_64/uninstall/uninstall and /dev/null differ diff --git a/installer/windows-amd64/default-install-dir-win.txt b/installer/windows-amd64/default-install-dir-win.txt index 55967ab..a9d7faf 100644 --- a/installer/windows-amd64/default-install-dir-win.txt +++ b/installer/windows-amd64/default-install-dir-win.txt @@ -1 +1 @@ -$USER_HOME\openjdk_1.7.0_u40_2.4.2_64 +$USER_HOME\openjdk_1.6.0_b28_64 diff --git a/installer/windows-amd64/izpack.xml b/installer/windows-amd64/izpack.xml index 0743848..9a2c53f 100644 --- a/installer/windows-amd64/izpack.xml +++ b/installer/windows-amd64/izpack.xml @@ -1,8 +1,8 @@ - OpenJDK 7 u40 unofficial windows-amd64 - (IcedTea 2.4.2) + OpenJDK 6 unofficial windows-amd64 + build 28 @@ -168,14 +168,14 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j required="no" preselected="no"> -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. +Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6" 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,7 +225,7 @@ Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/ keep="true"> - + @@ -239,7 +239,7 @@ 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 c98fefa..f09d4c6 100644 --- a/installer/windows-i586/default-install-dir-win.txt +++ b/installer/windows-i586/default-install-dir-win.txt @@ -1 +1 @@ -$USER_HOME\openjdk_1.7.0_u40_2.4.2 +$USER_HOME\openjdk_1.6.0_b28 diff --git a/installer/windows-i586/izpack.xml b/installer/windows-i586/izpack.xml index e30fec1..7e80233 100644 --- a/installer/windows-i586/izpack.xml +++ b/installer/windows-i586/izpack.xml @@ -1,8 +1,8 @@ - OpenJDK 7 u40 unofficial windows-i586 - (IcedTea 2.4.2) + OpenJDK 6 unofficial windows-i586 + build 28 @@ -168,15 +168,15 @@ Add "JAVA_HOME" environment variable and append "JAVA_HOME/bin" and "JAVA_HOME/j required="no" preselected="no"> -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. +Add registry key "HKEY_LOCAL_MACHINE/Software/JavaSoft/Java Runtime Environment/1.6" 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.6" 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,7 +226,7 @@ Note: installing i586 OpenJDK on amd64 Windows, registry entries will be added t keep="true"> - + @@ -240,7 +240,7 @@ 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 143f981..2515732 100755 --- a/make-and-bundle.sh +++ b/make-and-bundle.sh @@ -48,9 +48,6 @@ done echo "Starting make" >> "$LOG_FILE" cd "$OBF_DIR"/openjdk - -make clean >> "$LOG_FILE" 2>&1 -rm -rf build make >> "$LOG_FILE" 2>&1 if [ $? -ne 0 ] ; then echo "Build aborted with error on 'make'" >> "$LOG_FILE"