Skip to content

Commit 8499f51

Browse files
committed
[scripts] feat(config): add jdk15 config
1 parent 1fd355b commit 8499f51

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

scripts/config.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,33 @@ elif [ "$JDKVER" == "14" ]; then
289289
HOTSPOT_ABI=arm-sflt
290290
JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
291291

292+
# OpenJDK 15
293+
elif [ "$JDKVER" == "15" ]; then
294+
VERSION_POLICY="latest_general_availability"
295+
JAVA_REPO="https://github.com/openjdk/jdk15u.git"
296+
JAVA_SCM="git"
297+
PATCHVER="jdk15"
298+
AUTOGEN_STYLE="v2"
299+
if [ "$BUILDER_TYPE" = "native" ]; then
300+
HOSTJDK="$BUILDDIR/jdk-ev3"
301+
HOSTJDK_RENAME_FROM="$BUILDDIR/jdk"
302+
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
303+
# stretch and buster have different versions
304+
if [ "$BUILDER_DISTRO" = "stretch" ]; then
305+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-14/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
306+
else
307+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-14/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
308+
fi
309+
else
310+
# same for both stretch & buster
311+
HOSTJDK="$BUILDDIR/jdk-14.0.1+7"
312+
HOSTJDK_FILE="$BUILDDIR/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
313+
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
314+
fi
315+
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
316+
HOTSPOT_ABI=arm-sflt
317+
JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
318+
292319
# OpenJDK Loom & Master+dev
293320
elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
294321
if [ "$JDKVER" == "loom" ]; then
@@ -333,6 +360,7 @@ else
333360
echo "JDKVER=12" >&2
334361
echo "JDKVER=13" >&2
335362
echo "JDKVER=14" >&2
363+
echo "JDKVER=15" >&2
336364
echo "JDKVER=loom" >&2
337365
echo "JDKVER=tip" >&2
338366
exit 1

0 commit comments

Comments
 (0)