Skip to content

Commit 9abe1a1

Browse files
authored
Merge pull request #51 from ev3dev-lang-java/feature/jdk14
Add JDK14 ea build
2 parents bdd5a04 + 391f4f2 commit 9abe1a1

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

scripts/config.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,33 @@ elif [ "$JDKVER" == "13" ]; then
262262
HOTSPOT_ABI=arm-sflt
263263
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"
264264

265+
# OpenJDK 14 ea
266+
elif [ "$JDKVER" == "14" ]; then
267+
VERSION_POLICY="latest_tag"
268+
JAVA_REPO="https://github.com/openjdk/jdk14.git"
269+
JAVA_SCM="git"
270+
PATCHVER="jdk14"
271+
AUTOGEN_STYLE="v2"
272+
if [ "$BUILDER_TYPE" = "native" ]; then
273+
HOSTJDK="$BUILDDIR/jdk-ev3"
274+
HOSTJDK_RENAME_FROM="$BUILDDIR/jdk"
275+
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
276+
# stretch and buster have different versions
277+
if [ "$BUILDER_DISTRO" = "stretch" ]; then
278+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-13/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
279+
else
280+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-13/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
281+
fi
282+
else
283+
# same for both stretch & buster
284+
HOSTJDK="$BUILDDIR/jdk-13+33"
285+
HOSTJDK_FILE="$BUILDDIR/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz"
286+
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz"
287+
fi
288+
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
289+
HOTSPOT_ABI=arm-sflt
290+
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"
291+
265292
# OpenJDK Loom & Master+dev
266293
elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
267294
if [ "$JDKVER" == "loom" ]; then

0 commit comments

Comments
 (0)