From 2d23f2ce9a89740fde569f2d21ed6a39821cba0d Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Fri, 11 Jun 2021 08:25:45 +0700
Subject: [PATCH] Changes in repack script for jdk17

---
 removejdkdebuginfo.sh | 22 +++++++++++++++-------
 tarjdk.sh             |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index 90c9557..2dc9455 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 set -e
 
+. setdevkitpath.sh
+
 if [ "$TARGET_JDK" == "arm" ]; then
   export TARGET_JDK=aarch32
 fi
 
-imagespath=openjdk/build/${JVM_PLATFORM}-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images
+imagespath=openjdk/build/${JVM_PLATFORM}-${TARGET_JDK}-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images
 
 rm -rf dizout jreout jdkout
 mkdir dizout
@@ -17,13 +19,19 @@ if [ "$BUILD_IOS" == "1" ]; then
   done
 fi
 
-cp -r $imagespath/j2re-image jreout
-cp -r $imagespath/j2sdk-image jdkout
+cp -r $imagespath/jdk jdkout
 
-mv jdkout/lib/${TARGET_JDK}/libfreetype.so.6 jdkout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?"
-mv jdkout/lib/${TARGET_JDK}/libfreetype.dylib.6 jdkout/lib/${TARGET_JDK}/libfreetype.dylib || echo "Move exit $?"
-mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?"
-mv jreout/lib/${TARGET_JDK}/libfreetype.dylib.6 jreout/lib/${TARGET_JDK}/libfreetype.dylib || echo "Move exit $?"
+# JDK no longer create separate JRE image, so we have to create one manually.
+mkdir -p jreout/bin
+cp jdkout/bin/{java,jfr,keytool,rmid,rmiregistry} jreout/bin/
+cp -r jdkout/{conf,legal,lib,man} jreout/
+rm jreout/lib/src.zip
+
+mv jdkout/lib/libfreetype.so.6 jdkout/lib/libfreetype.so || echo "Move exit $?"
+mv jdkout/lib/libfreetype.dylib.6 jdkout/lib/libfreetype.dylib || echo "Move exit $?"
+mv jreout/lib/libfreetype.so.6 jreout/lib/
+libfreetype.so || echo "Move exit $?"
+mv jreout/lib/libfreetype.dylib.6 jreout/lib/libfreetype.dylib || echo "Move exit $?"
 
 # mv jreout/lib/${TARGET_JDK}/libfontmanager.diz jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep
 # find jreout -name "*.diz" | xargs -- rm
diff --git a/tarjdk.sh b/tarjdk.sh
index f478c4d..a7e3807 100755
--- a/tarjdk.sh
+++ b/tarjdk.sh
@@ -28,8 +28,8 @@ fi
 mv jre_override/lib/* jreout/lib/
 
 cd jreout
-tar cJf ../jre8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+tar cJf ../jre17-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
 
 cd ../jdkout
-tar cJf ../jdk8-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+tar cJf ../jdk17-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .