JBR-2181 create two separate JBR bundles with JFX and JFX+JCEF

2025-12-06 09:29:38 +01:00 · 2020-03-03 18:55:28 +07:00
parent afbf739c64
commit 934ba0167f
8 changed files with 271 additions and 120 deletions
--- a/jb/project/tools/exclude_jcef_module.patch
+++ b/jb/project/tools/exclude_jcef_module.patch
@@ -0,0 +1,33 @@
+Index: src/java.desktop/share/classes/module-info.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- src/java.desktop/share/classes/module-info.java	(revision 08d1926f8b7c74da0e1144e0ce5912e7589c4688)
+++ src/java.desktop/share/classes/module-info.java	(date 1583207610780)
+@@ -109,10 +109,7 @@
+     // see make/GensrcModuleInfo.gmk
+     exports sun.awt to
+         jdk.accessibility,
+-        jdk.unsupported.desktop,
+-        jcef;
+-
+-    exports java.awt.peer to jcef;
+        jdk.unsupported.desktop;
+ 
+     exports java.awt.dnd.peer to jdk.unsupported.desktop;
+     exports sun.awt.dnd to jdk.unsupported.desktop;
+Index: modules.list
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- modules.list	(revision 08d1926f8b7c74da0e1144e0ce5912e7589c4688)
+++ modules.list	(date 1583207610776)
+@@ -60,5 +60,4 @@
+ jdk.unsupported,
+ jdk.xml.dom,
+ jdk.zipfs,
+-jdk.hotspot.agent,
+-jcef
+jdk.hotspot.agent
--- a/jb/project/tools/linux/scripts/mkbundles.sh
+++ b/jb/project/tools/linux/scripts/mkbundles.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+bash -x jb/project/tools/linux/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef"
+bash -x jb/project/tools/linux/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx"
--- a/jb/project/tools/linux/scripts/mkimages.sh
+++ b/jb/project/tools/linux/scripts/mkimages.sh
@@ -4,10 +4,12 @@
 #   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
 #   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 #
 # $ ./java --version
 # openjdk 11.0.6 2020-01-14
@@ -18,34 +20,54 @@
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
+bundle_type=$4

 function create_jbr {
-  if [ -d "$BASE_DIR/$JBR_BUNDLE" ]; then
-    rm -rf $BASE_DIR/$JBR_BUNDLE
-  fi

-  if [ ! -z "$1" ]; then
+  case "$1" in
+  "${bundle_type}_lw")
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-$JBSDK_VERSION
    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-  else
+    ;;
+  "jfx")
+    JBR_BASE_NAME=jbr_${bundle_type}-$JBSDK_VERSION
    cat modules.list > modules_tmp.list
-  fi
+    ;;
+  "jcef")
+    JBR_BASE_NAME=jbr-$JBSDK_VERSION
+    cat modules.list > modules_tmp.list
+    ;;
+  *)
+    echo "***ERR*** bundle was not specified" && exit $?
+    ;;
+  esac
+  rm -rf $BASE_DIR/$JBR_BUNDLE
+
+  JBR=$JBR_BASE_NAME-linux-x64-b$build_number

  echo Running jlink....
  $JSDK/bin/jlink \
    --module-path $JSDK/jmods --no-man-pages --compress=2 \
    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE

-  cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+  if [ "$bundle_type" == "jcef" ]; then
+    cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
+    cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+  fi
  grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release

  echo Creating $JBR.tar.gz ...
-  tar -pcf $JBR.tar -C $BASE_DIR $JBR_BUNDLE || exit $?
+  rm -rf ${BASE_DIR}/jbr
+  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+  tar -pcf $JBR.tar -C $BASE_DIR jbr || exit $?
  gzip $JBR.tar || exit $?
 }

 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-JBR_BASE_NAME=jbr-$JBSDK_VERSION
-JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+
+if [ "$bundle_type" == "jfx" ]; then
+  git apply -p0 < jb/project/tools/exclude_jcef_module.patch
+fi

 sh configure \
  --disable-warnings-as-errors \
@@ -70,24 +92,27 @@ JBRSDK_BUNDLE=jbrsdk

 rm -rf $BASE_DIR/$JBRSDK_BUNDLE
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
-cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?

-echo Creating $JBSDK.tar.gz ...
-tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
-gzip $JBSDK.tar || exit $?
+if [ "$bundle_type" == "jcef" ]; then
+  cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?

-JBR=$JBR_BASE_NAME-linux-x64-b$build_number
-JBR_BUNDLE=jbr
-create_jbr
+  echo Creating $JBSDK.tar.gz ...
+  tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
+  gzip $JBSDK.tar || exit $?
+fi

-JBR=$JBRLW_BASE_NAME-linux-x64-b$build_number
-JBR_BUNDLE=jbrlw
-create_jbr "lw"
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr ${bundle_type}

-make test-image || exit $?
+JBR_BUNDLE=jbr_${bundle_type}_lw
+create_jbr ${bundle_type}_lw

-JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
+if [ "$bundle_type" == "jcef" ]; then
+  make test-image || exit $?

-echo Creating $JBSDK_TEST.tar.gz ...
-tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
-gzip $JBRSDK_TEST.tar || exit $?
+  JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
+
+  echo Creating $JBSDK_TEST.tar.gz ...
+  tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
+  gzip $JBRSDK_TEST.tar || exit $?
+fi
--- a/jb/project/tools/mac/scripts/mkbundles.sh
+++ b/jb/project/tools/mac/scripts/mkbundles.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+bash -x jb/project/tools/mac/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef"
+bash -x jb/project/tools/mac/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx"
--- a/jb/project/tools/mac/scripts/mkimages.sh
+++ b/jb/project/tools/mac/scripts/mkimages.sh
@@ -4,10 +4,12 @@
 #   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
 #   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 #
 # $ ./java --version
 # openjdk 11.0.6 2020-01-14
@@ -18,43 +20,70 @@
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
+bundle_type=$4

 function create_jbr {
-  mkdir -p $JRE_CONTENTS

-  if [ -d "$JRE_HOME" ]; then
-    rm -rf $JRE_HOME
-  fi
-
-  if [ ! -z "$1" ]; then
+  case "$1" in
+  "${bundle_type}_lw")
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-  else
+    ;;
+  "jfx")
+    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
    cat modules.list > modules_tmp.list
+    ;;
+  "jcef")
+    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+    cat modules.list > modules_tmp.list
+    ;;
+  *)
+    echo "***ERR*** bundle was not specified" && exit $?
+    ;;
+  esac
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+
+  JRE_CONTENTS=${BASE_DIR}/${JBR_BUNDLE}/Contents
+  JRE_HOME=${JRE_CONTENTS}/Home
+  if [ -d "${JRE_CONTENTS}" ]; then
+    rm -rf ${JRE_CONTENTS}
+  fi
+  mkdir -p ${JRE_CONTENTS}
+
+  JBR=${JBR_BASE_NAME}-osx-x64-b${build_number}
+
+  ${BASE_DIR}/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
+      --module-path ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/jmods --no-man-pages --compress=2 \
+      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JRE_HOME}  || exit $?
+  grep -v "^JAVA_VERSION" ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release | grep -v "^MODULES" >> ${JRE_HOME}/release
+  cp -R ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/MacOS ${JRE_CONTENTS}
+  cp ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Info.plist ${JRE_CONTENTS}
+
+  if [ "${bundle_type}" == "jcef" ]; then
+    rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
+    rm -rf ${JRE_CONTENTS}/Helpers    || exit $?
+    cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
+    cp -a jcef_mac/Helpers    ${JRE_CONTENTS} || exit $?
  fi

-  $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
-      --module-path $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/jmods --no-man-pages --compress=2 \
-      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $JRE_HOME  || exit $?
-  grep -v "^JAVA_VERSION" $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/release | grep -v "^MODULES" >> $JRE_HOME/release
-  cp -R $BASE_DIR/$JBRSDK_BUNDLE/Contents/MacOS $JRE_CONTENTS
-  cp $BASE_DIR/$JBRSDK_BUNDLE/Contents/Info.plist $JRE_CONTENTS
-  cp -a jcef_mac/Frameworks $JRE_CONTENTS || exit $?
-  cp -a jcef_mac/Helpers    $JRE_CONTENTS || exit $?
-
-  echo Creating $JBR.tar.gz ...
-  COPYFILE_DISABLE=1 tar -pczf $JBR.tar.gz --exclude='*.dSYM' --exclude='man' -C $BASE_DIR $JBR_BUNDLE || exit $?
+  echo Creating ${JBR}.tar.gz ...
+  rm -rf ${BASE_DIR}/jbr
+  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+  COPYFILE_DISABLE=1 tar -pczf ${JBR}.tar.gz --exclude='*.dSYM' --exclude='man' -C ${BASE_DIR} jbr || exit $?
 }

-JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-JBR_BASE_NAME=jbr-$JBSDK_VERSION
-JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+
+if [ "${bundle_type}" == "jfx" ]; then
+  git apply -p0 < jb/project/tools/exclude_jcef_module.patch
+fi

 sh configure \
  --disable-warnings-as-errors \
  --with-debug-level=release \
  --with-version-pre= \
-  --with-version-build=$JDK_BUILD_NUMBER \
-  --with-version-opt=b$build_number \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
  --with-import-modules=./modular-sdk \
  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
  --enable-cds=yes || exit $?
@@ -62,7 +91,7 @@ sh configure \
 make images CONF=macosx-x86_64-normal-server-release || exit $?

 JSDK=build/macosx-x86_64-normal-server-release/images/jdk-bundle
-JBSDK=$JBRSDK_BASE_NAME-osx-x64-b$build_number
+JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}

 BASE_DIR=jre
 JBRSDK_BUNDLE=jbrsdk
@@ -73,31 +102,29 @@ JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 cp -a build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-$JBSDK_VERSION_WITH_DOTS.jdk \
  $BASE_DIR/$JBRSDK_BUNDLE || exit $?

-echo Creating $JBSDK.tar.gz ...
-cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
-cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+if [ "$bundle_type" == "jcef" ]; then
+  echo Creating $JBSDK.tar.gz ...
+  cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+  cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents/

-COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
-  --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
-  --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
-  $JBRSDK_BUNDLE || exit $?
+  COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
+    --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
+    --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
+    $JBRSDK_BUNDLE || exit $?
+fi

-JBR=$JBR_BASE_NAME-osx-x64-b$build_number
-JBR_BUNDLE=jbr
-JRE_CONTENTS=$BASE_DIR/$JBR_BUNDLE/Contents
-JRE_HOME=$JRE_CONTENTS/Home
-create_jbr
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr $bundle_type

-JBR=$JBRLW_BASE_NAME-osx-x64-b$build_number
-JBR_BUNDLE=jbrlw
-JRE_CONTENTS=$BASE_DIR/$JBR_BUNDLE/Contents
-JRE_HOME=$JRE_CONTENTS/Home
-create_jbr "lw"
+JBR_BUNDLE=jbr_${bundle_type}_lw
+create_jbr "${bundle_type}_lw"

-make test-image || exit $?
+if [ "$bundle_type" == "jcef" ]; then
+  make test-image || exit $?

-JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
+  JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number

-echo Creating $JBSDK_TEST.tar.gz ...
-COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-normal-server-release/images \
-  --exclude='test/jdk/demos' test || exit $?
+  echo Creating $JBSDK_TEST.tar.gz ...
+  COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-normal-server-release/images \
+    --exclude='test/jdk/demos' test || exit $?
+fi
--- a/jb/project/tools/windows/scripts/mkbundles.sh
+++ b/jb/project/tools/windows/scripts/mkbundles.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+bash -x jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
+bash -x jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
--- a/jb/project/tools/windows/scripts/mkimages.sh
+++ b/jb/project/tools/windows/scripts/mkimages.sh
@@ -4,10 +4,12 @@
 #   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
 #   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 #
 # $ ./java --version
 # openjdk 11.0.6 2020-01-14
@@ -18,58 +20,71 @@
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
+bundle_type=$4

 function create_jbr {
-  rm -rf $BASE_DIR/$JBR_BUNDLE

-  if [ ! -z "$1" ]; then
+  case "$1" in
+  "${bundle_type}_lw")
    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-  else
+    ;;
+  "jfx")
    cat modules.list > modules_tmp.list
-  fi
+    ;;
+  "jcef")
+    cat modules.list > modules_tmp.list
+    ;;
+  *)
+    echo "***ERR*** bundle was not specified" && exit $?
+    ;;
+  esac
+  rm -rf ${JBR_BUNDLE}

-  $JSDK/bin/jlink \
-    --module-path $JSDK/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE || exit $?
-  cp -R jcef_win_x64/* $BASE_DIR/$JBR_BUNDLE/bin
+  ${JSDK}/bin/jlink \
+    --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
+  if [ "${bundle_type}" == "jcef" ]; then
+    cp -R jcef_win_x64/* ${JBR_BUNDLE}/bin
+  fi
  echo Modifying release info ...
-  grep -v \"^JAVA_VERSION\" $JSDK/release | grep -v \"^MODULES\" >> $BASE_DIR/$JBR_BUNDLE/release
+  grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${JBR_BUNDLE}/release
 }

-JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-JBR_BASE_NAME=jbr-$JBSDK_VERSION
-JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 WORK_DIR=$(pwd)

-PATH="/usr/local/bin:/usr/bin:$PATH"
+if [ "${bundle_type}" == "jfx" ]; then
+  git apply -p0 < jb/project/tools/exclude_jcef_module.patch
+fi
+
+PATH="/usr/local/bin:/usr/bin:${PATH}"
 ./configure \
  --disable-warnings-as-errors \
  --disable-debug-symbols \
  --with-target-bits=64 \
  --with-version-pre= \
-  --with-version-build=$JDK_BUILD_NUMBER  \
-  --with-version-opt=b$build_number \
-  --with-import-modules=$WORK_DIR/modular-sdk \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  --with-import-modules=${WORK_DIR}/modular-sdk \
  --with-toolchain-version=2015 \
-  --with-boot-jdk=$BOOT_JDK \
+  --with-boot-jdk=${BOOT_JDK} \
  --disable-ccache \
  --enable-cds=yes || exit 1
 make clean CONF=windows-x86_64-normal-server-release || exit 1
-make images CONF=windows-x86_64-normal-server-release || exit 1
-make -d test-image || exit 1
+make JOBS=7 LOG=info images CONF=windows-x86_64-normal-server-release || exit 1
+make JOBS=7 LOG=info test-image || exit 1

 JSDK=build/windows-x86_64-normal-server-release/images/jdk
-JBR=$JBR_BASE_NAME-windows-x64-b$build_number
-JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
+JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}

 BASE_DIR=build/windows-x86_64-normal-server-release/images
 JBRSDK_BUNDLE=jbrsdk

-rm -rf $BASE_DIR/$JBRSDK_BUNDLE && rsync -a --exclude demo --exclude sample $JSDK/ $JBRSDK_BUNDLE || exit 1
-cp -R jcef_win_x64/* $JBRSDK_BUNDLE/bin
+rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
+cp -R jcef_win_x64/* ${JBRSDK_BUNDLE}/bin

-JBR_BUNDLE=jbr
-create_jbr
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr ${bundle_type}

-JBR_BUNDLE=jbrlw
-create_jbr "lw"
+JBR_BUNDLE=jbr_${bundle_type}_lw
+create_jbr ${bundle_type}_lw
--- a/jb/project/tools/windows/scripts/pack.sh
+++ b/jb/project/tools/windows/scripts/pack.sh
@@ -4,10 +4,12 @@
 #   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
 #   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 #
 # $ ./java --version
 # openjdk 11.0.6 2020-01-14
@@ -18,29 +20,54 @@
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
+bundle_type=$4
+
+function pack_jbr {
+
+  case "$1" in
+  "${bundle_type}_lw")
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
+    ;;
+  "jfx")
+    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
+    ;;
+  "jcef")
+    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+    ;;
+  *)
+    echo "***ERR*** bundle was not specified" && exit $?
+    ;;
+  esac
+
+  JBR=$JBR_BASE_NAME-windows-x64-b$build_number
+  echo Creating $JBR.tar.gz ...
+  rm -rf ${BASE_DIR}/jbr
+  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1
+}

 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
-JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION

-JSDK=build/windows-x86_64-normal-server-release/images/jdk
+IMAGES_DIR=build/windows-x86_64-normal-server-release/images
+JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
+BASE_DIR=.

-JBRSDK_BUNDLE=jbrsdk
-BASE_DIR=build/windows-x86_64-normal-server-release/images
-echo Creating $JBSDK.tar.gz ...
-/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+if [ "$bundle_type" == "jcef" ]; then
+  JBRSDK_BUNDLE=jbrsdk
+  echo Creating $JBSDK.tar.gz ...
+  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+fi

-JBR_BUNDLE=jbr
-JBR=$JBR_BASE_NAME-windows-x64-b$build_number
-echo Creating $JBR.tar.gz ...
-/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $JBR_BUNDLE || exit 1
+JBR_BUNDLE=jbr_${bundle_type}
+pack_jbr $bundle_type
+JBR_BUNDLE=jbr_${bundle_type}_lw
+pack_jbr ${bundle_type}_lw

-JBR_BUNDLE=jbrlw
-JBR=$JBRLW_BASE_NAME-windows-x64-b$build_number
-echo Creating $JBR.tar.gz ...
-/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $JBR_BUNDLE || exit 1
-
-JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
-echo Creating $JBRSDK_TEST.tar.gz ...
-/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || exit 1
+if [ "$bundle_type" == "jcef" ]; then
+  JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1
+fi