Skip to content

Commit b51478f

Browse files
committed
Add FreeBSD as a BuildPlatform for Gradle JVM daemons and allow any toolchain vendor
1 parent 844c001 commit b51478f

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/AbstractCustomJavaToolchainResolver.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ static String toOsString(OperatingSystem operatingSystem, JvmVendorSpec v) {
2525
case MAC_OS -> (v == null || v.equals(JvmVendorSpec.ADOPTIUM) == false) ? "macos" : "mac";
2626
case LINUX -> "linux";
2727
case WINDOWS -> "windows";
28+
case FREE_BSD -> "freebsd";
2829
default -> throw new UnsupportedOperationException("Operating system " + operatingSystem);
2930
};
3031
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public String url(String os, String arch, String extension) {
6565
private static final List<OperatingSystem> supportedOperatingSystems = List.of(
6666
OperatingSystem.MAC_OS,
6767
OperatingSystem.LINUX,
68-
OperatingSystem.WINDOWS
68+
OperatingSystem.WINDOWS,
69+
OperatingSystem.FREE_BSD
6970
);
7071

7172
// package private so it can be replaced by tests

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,10 @@ tasks.named("updateDaemonJvm") {
510510
org.gradle.platform.Architecture.AARCH64,
511511
org.gradle.platform.OperatingSystem.WINDOWS
512512
),
513+
BuildPlatformFactory.of(
514+
org.gradle.platform.Architecture.X86_64,
515+
org.gradle.platform.OperatingSystem.FREE_BSD
516+
),
513517
// anyone still using x86 osx?
514518
BuildPlatformFactory.of(
515519
org.gradle.platform.Architecture.X86_64,
@@ -518,7 +522,7 @@ tasks.named("updateDaemonJvm") {
518522
]
519523
toolchainPlatforms.set(myPlatforms)
520524
languageVersion = JavaLanguageVersion.of(21)
521-
vendor = JvmVendorSpec.ADOPTIUM
525+
// vendor = JvmVendorSpec.ADOPTIUM
522526
}
523527

524528
tasks.register("verifyBwcTestsEnabled") {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.X86_64=https\://download.oracle.com/java/21/archive/jdk-21.0.6_freebsd-x64_bin.tar.gz
23
toolchainUrl.LINUX.AARCH64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.7+6/linux/aarch64/jdk/hotspot/normal/eclipse?project\=jdk
34
toolchainUrl.LINUX.X86_64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.7+6/linux/x64/jdk/hotspot/normal/eclipse?project\=jdk
45
toolchainUrl.MAC_OS.AARCH64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.7+6/mac/aarch64/jdk/hotspot/normal/eclipse?project\=jdk
56
toolchainUrl.MAC_OS.X86_64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.7+6/mac/x64/jdk/hotspot/normal/eclipse?project\=jdk
67
toolchainUrl.WINDOWS.AARCH64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.7+6/windows/aarch64/jdk/hotspot/normal/eclipse?project\=jdk
78
toolchainUrl.WINDOWS.X86_64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.7+6/windows/x64/jdk/hotspot/normal/eclipse?project\=jdk
8-
toolchainVendor=ADOPTIUM
99
toolchainVersion=21

0 commit comments

Comments
 (0)