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

Commit

Permalink
jdk6b28 builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexkasko
alexkasko committed Oct 7, 2013
1 parent e7a9f3d commit 31ee2f8
Show file tree
Hide file tree
Showing 32 changed files with 110 additions and 640 deletions.
19 changes: 6 additions & 13 deletions build-linux-amd64.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 6 additions & 13 deletions build-linux-i586.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 0 additions & 28 deletions build-macosx-x86_64.sh
View file

This file was deleted.

64 changes: 20 additions & 44 deletions build-windows-amd64.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
68 changes: 23 additions & 45 deletions build-windows-i586.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "<sources_root>\build\windows-i585\j2sdk-image"
rem echo JDK binaries will be placed into "<sources_root>\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
2 changes: 2 additions & 0 deletions host/cleanhg.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
find . -name .hg -exec rm -rf {} \;
4 changes: 2 additions & 2 deletions host/jdk6-linux-amd64.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion host/jdk6-windows-amd64.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion host/jdk7-linux-amd64.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
38 changes: 21 additions & 17 deletions installer/build-image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 31ee2f8

Please sign in to comment.