update appimage jre to 14, support --with-openj9

This commit is contained in:
Jonathan Shook 2020-04-27 13:23:42 -05:00
parent 5084f4b920
commit 6a5894c34e
2 changed files with 47 additions and 5 deletions

View File

@ -1,6 +1,27 @@
#!/bin/bash #!/bin/bash
#set -x #set -x
DIR="$(dirname "$(readlink -f "$0")")" DIR="$(dirname "$(readlink -f "$0")")"
if [ "$1" = "--wrapper-help" ]
then
echo "OPTIONS:"
echo " # run the bundled JRE with -version"
echo " --java-version"
echo " # run the app with JDWP debugging support, with suspend=n"
echo " --DN"
echo " # run the app with JDWP debugging support, with suspend=y"
echo " --DY"
echo " # set additional JRE options ..."
echo " JAVA_OPTS=... $0 ..."
exit 0
fi
if [ "$1" = "--java-version" ]
then
shift
java -version
exit
fi
if [ "$1" = "-DN" ] if [ "$1" = "-DN" ]
then then
shift shift

View File

@ -1,13 +1,23 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
set -x set -x
APPDIR=target/NB.AppDir APPDIR=target/NB.AppDir
mkdir -p ${APPDIR} mkdir -p ${APPDIR}
BUILD_OPENJ9="false"
if [ "$1" = "--with-openj9" ]
then
BUILD_OPENJ9="true"
printf "using openj9 for build\n"
shift;
fi
if [ ! -f target/nb.jar ] if [ ! -f target/nb.jar ]
then then
print "target/nb.jar does not exist" printf "target/nb.jar does not exist"
exit 2 exit 2
fi fi
@ -25,10 +35,21 @@ then
printf "getting jre once into cache/jre\n"; printf "getting jre once into cache/jre\n";
mkdir -p cache mkdir -p cache
(cd cache && ( (cd cache && (
wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz if [ "$BUILD_OPENJ9" = "true" ]
tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz then
mv jdk-12.0.2+10-jre jre wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz tar xf OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
mv jdk-14.0.1+7-jre jre
rm OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
else
wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
tar xf OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
mv jdk-14.0.1+7-jre jre
fi
# wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
# tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
# mv jdk-12.0.2+10-jre jre
# rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
)) ))
fi fi