< prev index next >
make/conf/jib-profiles.js
Print this page
rev 59102 : imported patch build
*** 237,248 ****
common.build_id = getBuildId(input);
common.build_number = input.build_number != null ? input.build_number : "0";
// List of the main profile names used for iteration
common.main_profile_names = [
! "linux-x64", "linux-x86", "macosx-x64", "solaris-x64",
! "solaris-sparcv9", "windows-x64", "windows-x86",
"linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x"
];
// These are the base setttings for all the main build profiles.
common.main_profile_base = {
--- 237,248 ----
common.build_id = getBuildId(input);
common.build_number = input.build_number != null ? input.build_number : "0";
// List of the main profile names used for iteration
common.main_profile_names = [
! "linux-x64", "linux-x86", "macosx-x64",
! "windows-x64", "windows-x86",
"linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x"
];
// These are the base setttings for all the main build profiles.
common.main_profile_base = {
*** 427,452 ****
dependencies: ["devkit", "pandoc", "graalunit_lib"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
"--with-macosx-version-max=10.9.0"),
},
- "solaris-x64": {
- target_os: "solaris",
- target_cpu: "x64",
- dependencies: ["devkit", "cups"],
- configure_args: concat(common.configure_args_64bit,
- "--with-zlib=system", "--enable-dtrace", "--enable-deprecated-ports=yes"),
- },
-
- "solaris-sparcv9": {
- target_os: "solaris",
- target_cpu: "sparcv9",
- dependencies: ["devkit", "cups"],
- configure_args: concat(common.configure_args_64bit,
- "--with-zlib=system", "--enable-dtrace", "--enable-deprecated-ports=yes"),
- },
-
"windows-x64": {
target_os: "windows",
target_cpu: "x64",
dependencies: ["devkit", "pandoc", "graalunit_lib"],
configure_args: concat(common.configure_args_64bit),
--- 427,436 ----
*** 531,541 ****
dependencies: [ "ant" ],
environment: {
"ANT_HOME": input.get("ant", "home_path")
}
};
! [ "linux-x64", "macosx-x64", "solaris-sparcv9", "solaris-x64", "windows-x64"]
.forEach(function (name) {
var maketestName = name + "-testmake";
profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
profiles[maketestName].default_make_targets = [ "test-make" ];
});
--- 515,525 ----
dependencies: [ "ant" ],
environment: {
"ANT_HOME": input.get("ant", "home_path")
}
};
! [ "linux-x64", "macosx-x64", "windows-x64"]
.forEach(function (name) {
var maketestName = name + "-testmake";
profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
profiles[maketestName].default_make_targets = [ "test-make" ];
});
*** 605,615 ****
});
// Bootcycle profiles runs the build with itself as the boot jdk. This can
// be done in two ways. Either using the builtin bootcycle target in the
// build system. Or by supplying the main jdk build as bootjdk to configure.
! [ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
.forEach(function (name) {
var bootcycleName = name + "-bootcycle";
var bootcyclePrebuiltName = name + "-bootcycle-prebuilt";
// The base bootcycle profile just changes the default target
// compared to the base profile
--- 589,599 ----
});
// Bootcycle profiles runs the build with itself as the boot jdk. This can
// be done in two ways. Either using the builtin bootcycle target in the
// build system. Or by supplying the main jdk build as bootjdk to configure.
! [ "linux-x64", "macosx-x64", "windows-x64" ]
.forEach(function (name) {
var bootcycleName = name + "-bootcycle";
var bootcyclePrebuiltName = name + "-bootcycle-prebuilt";
// The base bootcycle profile just changes the default target
// compared to the base profile
*** 632,642 ****
delete profiles[bootcyclePrebuiltName].dependencies[bootJdkIndex];
profiles[bootcyclePrebuiltName].default_make_targets = [ "product-images" ];
});
// JCov profiles build JCov-instrumented JDK image based on images provided through dependencies.
! [ "linux-aarch64", "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
.forEach(function (name) {
var jcovName = name + "-jcov";
profiles[jcovName] = clone(common.main_profile_base);
profiles[jcovName].target_os = profiles[name].target_os
profiles[jcovName].target_cpu = profiles[name].target_cpu
--- 616,626 ----
delete profiles[bootcyclePrebuiltName].dependencies[bootJdkIndex];
profiles[bootcyclePrebuiltName].default_make_targets = [ "product-images" ];
});
// JCov profiles build JCov-instrumented JDK image based on images provided through dependencies.
! [ "linux-aarch64", "linux-x64", "macosx-x64", "windows-x64" ]
.forEach(function (name) {
var jcovName = name + "-jcov";
profiles[jcovName] = clone(common.main_profile_base);
profiles[jcovName].target_os = profiles[name].target_os
profiles[jcovName].target_cpu = profiles[name].target_cpu
*** 661,676 ****
},
"macosx-x64": {
platform: "osx-x64",
jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home",
},
- "solaris-x64": {
- platform: "solaris-x64",
- },
- "solaris-sparcv9": {
- platform: "solaris-sparcv9",
- },
"windows-x64": {
platform: "windows-x64",
jdk_suffix: "zip",
},
"windows-x86": {
--- 645,654 ----
*** 793,803 ****
delete profiles[cmpBaselineName].artifacts;
});
});
// Artifacts of JCov profiles
! [ "linux-aarch64", "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
.forEach(function (name) {
var o = artifactData[name]
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
var pf = o.platform
--- 771,781 ----
delete profiles[cmpBaselineName].artifacts;
});
});
// Artifacts of JCov profiles
! [ "linux-aarch64", "linux-x64", "macosx-x64", "windows-x64" ]
.forEach(function (name) {
var o = artifactData[name]
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
var pf = o.platform
*** 982,993 ****
var getJibProfilesDependencies = function (input, common) {
var devkit_platform_revisions = {
linux_x64: "gcc9.2.0-OL6.4+1.0",
macosx_x64: "Xcode10.1-MacOSX10.14+1.0",
- solaris_x64: "SS12u4-Solaris11u1+1.0",
- solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
windows_x64: "VS2017-15.9.16+1.0",
linux_aarch64: "gcc9.2.0-OL7.6+1.0",
linux_arm: "gcc8.2.0-Fedora27+1.0",
linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
linux_s390x: "gcc8.2.0-Fedora27+1.0"
--- 960,969 ----
*** 1036,1050 ****
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}
}
- if (input.build_cpu == 'sparcv9') {
- boot_jdk.file = "bundles/openjdk/GPL/" + boot_jdk_platform
- + "/openjdk-" + common.boot_jdk_version + "_"
- + boot_jdk_platform + "_bin" + boot_jdk_ext;
- }
var dependencies = {
boot_jdk: boot_jdk,
devkit: {
--- 1012,1021 ----
< prev index next >