JBR-3905 add incremental JBR building

(cherry picked from commit 54f28cde44)
2025-12-06 09:29:38 +01:00 · 2021-10-24 08:53:21 +07:00
parent e7120e03cc
commit fdb29e2b80
3 changed files with 107 additions and 55 deletions
--- a/jb/project/tools/linux/scripts/mkimages_x64.sh
+++ b/jb/project/tools/linux/scripts/mkimages_x64.sh
@@ -21,6 +21,16 @@
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_linux_x64

+while getopts ":i?" o; do
+    case "${o}" in
+        i)
+            i="incremental build"
+            INC_BUILD=1
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -30,6 +40,19 @@ JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}

 source jb/project/tools/common/scripts/common.sh

+function do_configure {
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes || do_exit $?
+}
+
 function create_image_bundle {
  __bundle_name=$1
  __arch_name=$2
@@ -85,18 +108,10 @@ case "$bundle_type" in
    ;;
 esac

-sh configure \
-  $WITH_DEBUG_LEVEL \
-  --with-vendor-name="$VENDOR_NAME" \
-  --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-  --with-jvm-features=shenandoahgc \
-  --with-version-pre= \
-  --with-version-build="$JDK_BUILD_NUMBER" \
-  --with-version-opt=b"$build_number" \
-  --with-boot-jdk="$BOOT_JDK" \
-  --enable-cds=yes || do_exit $?
-
-make clean CONF=$RELEASE_NAME || exit $?
+if [ -z "$INC_BUILD" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
 make images CONF=$RELEASE_NAME || do_exit $?

 IMAGES_DIR=build/$RELEASE_NAME/images
--- a/jb/project/tools/mac/scripts/mkimages.sh
+++ b/jb/project/tools/mac/scripts/mkimages.sh
@@ -21,6 +21,16 @@
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_mac

+while getopts ":i?" o; do
+    case "${o}" in
+        i)
+            i="incremental build"
+            INC_BUILD=1
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -41,6 +51,36 @@ function copyJNF {
    cp -Rp Frameworks/JavaNativeFoundation.framework ${__contents_dir}/Frameworks
 }

+function do_configure {
+  if [[ "${architecture}" == *aarch64* ]]; then
+    sh configure \
+      $WITH_DEBUG_LEVEL \
+      --with-vendor-name="${VENDOR_NAME}" \
+      --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+      --with-jvm-features=shenandoahgc \
+      --with-version-pre= \
+      --with-version-build="${JDK_BUILD_NUMBER}" \
+      --with-version-opt=b"${build_number}" \
+      --with-boot-jdk="$BOOT_JDK" \
+      --disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
+      --enable-cds=no \
+      --with-extra-cflags="-F$(pwd)/Frameworks" \
+      --with-extra-cxxflags="-F$(pwd)/Frameworks" \
+      --with-extra-ldflags="-F$(pwd)/Frameworks" || do_exit $?
+  else
+    sh configure \
+      $WITH_DEBUG_LEVEL \
+      --with-vendor-name="$VENDOR_NAME" \
+      --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+      --with-jvm-features=shenandoahgc \
+      --with-version-pre= \
+      --with-version-build="$JDK_BUILD_NUMBER" \
+      --with-version-opt=b"$build_number" \
+      --with-boot-jdk="$BOOT_JDK" \
+      --enable-cds=yes || do_exit $?
+  fi
+}
+
 function create_image_bundle {
  __bundle_name=$1
  __arch_name=$2
@@ -112,34 +152,10 @@ case "$bundle_type" in
    ;;
 esac

-if [[ "${architecture}" == *aarch64* ]]; then
-  sh configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="${JDK_BUILD_NUMBER}" \
-    --with-version-opt=b"${build_number}" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
-    --enable-cds=no \
-    --with-extra-cflags="-F$(pwd)/Frameworks" \
-    --with-extra-cxxflags="-F$(pwd)/Frameworks" \
-    --with-extra-ldflags="-F$(pwd)/Frameworks" || do_exit $?
-else
-  sh configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --enable-cds=yes || do_exit $?
+if [ -z "$INC_BUILD" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
 fi
-make clean CONF=$RELEASE_NAME || do_exit $?
 make images CONF=$RELEASE_NAME || do_exit $?

 IMAGES_DIR=build/$RELEASE_NAME/images
--- a/jb/project/tools/windows/scripts/mkimages_x64.sh
+++ b/jb/project/tools/windows/scripts/mkimages_x64.sh
@@ -21,6 +21,16 @@
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_win_x64

+while getopts ":i?" o; do
+    case "${o}" in
+        i)
+            i="incremental build"
+            INC_BUILD=1
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -31,6 +41,21 @@ JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_x64}

 source jb/project/tools/common/scripts/common.sh

+function do_configure {
+  sh ./configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --with-version-opt=b${build_number} \
+    --with-toolchain-version=$TOOLCHAIN_VERSION \
+    --with-boot-jdk=$BOOT_JDK \
+    --disable-ccache \
+    --enable-cds=yes || do_exit $?
+}
+
 function create_image_bundle {
  __bundle_name=$1
  __arch_name=$2
@@ -75,23 +100,19 @@ case "$bundle_type" in
    ;;
 esac

-sh ./configure \
-  $WITH_DEBUG_LEVEL \
-  --with-vendor-name="$VENDOR_NAME" \
-  --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-  --with-jvm-features=shenandoahgc \
-  --with-version-pre= \
-  --with-version-build=$JDK_BUILD_NUMBER \
-  --with-version-opt=b${build_number} \
-  --with-toolchain-version=$TOOLCHAIN_VERSION \
-  --with-boot-jdk=$BOOT_JDK \
-  --disable-ccache \
-  --enable-cds=yes || do_exit $?
-
-if [ -z "$bundle_type" ]; then
-  make LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
+if [ -z "$INC_BUILD" ]; then
+  do_configure || do_exit $?
+  if [ -z "$bundle_type" ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
 else
-  make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  if [ -z "$bundle_type" ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
 fi

 IMAGES_DIR=build/$RELEASE_NAME/images