jdk7u40 builds

build-linux-amd64.sh

@@ -12,14 +12,18 @@ export ALT_CACERTS_FILE="$OUB_DIR"/libs/cacerts/cacerts
 export ALT_BOOTDIR=/home/obf/jdk7
 export ALLOW_DOWNLOADS=false
 export MILESTONE=u40-unofficial
-export BUILD_NUMBER=b1
+export BUILD_NUMBER=b43
 export STATIC_CXX=true
 export UNLIMITED_CRYPTO=true
-export DEBUG_CLASSFILES=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 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
 
 "$OUB_DIR"/make-and-bundle.sh
+
+export FULL_DEBUG_SYMBOLS=1
+export DEBUG_CLASSFILES=true
+
+"$OUB_DIR"/make-and-bundle.sh -d -f

build-linux-i586.sh

@@ -12,14 +12,18 @@ export ALT_CACERTS_FILE="$OUB_DIR"/libs/cacerts/cacerts
 export ALT_BOOTDIR=/home/obf/jdk7
 export ALLOW_DOWNLOADS=false
 export MILESTONE=u40-unofficial
-export BUILD_NUMBER=b1
+export BUILD_NUMBER=b43
 export STATIC_CXX=true
 export UNLIMITED_CRYPTO=true
-export DEBUG_CLASSFILES=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 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
 
 "$OUB_DIR"/make-and-bundle.sh
+
+export FULL_DEBUG_SYMBOLS=1
+export DEBUG_CLASSFILES=true
+
+"$OUB_DIR"/make-and-bundle.sh -d -f

build-macosx-x86_64.sh

@@ -12,13 +12,17 @@ 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=b1
+export BUILD_NUMBER=b43
 #export STATIC_CXX=true
 export UNLIMITED_CRYPTO=true
-export DEBUG_CLASSFILES=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
+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
+
+export FULL_DEBUG_SYMBOLS=1
+export DEBUG_CLASSFILES=true
+
+"$OUB_DIR"/make-and-bundle.sh -d -f

build-windows-amd64.bat

@@ -40,18 +40,17 @@ rem other variables
 set UNLIMITED_CRYPTO=true
 set CYGWIN=nodosfilewarning
 set MILESTONE=u40-unofficial
-set BUILD_NUMBER=b1
+set BUILD_NUMBER=b43
 
 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 set USE_SYSTEM_GCONF=true
+rem set USE_SYSTEM_GIO=true
+rem set RHINO_JAR=%LIBS_DIR%/rhino/rhino-jdk7.jar
+rem set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
+rem set DISABLE_INTREE_EC=true 
 
 rem debug settings
-set DEBUG_CLASSFILES=true
-rem set FULL_DEBUG_SYMBOLS=0
+set FULL_DEBUG_SYMBOLS=0
 
 rem set compiler environment manually
 set WINDOWSSDKDIR=%WINSDK%
@@ -82,3 +81,9 @@ rem pause > nul
 
 rem start obf build
 bash %SCRIPT_DIR%/make-and-bundle.sh
+
+rem debug build settings
+set FULL_DEBUG_SYMBOLS=1
+set DEBUG_CLASSFILES=true
+
+bash %SCRIPT_DIR%/make-and-bundle.sh -d -f

build-windows-i586.bat

@@ -40,18 +40,17 @@ rem other variables
 set UNLIMITED_CRYPTO=true
 set CYGWIN=nodosfilewarning
 set MILESTONE=u40-unofficial
-set BUILD_NUMBER=b1
+set BUILD_NUMBER=b43
 
 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 set USE_SYSTEM_GCONF=true
+rem set USE_SYSTEM_GIO=true
+rem set RHINO_JAR=%LIBS_DIR%/rhino/rhino-jdk7.jar
+rem set FT2_CFLAGS=-I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
+rem set DISABLE_INTREE_EC=true 
 
 rem debug settings
-set DEBUG_CLASSFILES=true
-rem set FULL_DEBUG_SYMBOLS=0
+set FULL_DEBUG_SYMBOLS=0
 
 rem set compiler environment manually
 set WINDOWSSDKDIR=%WINSDK%
@@ -82,3 +81,9 @@ rem pause > nul
 
 rem start obf build
 bash %SCRIPT_DIR%/make-and-bundle.sh
+
+rem debug build settings
+set FULL_DEBUG_SYMBOLS=1
+set DEBUG_CLASSFILES=true
+
+bash %SCRIPT_DIR%/make-and-bundle.sh -d -f

installer/build-image.sh

@@ -1,19 +1,59 @@
 #!/bin/bash
 set -e
 
-# get installer builder dir
+# get image builder dir
 IMAGE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 OUB_DIR="$( dirname "$IMAGE_DIR" )"
 OBF_DIR="$( dirname "$OUB_DIR" )"
 
+# options
+IS_DEBUG=
+IS_ICEDTEA=
+SRC_DIR_RELATIVE=
+
+usage()
+{
+cat << EOF
+usage: $0 [-d -i] -s openjdk_src_dir
+
+options:
+    -d  debug build
+    -i  icedtea build
+    -s  openjdk source dir
+    -h  show this message
+EOF
+}
+
+while getopts "hdis:" OPTION
+do
+    case $OPTION in
+        h)
+            usage
+            exit
+            ;;
+        d)
+            IS_DEBUG="true"
+            ;;
+        i)
+            IS_ICEDTEA="true"
+            ;;
+        s)
+            SRC_DIR_RELATIVE=$OPTARG
+            ;;
+        ?)
+            usage
+            exit
+            ;;
+    esac
+done
+
 # check argument
-SRC_DIR_RELATIVE=$1
-if [ "x$SRC_DIR_RELATIVE" = "x" ] ; then
-    echo "Error: OpenJDK sources directry must be provided as script argument"
+if [ "x$SRC_DIR_RELATIVE" == "x" ] ; then
+    echo "Error: OpenJDK sources directry must be provided as '-s' argument"
     exit 1
 fi
 pushd "$SRC_DIR_RELATIVE" > /dev/null
-SRC_DIR=`pwd`
+SRC_DIR="$( pwd )"
 popd > /dev/null
 
 # search for jdk image
@@ -50,14 +90,28 @@ 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)}' )"
-ICEDTEA_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    
 if [ -z "$OPENJDK_VERSION" ] ; then
     echo "Error: cannot get 'java -version' from $JAVA"
     exit 1
 fi
 
 # pack image 
-IMAGE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-debug-image
+if [ "true" == "$IS_ICEDTEA" ] ; then
+    if [ "true" == "$IS_DEBUG" ] ; then
+        IMAGE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-debug-image
+    else
+        IMAGE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-image
+    fi
+else
+    if [ "true" == "$IS_DEBUG" ] ; then
+        IMAGE_NAME=openjdk-"$OPENJDK_VERSION"-"$PLATFORM"-debug-image
+    else
+        IMAGE_NAME=openjdk-"$OPENJDK_VERSION"-"$PLATFORM"-image
+    fi
+fi    
 WORK_DIR="$IMAGE_DIR"/target
 if [ ! -d "$WORK_DIR" ]; then
     mkdir "$WORK_DIR"
@@ -73,7 +127,19 @@ popd > /dev/null
 if [ "macosx-x86_64" == "$PLATFORM" ] ; then 
     # pack bundle
     JDK_BUNDLE="$SRC_DIR"/build/"$PLATFORM"/j2sdk-server-bundle
-    BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-debug-bundle
+    if [ "true" == "$IS_ICEDTEA" ] ; then
+        if [ "true" == "$IS_DEBUG" ] ; then
+            BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-debug-bundle
+        else
+            BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-bundle
+        fi
+    else
+        if [ "true" == "$IS_DEBUG" ] ; then
+            BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-"$PLATFORM"-debug-bundle
+        else
+            BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-"$PLATFORM"-bundle
+        fi
+    fi    
     CURDIR=`pwd`
     pushd "$WORK_DIR" > /dev/null
     cp -r "$JDK_BUNDLE" .

installer/build-installer.sh

@@ -7,10 +7,45 @@ OUB_DIR="$( dirname "$INSTALLER_DIR" )"
 OBF_DIR="$( dirname "$OUB_DIR" )"
 NEED_EXEC=false
 
+# options
+IS_ICEDTEA=
+SRC_DIR_RELATIVE=
+
+usage()
+{
+cat << EOF
+usage: $0 [-i] -s openjdk_src_dir
+
+options:
+    -i  icedtea build
+    -s  openjdk source dir
+    -h  show this message
+EOF
+}
+
+while getopts "his:" OPTION
+do
+    case $OPTION in
+        h)
+            usage
+            exit
+            ;;
+        i)
+            IS_ICEDTEA="true"
+            ;;
+        s)
+            SRC_DIR_RELATIVE=$OPTARG
+            ;;
+        ?)
+            usage
+            exit
+            ;;
+    esac
+done
+
 # check argument
-SRC_DIR_RELATIVE=$1
-if [ "x$SRC_DIR_RELATIVE" = "x" ] ; then
-    echo "Error: OpenJDK sources directry must be provided as script argument"
+if [ "x$SRC_DIR_RELATIVE" == "x" ] ; then
+    echo "Error: OpenJDK sources directry must be provided as '-s' argument"
     exit 1
 fi
 pushd "$SRC_DIR_RELATIVE" > /dev/null
@@ -55,7 +90,9 @@ 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)}' )"
-ICEDTEA_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    
 if [ -z "$OPENJDK_VERSION" ] ; then
     echo "Error: cannot get 'java -version' from $JAVA"
     exit 1
@@ -80,7 +117,11 @@ if [ "true" == "$NEED_EXEC" ] ; then
 fi
 
 # launch izpack
-BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-installer
+if [ "true" == "$IS_ICEDTEA" ] ; then
+    BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-icedtea-"$ICEDTEA_VERSION"-"$PLATFORM"-installer
+else
+    BUNDLE_NAME=openjdk-"$OPENJDK_VERSION"-"$PLATFORM"-installer
+fi    
 INSTALLER_TARGET="$INSTALLER_DIR"/target/"$BUNDLE_NAME"
 rm -rf "$INSTALLER_TARGET"
 pushd "$INSTALLER_DIR" > /dev/null

installer/linux-amd64/default-install-dir-linux.txt

@@ -1 +1 @@
-$USER_HOME/openjdk_1.7.0_u40_2.4.1_64
+$USER_HOME/openjdk_1.7.0_u40_64

installer/linux-amd64/izpack.xml

@@ -2,7 +2,7 @@
 <installation version="1.0">
     <info>
         <appname>OpenJDK 7 u40 unofficial linux-amd64</appname>
-        <appversion>(IcedTea 2.4.1)</appversion>
+        <appversion>build 43</appversion>
         <uninstaller path="$INSTALL_PATH/uninstall" name="uninstall.jar"/>
     </info>
 

installer/linux-i586/default-install-dir-linux.txt

@@ -1 +1 @@
-$USER_HOME/openjdk_1.7.0_u40_2.4.1
+$USER_HOME/openjdk_1.7.0_u40

installer/linux-i586/izpack.xml

@@ -2,7 +2,7 @@
 <installation version="1.0">
     <info>
         <appname>OpenJDK 7 u40 unofficial linux-i586</appname>
-        <appversion>(IcedTea 2.4.1)</appversion>
+        <appversion>build 43</appversion>
         <uninstaller path="$INSTALL_PATH/uninstall" name="uninstall.jar"/>
     </info>
 

installer/macosx-x86_64/default-install-dir-macosx.txt

@@ -1 +1 @@
-$USER_HOME/openjdk_1.7.0_u40_2.4.1
+$USER_HOME/openjdk_1.7.0_u40

installer/macosx-x86_64/izpack.xml

@@ -2,7 +2,7 @@
 <installation version="1.0">
     <info>
         <appname>OpenJDK 7 u40 unofficial macosx-x86_64</appname>
-        <appversion>(IcedTea 2.4.1)</appversion>
+        <appversion>build 43</appversion>
         <uninstaller path="$INSTALL_PATH/uninstall" name="uninstall.jar"/>
     </info>
 

installer/windows-amd64/default-install-dir-win.txt

@@ -1 +1 @@
-$USER_HOME\openjdk_1.7.0_u40_2.4.1_64
+$USER_HOME\openjdk_1.7.0_u40_64

installer/windows-amd64/izpack.xml

@@ -2,7 +2,7 @@
 <installation version="1.0">
     <info>
         <appname>OpenJDK 7 u40 unofficial windows-amd64</appname>
-        <appversion>(IcedTea 2.4.1)</appversion>
+        <appversion>build 43</appversion>
         <uninstaller path="$INSTALL_PATH/uninstall" name="uninstall.jar"/>
     </info>
 

installer/windows-i586/default-install-dir-win.txt

@@ -1 +1 @@
-$USER_HOME\openjdk_1.7.0_u40_2.4.1
+$USER_HOME\openjdk_1.7.0_u40

installer/windows-i586/izpack.xml

@@ -2,7 +2,7 @@
 <installation version="1.0">
     <info>
         <appname>OpenJDK 7 u40 unofficial windows-i586</appname>
-        <appversion>(IcedTea 2.4.1)</appversion>
+        <appversion>build 43</appversion>
         <uninstaller path="$INSTALL_PATH/uninstall" name="uninstall.jar"/>
     </info>