< prev index next >
common/conf/jib-profiles.js
Print this page
*** 237,251 ****
// These are the base setttings for all the main build profiles.
common.main_profile_base = {
dependencies: ["boot_jdk", "gnumake", "jtreg"],
default_make_targets: ["product-bundles", "test-bundles"],
! configure_args: [
! "--with-version-opt=" + common.build_id,
! "--enable-jtreg-failure-handler",
! "--with-version-build=" + common.build_number
! ]
};
// Extra settings for debug profiles
common.debug_suffix = "-debug";
common.debug_profile_base = {
configure_args: ["--enable-debug"],
--- 237,248 ----
// These are the base setttings for all the main build profiles.
common.main_profile_base = {
dependencies: ["boot_jdk", "gnumake", "jtreg"],
default_make_targets: ["product-bundles", "test-bundles"],
! configure_args: concat(["--enable-jtreg-failure-handler"],
! versionArgs(input, common))
};
// Extra settings for debug profiles
common.debug_suffix = "-debug";
common.debug_profile_base = {
configure_args: ["--enable-debug"],
*** 267,298 ****
common.configure_args_64bit = ["--with-target-bits=64"];
common.configure_args_32bit = ["--with-target-bits=32"];
/**
* Define common artifacts template for all main profiles
! * @param pf - Name of platform in bundle names
! * @param demo_ext - Type of extension for demo bundle
*/
! common.main_profile_artifacts = function (pf, demo_ext) {
return {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jdk-" + data.version,
exploded: "images/jdk"
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jre-" + data.version,
exploded: "images/jre"
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [
--- 264,297 ----
common.configure_args_64bit = ["--with-target-bits=64"];
common.configure_args_32bit = ["--with-target-bits=32"];
/**
* Define common artifacts template for all main profiles
! * @param o - Object containing data for artifacts
*/
! common.main_profile_artifacts = function (o) {
! var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
! var jre_subdir = (o.jre_subdir != null ? o.jre_subdir : "jre-" + data.version);
! var pf = o.platform
return {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jdk_subdir,
exploded: "images/jdk"
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jre_subdir,
exploded: "images/jre"
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [
*** 305,361 ****
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jdk-" + data.version,
exploded: "images/jdk"
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jre-" + data.version,
exploded: "images/jre"
- },
- demo: {
- local: "bundles/\\(jdk.*demo." + demo_ext + "\\)",
- remote: [
- "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_demo." + demo_ext,
- "bundles/" + pf + "/\\1"
- ],
}
}
};
};
/**
* Define common artifacts template for all debug profiles
! * @param pf - Name of platform in bundle names
*/
! common.debug_profile_artifacts = function (pf) {
return {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin-debug.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jdk-" + data.version,
exploded: "images/jdk"
},
jre: {
local: "bundles/\\(jre.*bin-debug.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jre-" + data.version,
exploded: "images/jre"
},
test: {
local: "bundles/\\(jdk.*bin-tests-debug.tar.gz\\)",
remote: [
--- 304,356 ----
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jdk_subdir,
exploded: "images/jdk"
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jre_subdir,
exploded: "images/jre"
}
}
};
};
/**
* Define common artifacts template for all debug profiles
! * @param o - Object containing data for artifacts
*/
! common.debug_profile_artifacts = function (o) {
! var jdk_subdir = "jdk-" + data.version + "/fastdebug";
! var jre_subdir = "jre-" + data.version + "/fastdebug";
! var pf = o.platform
return {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin-debug.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jdk_subdir,
exploded: "images/jdk"
},
jre: {
local: "bundles/\\(jre.*bin-debug.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jre_subdir,
exploded: "images/jre"
},
test: {
local: "bundles/\\(jdk.*bin-tests-debug.tar.gz\\)",
remote: [
*** 368,387 ****
local: "bundles/\\(jdk.*bin-debug-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jdk-" + data.version,
exploded: "images/jdk"
},
jre_symbols: {
local: "bundles/\\(jre.*bin-debug-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: "jre-" + data.version,
exploded: "images/jre"
}
}
};
};
--- 363,382 ----
local: "bundles/\\(jdk.*bin-debug-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jdk_subdir,
exploded: "images/jdk"
},
jre_symbols: {
local: "bundles/\\(jre.*bin-debug-symbols.tar.gz\\)",
remote: [
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz",
"bundles/" + pf + "/\\1"
],
! subdir: jre_subdir,
exploded: "images/jre"
}
}
};
};
*** 663,727 ****
}
//
// Define artifacts for profiles
//
! // Macosx bundles are named osx and Windows demo bundles use zip instead of
// tar.gz.
var artifactData = {
"linux-x64": {
platform: "linux-x64",
- demo_ext: "tar.gz"
},
"linux-x86": {
platform: "linux-x86",
- demo_ext: "tar.gz"
},
"macosx-x64": {
platform: "osx-x64",
! demo_ext: "tar.gz"
},
"solaris-x64": {
platform: "solaris-x64",
- demo_ext: "tar.gz"
},
"solaris-sparcv9": {
platform: "solaris-sparcv9",
- demo_ext: "tar.gz"
},
"windows-x64": {
platform: "windows-x64",
- demo_ext: "zip"
},
"windows-x86": {
platform: "windows-x86",
- demo_ext: "zip"
},
"linux-arm64": {
platform: "linux-arm64-vfp-hflt",
- demo_ext: "tar.gz"
},
"linux-arm-vfp-hflt": {
platform: "linux-arm32-vfp-hflt",
- demo_ext: "tar.gz"
},
"linux-arm-vfp-hflt-dyn": {
platform: "linux-arm32-vfp-hflt-dyn",
- demo_ext: "tar.gz"
}
}
// Generate common artifacts for all main profiles
Object.keys(artifactData).forEach(function (name) {
profiles[name] = concatObjects(profiles[name],
! common.main_profile_artifacts(artifactData[name].platform, artifactData[name].demo_ext));
});
// Generate common artifacts for all debug profiles
Object.keys(artifactData).forEach(function (name) {
var debugName = name + common.debug_suffix;
profiles[debugName] = concatObjects(profiles[debugName],
! common.debug_profile_artifacts(artifactData[name].platform));
});
// Extra profile specific artifacts
profilesArtifacts = {
"linux-x64": {
--- 658,714 ----
}
//
// Define artifacts for profiles
//
! // Macosx bundles are named osx
// tar.gz.
var artifactData = {
"linux-x64": {
platform: "linux-x64",
},
"linux-x86": {
platform: "linux-x86",
},
"macosx-x64": {
platform: "osx-x64",
! jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home",
! jre_subdir: "jre-" + data.version + ".jre/Contents/Home"
},
"solaris-x64": {
platform: "solaris-x64",
},
"solaris-sparcv9": {
platform: "solaris-sparcv9",
},
"windows-x64": {
platform: "windows-x64",
},
"windows-x86": {
platform: "windows-x86",
},
"linux-arm64": {
platform: "linux-arm64-vfp-hflt",
},
"linux-arm-vfp-hflt": {
platform: "linux-arm32-vfp-hflt",
},
"linux-arm-vfp-hflt-dyn": {
platform: "linux-arm32-vfp-hflt-dyn",
}
}
// Generate common artifacts for all main profiles
Object.keys(artifactData).forEach(function (name) {
profiles[name] = concatObjects(profiles[name],
! common.main_profile_artifacts(artifactData[name]));
});
// Generate common artifacts for all debug profiles
Object.keys(artifactData).forEach(function (name) {
var debugName = name + common.debug_suffix;
profiles[debugName] = concatObjects(profiles[debugName],
! common.debug_profile_artifacts(artifactData[name]));
});
// Extra profile specific artifacts
profilesArtifacts = {
"linux-x64": {
*** 738,769 ****
"linux-x64-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
! remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
! remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
! remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
- demo: {
- local: "bundles/\\(jdk.*demo.tar.gz\\)",
- remote: "bundles/openjdk/GPL/linux-x64/\\1",
- },
doc_api_spec: {
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
}
--- 725,766 ----
"linux-x64-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/linux-x64/jdk-" + data.version
! + "_linux-x64_bin.tar.gz",
! "bundles/openjdk/GPL/linux-x64/\\1"
! ],
! subdir: "jdk-" + data.version
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/linux-x64/jdk-" + data.version
! + "_linux-x64_bin-tests.tar.gz",
! "bundles/openjdk/GPL/linux-x64/\\1"
! ]
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/linux-x64/jdk-" + data.version
! + "_linux-x64_bin-symbols.tar.gz",
! "bundles/openjdk/GPL/linux-x64/\\1"
! ],
! subdir: "jdk-" + data.version
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
doc_api_spec: {
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
remote: "bundles/openjdk/GPL/linux-x64/\\1",
},
}
*** 771,785 ****
"linux-x86-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
! remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
! remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
},
jre: {
// This regexp needs to not match the compact* files below
local: "bundles/\\(jre.*[+][0-9]\\{1,\\}_linux-x86_bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
--- 768,800 ----
"linux-x86-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/linux-x86/jdk-" + data.version
! + "_linux-x86_bin.tar.gz",
! "bundles/openjdk/GPL/linux-x86/\\1"
! ],
! subdir: "jdk-" + data.version
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/linux-x86/jdk-" + data.version
! + "_linux-x86_bin-symbols.tar.gz",
! "bundles/openjdk/GPL/linux-x86/\\1"
! ],
! subdir: "jdk-" + data.version
! },
! test: {
! local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/linux-x86/jdk-" + data.version
! + "_linux-x86_bin-tests.tar.gz",
! "bundles/openjdk/GPL/linux-x86/\\1"
! ]
},
jre: {
// This regexp needs to not match the compact* files below
local: "bundles/\\(jre.*[+][0-9]\\{1,\\}_linux-x86_bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
*** 801,831 ****
"windows-x86-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
! remote: "bundles/openjdk/GPL/windows-x86/\\1",
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x86/\\1"
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
! remote: "bundles/openjdk/GPL/windows-x86/\\1",
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
! remote: "bundles/openjdk/GPL/windows-x86/\\1"
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x86/\\1",
- },
- demo: {
- local: "bundles/\\(jdk.*demo.zip\\)",
- remote: "bundles/openjdk/GPL/windows-x86/\\1",
}
}
},
"linux-x86-open-debug": {
--- 816,856 ----
"windows-x86-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/windows-x86/jdk-" + data.version
! + "_windows-x86_bin.tar.gz",
! "bundles/openjdk/GPL/windows-x86/\\1"
! ],
! subdir: "jdk-" + data.version
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x86/\\1"
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/windows-x86/jdk-" + data.version
! + "_windows-x86_bin-tests.tar.gz",
! "bundles/openjdk/GPL/windows-x86/\\1"
! ]
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
! remote: [
! "bundles/openjdk/GPL/windows-x86/jdk-" + data.version
! + "_windows-x86_bin-symbols.tar.gz",
! "bundles/openjdk/GPL/windows-x86/\\1"
! ],
! subdir: "jdk-" + data.version
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x86/\\1",
}
}
},
"linux-x86-open-debug": {
*** 1152,1161 ****
--- 1177,1203 ----
version = version.substring(0, version.length - 2);
}
return version;
};
+ /**
+ * Constructs the common version configure args based on build type and
+ * other version inputs
+ */
+ var versionArgs = function(input, common) {
+ var args = ["--with-version-build=" + common.build_number];
+ if (input.build_type == "promoted") {
+ args = concat(args,
+ // This needs to be changed when we start building release candidates
+ "--with-version-pre=ea",
+ "--without-version-opt");
+ } else {
+ args = concat(args, "--with-version-opt=" + common.build_id);
+ }
+ return args;
+ }
+
// Properties representation of the common/autoconf/version-numbers file. Lazily
// initiated by the function below.
var version_numbers;
/**
< prev index next >