Adds support for --build-from= --boot-jdk= and creates OpenJDK 13 bootstrap archive.

Author: psumbera

README.md

@@ -1,6 +1,6 @@
 # Oracle Solaris OpenJDK Builder
 
-This project builds all OpenJDK versions from 9 till latest 17 for Solaris 11.4.
+This project builds all OpenJDK versions from 9 till latest 19 for Solaris 11.4.
 
 Note that this was done based on great job of Peter Tribble:
 https://ptribble.blogspot.com/2021/12/keeping-java-alive-on-illumos.html
@@ -10,9 +10,9 @@ At this time only amd64 platform is expected to work (not SPARC).
 You just need to have:
 - Oracle Solaris 11.4 (at least S11.4.24) with installed system header files
 - Git
-- JDK 8
+- JDK 8 [1]
 - GCC 10
-- Solaris Studio 12.4 (latest supported version! Release version isn't enough)
+- Solaris Studio 12.4 (latest supported version! Release version isn't enough) [1]
 - Internet access for OpenJDK repositories
 
 Alternatively you can use your OpenJDK repository mirror and set it via
@@ -51,3 +51,35 @@ After the build you should inspect build_dir/ for your OpenJDK binaries.
 Your build log files will be available in logs/ directory.
 
 You can use then archives.sh script which will create tar archives.
+
+Note also archives-bootstrap.sh which currently creates minimal archive
+with OpenJDK 13 for bootstraping (can be used for version 13 and 14).
+This might be needed if you don't have required version of Studio
+compiler).
+
+openjdk-13.0.11-bootstrap_SunOS-i386_bin.tar.xz should be available for
+download. The minimal OS version is Solaris 11.4 CBE release [2].
+
+--
+
+You can also build only newer OpenJDK versions. E.g. when you previously
+built older version and have them ready in your `build_dir` for
+bootstaping (at least when you have previous version).
+
+
+```
+./build-all.sh --build-from=17
+```
+
+Alternately you can use your own bootstrap version.
+
+```
+./build-all.sh --build-from=13 --boot-jdk=/export/home/build/jdk-13-bootstrap
+```
+
+--
+
+[1] JDK 8 is needed only for OpenJDK 9. Solaris Studio is needed only for
+    OpenJDK 9, 10, 11 and 12. See example with `--build-from=[NUM]`.
+
+[2] https://blogs.oracle.com/solaris/post/building-open-source-software-on-oracle-solaris-114-cbe-release

archives-bootstrap.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+WS="`pwd`"
+ARCHIVE_DIR="$WS/archives"
+mkdir -p $ARCHIVE_DIR
+
+if [ `uname -p` = 'sparc' ] ; then
+  JDK_PLATFORM="sparcv9"
+else
+  JDK_PLATFORM="x86_64"
+fi
+
+for VERSION in 13; do
+  if [ $VERSION -lt 12 ] ; then
+    JAVADIR="./build_dir/jdk${VERSION}u/build/solaris-$JDK_PLATFORM-normal-server-release/jdk"
+  else
+    JAVADIR="./build_dir/jdk${VERSION}u/build/solaris-$JDK_PLATFORM-server-release/jdk"
+  fi
+  test -x "$JAVADIR/bin/java" || continue
+  VERS=`"$JAVADIR/bin/java" --version | head -1 | gsed 's;-internal;-bootstrap;' | awk '{ print $1 "-" $2 }'`
+  VERS="${VERS}_`uname -s`-`uname -p`_bin"
+  echo "Creating archive $ARCHIVE_DIR/$VERS.tar.xz"
+  gtar cfhJ "$ARCHIVE_DIR/$VERS.tar.xz" "$JAVADIR" --transform "s;$JAVADIR;jdk-$VERSION-bootstrap;"
+done

archives.sh

@@ -4,7 +4,11 @@ WS="`pwd`"
 ARCHIVE_DIR="$WS/archives"
 mkdir -p $ARCHIVE_DIR
 
-. common.sh
+if [ `uname -p` = 'sparc' ] ; then
+  JDK_PLATFORM="sparcv9"
+else
+  JDK_PLATFORM="x86_64"
+fi
 
 for VERSION in {9..19}; do
   if [ $VERSION -lt 12 ] ; then

build-all.sh

@@ -5,9 +5,31 @@ LOG_DIR="$WS/logs"
 rm -rf $LOG_DIR
 mkdir -p $LOG_DIR
 
+BUILD_FROM_VER=0
+
+for i in "$@"; do
+  case "$i" in
+    --build-from=*)
+      BUILD_FROM_VER=$((0+"${i#*=}"))
+      ;;
+    --boot-jdk=*)
+      BOOT_JDK="${i#*=}"
+      ;;
+  esac
+done
+
 for VERSION in {9..19}; do
+
+  if [ $VERSION -lt $BUILD_FROM_VER ] ; then
+    echo "Skipping Openjdk $VERSION build."
+    continue
+  fi
+
   echo "Building Openjdk $VERSION..."
-  bash $WS/jdk-$VERSION.sh > $LOG_DIR/jdk-$VERSION.log 2>&1
+  BOOT_JDK="$BOOT_JDK" bash $WS/jdk-$VERSION.sh > $LOG_DIR/jdk-$VERSION.log 2>&1
+
+  # BOOT_JDK can be valid only for first version
+  BOOT_JDK=
 
   # Check for expected sucesful build output.
   tail -1 $LOG_DIR/jdk-$VERSION.log \

common.sh

@@ -8,6 +8,16 @@ else
   JDK_PLATFORM="x86_64"
 fi
 
+if [ -z $BOOT_JDK ] ; then
+  if [ $VERSION -eq 9 ] ; then
+    BOOT_JDK="/usr/jdk/instances/jdk1.8.0"
+  elif [ $VERSION -lt 13 ] ; then
+    BOOT_JDK="$BUILD_DIR/jdk$(($VERSION-1))u/build/solaris-$JDK_PLATFORM-normal-server-release/jdk"
+  else
+    BOOT_JDK="$BUILD_DIR/jdk$(($VERSION-1))u/build/solaris-$JDK_PLATFORM-server-release/jdk"
+  fi
+fi
+
 TOOLS_DIR="${SRC_DIR}_tools"
 
 STUDIO="/opt/solarisstudio12.4/bin"

jdk-10.sh

@@ -17,7 +17,6 @@ function fix_cups_versioning {
   gsed -i 's;_CUPS_API_DEPRECATED(...);_CUPS_API_DEPRECATED();' my-cups-versioning.h
 }
 
-BOOT_JDK="$BUILD_DIR/jdk9u/build/solaris-$JDK_PLATFORM-normal-server-release/jdk"
 PATH="$STUDIO:/usr/bin"
 
 CONFIGURE_OPTIONS+=" --with-boot-jdk=$BOOT_JDK"

jdk-11.sh

@@ -4,7 +4,6 @@ VERSION=11
 
 . common.sh
 
-BOOT_JDK="$BUILD_DIR/jdk10u/build/solaris-$JDK_PLATFORM-normal-server-release/jdk"
 PATH="$STUDIO:/usr/bin"
 
 CONFIGURE_OPTIONS+=" --with-boot-jdk=$BOOT_JDK"

jdk-12.sh

@@ -4,7 +4,6 @@ VERSION=12
 
 . common.sh
 
-BOOT_JDK="$BUILD_DIR/jdk11u/build/solaris-$JDK_PLATFORM-normal-server-release/jdk"
 PATH="$STUDIO:/usr/bin"
 
 CONFIGURE_OPTIONS+=" --with-boot-jdk=$BOOT_JDK"

jdk-13.sh

@@ -4,7 +4,6 @@ VERSION=13
 
 . common.sh
 
-BOOT_JDK="$BUILD_DIR/jdk12u/build/solaris-$JDK_PLATFORM-server-release/jdk"
 PATH="/usr/bin:/usr/gnu/bin"
 
 CONFIGURE_OPTIONS+=" --enable-unlimited-crypto"

jdk-14.sh

@@ -4,7 +4,6 @@ VERSION=14
 
 . common.sh
 
-BOOT_JDK="$BUILD_DIR/jdk13u/build/solaris-$JDK_PLATFORM-server-release/jdk"
 PATH="/usr/bin:/usr/gnu/bin"
 
 CONFIGURE_OPTIONS+=" --enable-unlimited-crypto"