Skip to content

Commit

Permalink
8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
Browse files Browse the repository at this point in the history
Reviewed-by: iignatyev, tbell, iris, erikj
  • Loading branch information
vidmik committed Apr 22, 2021
1 parent e81baea commit 0e00598
Showing 1 changed file with 16 additions and 23 deletions.
39 changes: 16 additions & 23 deletions make/conf/jib-profiles.js
Expand Up @@ -396,8 +396,13 @@ var getJibProfilesCommon = function (input, data) {
};
};

common.boot_jdk_version = "16";
common.boot_jdk_build_number = "36";
if (input.build_os == 'macosx' && input.build_cpu == 'aarch64') {
common.boot_jdk_version = "17";
common.boot_jdk_build_number = "19";
} else {
common.boot_jdk_version = "16";
common.boot_jdk_build_number = "36";
}
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
+ common.boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
Expand Down Expand Up @@ -1080,27 +1085,15 @@ var getJibProfilesDependencies = function (input, common) {
boot_jdk_platform = "windows-" + input.build_cpu;
boot_jdk_ext = ".zip";
}
var boot_jdk;
if (boot_jdk_platform == 'osx-aarch64') {
boot_jdk = {
organization: common.organization,
ext: "tar.gz",
module: "jdk-macosx_aarch64",
revision: "16+1.0-beta1",
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}
} else {
boot_jdk = {
server: "jpg",
product: "jdk",
version: common.boot_jdk_version,
build_number: common.boot_jdk_build_number,
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}
var boot_jdk = {
server: "jpg",
product: "jdk",
version: common.boot_jdk_version,
build_number: common.boot_jdk_build_number,
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}

var makeBinDir = (input.build_os == "windows"
Expand Down

1 comment on commit 0e00598

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.