Skip to content

Commit 407cb9a

Browse files
committed
[Build] Remove workarounds to fetch JDK for win32.aarch64/linux.riscv64
Because SWT is now built against Java-21 and JustJ provides Java-21 JDKs for all supported platforms, the special handling to get JDKs and the headers for win32.aarch64 and linux.riscv64 are not necessary anymore. Follow-up on - #2824
1 parent a2402bf commit 407cb9a

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

Jenkinsfile

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,6 @@ def runOnNativeBuildAgent(String platform, Closure body) {
4444

4545
/** Returns the download URL of the JDK against whose C headers (in the 'include/' folder) and native libraries the SWT natives are compiled.*/
4646
def getNativeJdkUrl(String os, String arch) { // To update the used JDK version update the URL template below
47-
if ('win32'.equals(os) && 'aarch64'.equals(arch)) {
48-
// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
49-
dir("${WORKSPACE}/repackage-win32.aarch64-jdk") {
50-
sh """
51-
curl -L 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_aarch64_windows_hotspot_21.0.9_10.zip' > jdk.zip
52-
unzip -q jdk.zip jdk-21.0.9+10/include/** jdk-21.0.9+10/lib/**
53-
cd jdk-21.0.9+10
54-
tar -czf ../jdk.tar.gz include/ lib/
55-
"""
56-
}
57-
return "file://${WORKSPACE}/repackage-win32.aarch64-jdk/jdk.tar.gz"
58-
} else if ('linux'.equals(os) && 'riscv64'.equals(arch)) {
59-
// Downloading jdk and renew it for riscv64 architecture on Linux
60-
dir("${WORKSPACE}/repackage-linux.riscv64-jdk") {
61-
sh """
62-
curl -L 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.9_10.tar.gz' > jdk.tar.gz
63-
tar -xzf jdk.tar.gz jdk-21.0.9+10/include/ jdk-21.0.9+10/lib/
64-
cd jdk-21.0.9+10
65-
tar -czf ../jdk.tar.gz include/ lib/
66-
"""
67-
}
68-
return "file://${WORKSPACE}/repackage-linux.riscv64-jdk/jdk.tar.gz"
69-
}
7047
return "https://download.eclipse.org/justj/jres/21/downloads/20251104_1502/org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-21.0.9-${os}-${arch}.tar.gz"
7148
}
7249

0 commit comments

Comments
 (0)