Changes in repack script for jdk17

This commit is contained in:
Duy Tran Khanh 2021-06-11 08:25:45 +07:00
parent 1a74a46c80
commit 2d23f2ce9a
2 changed files with 17 additions and 9 deletions

View File

@ -1,11 +1,13 @@
#!/bin/bash #!/bin/bash
set -e set -e
. setdevkitpath.sh
if [ "$TARGET_JDK" == "arm" ]; then if [ "$TARGET_JDK" == "arm" ]; then
export TARGET_JDK=aarch32 export TARGET_JDK=aarch32
fi 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 rm -rf dizout jreout jdkout
mkdir dizout mkdir dizout
@ -17,13 +19,19 @@ if [ "$BUILD_IOS" == "1" ]; then
done done
fi fi
cp -r $imagespath/j2re-image jreout cp -r $imagespath/jdk jdkout
cp -r $imagespath/j2sdk-image jdkout
mv jdkout/lib/${TARGET_JDK}/libfreetype.so.6 jdkout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?" # JDK no longer create separate JRE image, so we have to create one manually.
mv jdkout/lib/${TARGET_JDK}/libfreetype.dylib.6 jdkout/lib/${TARGET_JDK}/libfreetype.dylib || echo "Move exit $?" mkdir -p jreout/bin
mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?" cp jdkout/bin/{java,jfr,keytool,rmid,rmiregistry} jreout/bin/
mv jreout/lib/${TARGET_JDK}/libfreetype.dylib.6 jreout/lib/${TARGET_JDK}/libfreetype.dylib || echo "Move exit $?" 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 # mv jreout/lib/${TARGET_JDK}/libfontmanager.diz jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep
# find jreout -name "*.diz" | xargs -- rm # find jreout -name "*.diz" | xargs -- rm

View File

@ -28,8 +28,8 @@ fi
mv jre_override/lib/* jreout/lib/ mv jre_override/lib/* jreout/lib/
cd jreout 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 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 .