author | erikj |
Tue, 11 Jul 2017 14:04:05 +0200 | |
changeset 45824 | d161a843e941 |
parent 45553 | 7b854640bca9 |
child 45875 | 5fa4efe2aca3 |
permissions | -rw-r--r-- |
34491 | 1 |
/* |
44727 | 2 |
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
34491 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
/* |
|
34496 | 27 |
* This file defines build profiles for the JIB tool and others. |
34491 | 28 |
* |
29 |
* A build profile defines a set of configuration options and external |
|
30 |
* dependencies that we for some reason or other care about specifically. |
|
31 |
* Typically, build profiles are defined for the build configurations we |
|
32 |
* build regularly. |
|
33 |
* |
|
34 |
* Contract against this file from the tools that use it, is to provide |
|
35 |
* a function on the form: |
|
36 |
* |
|
34496 | 37 |
* getJibProfiles(input) |
34491 | 38 |
* |
39 |
* which returns an object graph describing the profiles and their |
|
40 |
* dependencies. The name of the function is based on the name of this |
|
41 |
* file, minus the extension and the '-', camel cased and prefixed with |
|
42 |
* 'get'. |
|
43 |
* |
|
44 |
* |
|
45 |
* The parameter 'input' is an object that optionally contains some data. |
|
46 |
* Optionally because a tool may read the configuration for different purposes. |
|
47 |
* To initially get a list of available profiles, the active profile may not |
|
48 |
* yet be known for instance. |
|
49 |
* |
|
50 |
* Data that may be set on the input object: |
|
51 |
* |
|
52 |
* input.profile = <name of active profile> |
|
53 |
* |
|
54 |
* If the active profile is set, the following data from it must also |
|
55 |
* be provided: |
|
56 |
* |
|
57 |
* input.profile |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
58 |
* input.build_id |
34491 | 59 |
* input.target_os |
60 |
* input.target_cpu |
|
61 |
* input.build_os |
|
62 |
* input.build_cpu |
|
63 |
* input.target_platform |
|
64 |
* input.build_platform |
|
65 |
* // The build_osenv_* variables describe the unix layer on Windows systems, |
|
66 |
* // i.e. Cygwin, which may also be 32 or 64 bit. |
|
67 |
* input.build_osenv |
|
68 |
* input.build_osenv_cpu |
|
69 |
* input.build_osenv_platform |
|
70 |
* |
|
71 |
* For more complex nested attributes, there is a method "get": |
|
72 |
* |
|
73 |
* input.get("<dependency>", "<attribute>") |
|
74 |
* |
|
75 |
* Valid attributes are: |
|
76 |
* install_path |
|
77 |
* download_path |
|
78 |
* download_dir |
|
79 |
* |
|
80 |
* |
|
81 |
* The output data generated by this configuration file has the following |
|
82 |
* format: |
|
83 |
* |
|
84 |
* data: { |
|
85 |
* // Identifies the version of this format to the tool reading it |
|
86 |
* format_version: "1.0", |
|
87 |
* |
|
34496 | 88 |
* // Name of base outputdir. JIB assumes the actual output dir is formed |
34491 | 89 |
* // by adding the configuration name: <output_basedir>/<config-name> |
90 |
* output_basedir: "build", |
|
91 |
* // Configure argument to use to specify configuration name |
|
92 |
* configuration_configure_arg: |
|
93 |
* // Make argument to use to specify configuration name |
|
94 |
* configuration_make_arg: |
|
95 |
* |
|
96 |
* profiles: { |
|
97 |
* <profile-name>: { |
|
98 |
* // Name of os the profile is built to run on |
|
99 |
* target_os; <string> |
|
100 |
* // Name of cpu the profile is built to run on |
|
101 |
* target_cpu; <string> |
|
102 |
* // Combination of target_os and target_cpu for convenience |
|
103 |
* target_platform; <string> |
|
104 |
* // Name of os the profile is built on |
|
105 |
* build_os; <string> |
|
106 |
* // Name of cpu the profile is built on |
|
107 |
* build_cpu; <string> |
|
108 |
* // Combination of build_os and build_cpu for convenience |
|
109 |
* build_platform; <string> |
|
110 |
* |
|
111 |
* // List of dependencies needed to build this profile |
|
112 |
* dependencies: <Array of strings> |
|
113 |
* |
|
114 |
* // List of configure args to use for this profile |
|
115 |
* configure_args: <Array of strings> |
|
116 |
* |
|
117 |
* // List of free form labels describing aspects of this profile |
|
118 |
* labels: <Array of strings> |
|
119 |
* } |
|
120 |
* } |
|
121 |
* |
|
122 |
* // Dependencies use a Maven like deployment structure |
|
123 |
* dependencies: { |
|
124 |
* <dependency-name>: { |
|
125 |
* // Organization part of path defining this dependency |
|
126 |
* organization: <string> |
|
127 |
* // File extension for this dependency |
|
128 |
* ext: <string> |
|
129 |
* // Module part of path for defining this dependency, |
|
130 |
* // defaults to <dependency-name> |
|
131 |
* module: <string> |
|
132 |
* // Revision part of path for defining this dependency |
|
133 |
* revision: <string> |
|
134 |
* |
|
135 |
* // List of configure args to add when using this dependency, |
|
136 |
* // defaults to |
|
137 |
* // "--with-<dependency-name>=input.get("<dependency-name", "install_path")" |
|
138 |
* configure_args: <array of strings> |
|
139 |
* |
|
140 |
* // Name of environment variable to set when using this dependency |
|
141 |
* // when running make |
|
142 |
* environment_name: <string> |
|
143 |
* // Value of environment variable to set when using this dependency |
|
144 |
* // when running make |
|
145 |
* environment_value: <string> |
|
146 |
* |
|
147 |
* // Value to add to the PATH variable when using this dependency, |
|
148 |
* // applies to both make and configure |
|
149 |
* environment_path: <string> |
|
150 |
* } |
|
151 |
* |
|
152 |
* <dependency-name>: { |
|
153 |
* // For certain dependencies where a legacy distribution mechanism is |
|
154 |
* // already in place, the "javare" server layout is also supported |
|
155 |
* // Indicate that an alternate server source and layout should be used |
|
156 |
* server: "javare" |
|
157 |
* |
|
158 |
* // For "javare", a combination of module, revision, |
|
159 |
* // build number (optional), files and checksum file is possible for |
|
160 |
* // artifacts following the standard layout. |
|
161 |
* module: <string> |
|
162 |
* revision: <string> |
|
163 |
* build_number: <string> |
|
164 |
* checksum_file: <string> |
|
165 |
* file: <string> |
|
166 |
* |
|
167 |
* // For other files, use checksum path and path instead |
|
168 |
* checksum_path: <string> |
|
169 |
* path: <string> |
|
170 |
* } |
|
171 |
* } |
|
172 |
* } |
|
173 |
*/ |
|
174 |
||
175 |
/** |
|
176 |
* Main entry to generate the profile configuration |
|
177 |
* |
|
178 |
* @param input External data to use for generating the configuration |
|
179 |
* @returns {{}} Profile configuration |
|
180 |
*/ |
|
34496 | 181 |
var getJibProfiles = function (input) { |
34491 | 182 |
|
183 |
var data = {}; |
|
184 |
||
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
185 |
// Identifies the version of this format to the tool reading it. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
186 |
// 1.1 signifies that the publish, publish-src and get-src features are usable. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
187 |
data.format_version = "1.1"; |
34491 | 188 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
189 |
// Organization, product and version are used when uploading/publishing build results |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
190 |
data.organization = ""; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
191 |
data.product = "jdk"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
192 |
data.version = getVersion(); |
34491 | 193 |
|
34496 | 194 |
// The base directory for the build output. JIB will assume that the |
34491 | 195 |
// actual build directory will be <output_basedir>/<configuration> |
196 |
data.output_basedir = "build"; |
|
197 |
// The configure argument to use to specify the name of the configuration |
|
198 |
data.configuration_configure_arg = "--with-conf-name="; |
|
199 |
// The make argument to use to specify the name of the configuration |
|
200 |
data.configuration_make_arg = "CONF_NAME="; |
|
201 |
||
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
202 |
// Exclude list to use when Jib creates a source bundle |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
203 |
data.src_bundle_excludes = "./build webrev .hg */.hg */*/.hg */*/*/.hg"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
204 |
// Include list to use when creating a minimal jib source bundle which |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
205 |
// contains just the jib configuration files. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
206 |
data.conf_bundle_includes = "*/conf/jib-profiles.* common/autoconf/version-numbers" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
207 |
|
34491 | 208 |
// Define some common values |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
209 |
var common = getJibProfilesCommon(input, data); |
34491 | 210 |
// Generate the profiles part of the configuration |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
211 |
data.profiles = getJibProfilesProfiles(input, common, data); |
34491 | 212 |
// Generate the dependencies part of the configuration |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
213 |
data.dependencies = getJibProfilesDependencies(input, common, data); |
34491 | 214 |
|
215 |
return data; |
|
216 |
}; |
|
217 |
||
218 |
/** |
|
219 |
* Generates some common values |
|
220 |
* |
|
221 |
* @param input External data to use for generating the configuration |
|
222 |
* @returns Common values |
|
223 |
*/ |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
224 |
var getJibProfilesCommon = function (input, data) { |
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
225 |
var common = {}; |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
226 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
227 |
common.organization = "jpg.infra.builddeps"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
228 |
common.build_id = getBuildId(input); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
229 |
common.build_number = input.build_number != null ? input.build_number : "0"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
230 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
231 |
// List of the main profile names used for iteration |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
232 |
common.main_profile_names = [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
233 |
"linux-x64", "linux-x86", "macosx-x64", "solaris-x64", |
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
234 |
"solaris-sparcv9", "windows-x64", "windows-x86", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
235 |
"linux-arm64", "linux-arm-vfp-hflt", "linux-arm-vfp-hflt-dyn" |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
236 |
]; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
237 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
238 |
// These are the base setttings for all the main build profiles. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
239 |
common.main_profile_base = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
240 |
dependencies: ["boot_jdk", "gnumake", "jtreg"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
241 |
default_make_targets: ["product-bundles", "test-bundles"], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
242 |
configure_args: concat(["--enable-jtreg-failure-handler"], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
243 |
versionArgs(input, common)) |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
244 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
245 |
// Extra settings for debug profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
246 |
common.debug_suffix = "-debug"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
247 |
common.debug_profile_base = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
248 |
configure_args: ["--enable-debug"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
249 |
labels: "debug" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
250 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
251 |
// Extra settings for slowdebug profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
252 |
common.slowdebug_suffix = "-slowdebug"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
253 |
common.slowdebug_profile_base = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
254 |
configure_args: ["--with-debug-level=slowdebug"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
255 |
labels: "slowdebug" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
256 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
257 |
// Extra settings for openjdk only profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
258 |
common.open_suffix = "-open"; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
259 |
common.open_profile_base = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
260 |
configure_args: ["--enable-openjdk-only"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
261 |
labels: "open" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
262 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
263 |
|
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
264 |
common.configure_args_64bit = ["--with-target-bits=64"]; |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
265 |
common.configure_args_32bit = ["--with-target-bits=32"]; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
266 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
267 |
/** |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
268 |
* Define common artifacts template for all main profiles |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
269 |
* @param o - Object containing data for artifacts |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
270 |
*/ |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
271 |
common.main_profile_artifacts = function (o) { |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
272 |
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version); |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
273 |
var jre_subdir = (o.jre_subdir != null ? o.jre_subdir : "jre-" + data.version); |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
274 |
var pf = o.platform |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
275 |
return { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
276 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
277 |
jdk: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
278 |
local: "bundles/\\(jdk.*bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
279 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
280 |
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
281 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
282 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
283 |
subdir: jdk_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
284 |
exploded: "images/jdk" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
285 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
286 |
jre: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
287 |
local: "bundles/\\(jre.*bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
288 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
289 |
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
290 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
291 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
292 |
subdir: jre_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
293 |
exploded: "images/jre" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
294 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
295 |
test: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
296 |
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
297 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
298 |
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-tests.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
299 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
300 |
], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
301 |
exploded: "images/test" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
302 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
303 |
jdk_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
304 |
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
305 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
306 |
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-symbols.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
307 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
308 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
309 |
subdir: jdk_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
310 |
exploded: "images/jdk" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
311 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
312 |
jre_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
313 |
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
314 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
315 |
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-symbols.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
316 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
317 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
318 |
subdir: jre_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
319 |
exploded: "images/jre" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
320 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
321 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
322 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
323 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
324 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
325 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
326 |
/** |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
327 |
* Define common artifacts template for all debug profiles |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
328 |
* @param o - Object containing data for artifacts |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
329 |
*/ |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
330 |
common.debug_profile_artifacts = function (o) { |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
331 |
var jdk_subdir = "jdk-" + data.version + "/fastdebug"; |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
332 |
var jre_subdir = "jre-" + data.version + "/fastdebug"; |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
333 |
var pf = o.platform |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
334 |
return { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
335 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
336 |
jdk: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
337 |
local: "bundles/\\(jdk.*bin-debug.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
338 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
339 |
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
340 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
341 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
342 |
subdir: jdk_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
343 |
exploded: "images/jdk" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
344 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
345 |
jre: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
346 |
local: "bundles/\\(jre.*bin-debug.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
347 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
348 |
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
349 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
350 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
351 |
subdir: jre_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
352 |
exploded: "images/jre" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
353 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
354 |
test: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
355 |
local: "bundles/\\(jdk.*bin-tests-debug.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
356 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
357 |
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-tests-debug.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
358 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
359 |
], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
360 |
exploded: "images/test" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
361 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
362 |
jdk_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
363 |
local: "bundles/\\(jdk.*bin-debug-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
364 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
365 |
"bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
366 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
367 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
368 |
subdir: jdk_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
369 |
exploded: "images/jdk" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
370 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
371 |
jre_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
372 |
local: "bundles/\\(jre.*bin-debug-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
373 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
374 |
"bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
375 |
"bundles/" + pf + "/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
376 |
], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
377 |
subdir: jre_subdir, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
378 |
exploded: "images/jre" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
379 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
380 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
381 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
382 |
}; |
34491 | 383 |
|
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
384 |
var boot_jdk_revision = "8"; |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
385 |
var boot_jdk_subdirpart = "1.8.0"; |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
386 |
// JDK 8 does not work on sparc M7 cpus, need a newer update when building |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
387 |
// on such hardware. |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
388 |
if (input.build_cpu == "sparcv9") { |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
389 |
var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); |
45451
2d500ccfa3b5
8181788: Unable to build JDK10 on SPARC-M8 machines
erikj
parents:
45163
diff
changeset
|
390 |
if (cpu_brand.trim().match('SPARC-.[78]')) { |
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
391 |
boot_jdk_revision = "8u20"; |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
392 |
boot_jdk_subdirpart = "1.8.0_20"; |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
393 |
} |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
394 |
} |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
395 |
common.boot_jdk_revision = boot_jdk_revision; |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
396 |
common.boot_jdk_subdirpart = boot_jdk_subdirpart; |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
397 |
common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk" |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
398 |
+ common.boot_jdk_subdirpart |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
399 |
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : ""); |
43919 | 400 |
common.boot_jdk_platform = input.build_os + "-" |
401 |
+ (input.build_cpu == "x86" ? "i586" : input.build_cpu); |
|
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
402 |
|
34491 | 403 |
return common; |
404 |
}; |
|
405 |
||
406 |
/** |
|
407 |
* Generates the profiles part of the configuration. |
|
408 |
* |
|
409 |
* @param input External data to use for generating the configuration |
|
410 |
* @param common The common values |
|
411 |
* @returns {{}} Profiles part of the configuration |
|
412 |
*/ |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
413 |
var getJibProfilesProfiles = function (input, common, data) { |
34491 | 414 |
// Main SE profiles |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
415 |
var profiles = { |
34491 | 416 |
|
417 |
"linux-x64": { |
|
418 |
target_os: "linux", |
|
419 |
target_cpu: "x64", |
|
44734 | 420 |
dependencies: ["devkit", "graphviz", "pandoc"], |
44727 | 421 |
configure_args: concat(common.configure_args_64bit, |
422 |
"--enable-full-docs", "--with-zlib=system"), |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
423 |
default_make_targets: ["docs-bundles"], |
34491 | 424 |
}, |
425 |
||
426 |
"linux-x86": { |
|
427 |
target_os: "linux", |
|
428 |
target_cpu: "x86", |
|
429 |
build_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
430 |
dependencies: ["devkit"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
431 |
configure_args: concat(common.configure_args_32bit, |
39190
a6b5b18fd06c
8154209: Remove client VM from default JIB profile on windows-x86 and linux-x86
lmesnik
parents:
37972
diff
changeset
|
432 |
"--with-jvm-variants=minimal,server", "--with-zlib=system"), |
34491 | 433 |
}, |
434 |
||
435 |
"macosx-x64": { |
|
436 |
target_os: "macosx", |
|
437 |
target_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
438 |
dependencies: ["devkit"], |
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
439 |
configure_args: concat(common.configure_args_64bit, "--with-zlib=system"), |
34491 | 440 |
}, |
441 |
||
442 |
"solaris-x64": { |
|
443 |
target_os: "solaris", |
|
444 |
target_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
445 |
dependencies: ["devkit", "cups"], |
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
446 |
configure_args: concat(common.configure_args_64bit, |
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
447 |
"--with-zlib=system", "--enable-dtrace"), |
34491 | 448 |
}, |
449 |
||
450 |
"solaris-sparcv9": { |
|
451 |
target_os: "solaris", |
|
452 |
target_cpu: "sparcv9", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
453 |
dependencies: ["devkit", "cups"], |
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
454 |
configure_args: concat(common.configure_args_64bit, |
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
455 |
"--with-zlib=system", "--enable-dtrace"), |
34491 | 456 |
}, |
457 |
||
458 |
"windows-x64": { |
|
459 |
target_os: "windows", |
|
460 |
target_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
461 |
dependencies: ["devkit", "freetype"], |
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
462 |
configure_args: concat(common.configure_args_64bit), |
34491 | 463 |
}, |
464 |
||
465 |
"windows-x86": { |
|
466 |
target_os: "windows", |
|
467 |
target_cpu: "x86", |
|
468 |
build_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
469 |
dependencies: ["devkit", "freetype"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
470 |
configure_args: concat(common.configure_args_32bit), |
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
471 |
}, |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
472 |
|
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
473 |
"linux-arm64": { |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
474 |
target_os: "linux", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
475 |
target_cpu: "aarch64", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
476 |
build_cpu: "x64", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
477 |
dependencies: ["devkit", "build_devkit", "cups", "headless_stubs"], |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
478 |
configure_args: [ |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
479 |
"--with-cpu-port=arm64", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
480 |
"--with-jvm-variants=server", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
481 |
"--openjdk-target=aarch64-linux-gnu", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
482 |
"--enable-headless-only" |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
483 |
], |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
484 |
}, |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
485 |
|
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
486 |
"linux-arm-vfp-hflt": { |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
487 |
target_os: "linux", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
488 |
target_cpu: "arm", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
489 |
build_cpu: "x64", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
490 |
dependencies: ["devkit", "build_devkit", "cups"], |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
491 |
configure_args: [ |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
492 |
"--with-jvm-variants=minimal1,client", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
493 |
"--with-x=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
494 |
"--openjdk-target=arm-linux-gnueabihf", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
495 |
"--with-abi-profile=arm-vfp-hflt" |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
496 |
], |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
497 |
}, |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
498 |
|
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
499 |
// Special version of the SE profile adjusted to be testable on arm64 hardware. |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
500 |
"linux-arm-vfp-hflt-dyn": { |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
501 |
configure_args: "--with-stdc++lib=dynamic" |
34491 | 502 |
} |
503 |
}; |
|
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
504 |
// Let linux-arm-vfp-hflt-dyn inherit everything from linux-arm-vfp-hflt |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
505 |
profiles["linux-arm-vfp-hflt-dyn"] = concatObjects( |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
506 |
profiles["linux-arm-vfp-hflt-dyn"], profiles["linux-arm-vfp-hflt"]); |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
507 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
508 |
// Add the base settings to all the main profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
509 |
common.main_profile_names.forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
510 |
profiles[name] = concatObjects(common.main_profile_base, profiles[name]); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
511 |
}); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
512 |
|
34491 | 513 |
// Generate debug versions of all the main profiles |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
514 |
common.main_profile_names.forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
515 |
var debugName = name + common.debug_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
516 |
profiles[debugName] = concatObjects(profiles[name], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
517 |
common.debug_profile_base); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
518 |
}); |
36532 | 519 |
// Generate slowdebug versions of all the main profiles |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
520 |
common.main_profile_names.forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
521 |
var debugName = name + common.slowdebug_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
522 |
profiles[debugName] = concatObjects(profiles[name], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
523 |
common.slowdebug_profile_base); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
524 |
}); |
34491 | 525 |
|
36532 | 526 |
// Generate open only profiles for all the main profiles for JPRT and reference |
527 |
// implementation builds. |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
528 |
common.main_profile_names.forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
529 |
var openName = name + common.open_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
530 |
profiles[openName] = concatObjects(profiles[name], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
531 |
common.open_profile_base); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
532 |
}); |
36534
b74ff34537ac
8151800: Jib profile for open linux should produce compact profiles images by default
erikj
parents:
36532
diff
changeset
|
533 |
// The open only profiles on linux are used for reference builds and should |
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
534 |
// produce the compact profile images by default. This adds "profiles" as an |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
535 |
// extra default target. |
36534
b74ff34537ac
8151800: Jib profile for open linux should produce compact profiles images by default
erikj
parents:
36532
diff
changeset
|
536 |
var openOnlyProfilesExtra = { |
36170
d493c08255eb
8150504: JIB profiles for reference implementation builds
erikj
parents:
35036
diff
changeset
|
537 |
"linux-x86-open": { |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
538 |
default_make_targets: "profiles-bundles", |
38628
11af6696675c
8158540: Open only linux-x86 builds using Jib fails when building "minimal" jvm
erikj
parents:
37972
diff
changeset
|
539 |
configure_args: "--with-jvm-variants=client,server" |
34491 | 540 |
} |
541 |
}; |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
542 |
profiles = concatObjects(profiles, openOnlyProfilesExtra); |
36534
b74ff34537ac
8151800: Jib profile for open linux should produce compact profiles images by default
erikj
parents:
36532
diff
changeset
|
543 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
544 |
// Generate debug profiles for the open only profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
545 |
common.main_profile_names.forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
546 |
var openName = name + common.open_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
547 |
var openDebugName = openName + common.debug_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
548 |
profiles[openDebugName] = concatObjects(profiles[openName], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
549 |
common.debug_profile_base); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
550 |
}); |
34491 | 551 |
|
42425 | 552 |
// Profiles for building the zero jvm variant. These are used for verification |
553 |
// in JPRT. |
|
554 |
var zeroProfiles = { |
|
555 |
"linux-x64-zero": { |
|
556 |
target_os: "linux", |
|
557 |
target_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
558 |
dependencies: ["devkit"], |
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
559 |
configure_args: concat(common.configure_args_64bit, [ |
42425 | 560 |
"--with-zlib=system", |
561 |
"--with-jvm-variants=zero", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
562 |
"--enable-libffi-bundling" |
42980
4ab3d4b67cc0
8171500: Explicitly set --with-target-bits=64 in 64bit jib profiles
erikj
parents:
42848
diff
changeset
|
563 |
]) |
42425 | 564 |
}, |
565 |
||
566 |
"linux-x86-zero": { |
|
567 |
target_os: "linux", |
|
568 |
target_cpu: "x86", |
|
569 |
build_cpu: "x64", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
570 |
dependencies: ["devkit"], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
571 |
configure_args: concat(common.configure_args_32bit, [ |
42425 | 572 |
"--with-zlib=system", |
573 |
"--with-jvm-variants=zero", |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
574 |
"--enable-libffi-bundling" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
575 |
]) |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
576 |
} |
42425 | 577 |
} |
578 |
profiles = concatObjects(profiles, zeroProfiles); |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
579 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
580 |
// Add the base settings to the zero profiles and generate debug profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
581 |
Object.keys(zeroProfiles).forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
582 |
var debugName = name + common.debug_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
583 |
profiles[name] = concatObjects(common.main_profile_base, profiles[name]); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
584 |
profiles[debugName] = concatObjects(profiles[name], common.debug_profile_base); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
585 |
}); |
42425 | 586 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
587 |
// Profiles used to run tests. Used in JPRT and Mach 5. |
34491 | 588 |
var testOnlyProfiles = { |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
589 |
"run-test-jprt": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
590 |
target_os: input.build_os, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
591 |
target_cpu: input.build_cpu, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
592 |
dependencies: [ "jtreg", "gnumake", "boot_jdk" ], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
593 |
labels: "test", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
594 |
environment: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
595 |
"JT_JAVA": common.boot_jdk_home |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
596 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
597 |
}, |
34491 | 598 |
|
599 |
"run-test": { |
|
600 |
target_os: input.build_os, |
|
601 |
target_cpu: input.build_cpu, |
|
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
602 |
dependencies: [ "jtreg", "gnumake", "boot_jdk" ], |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
603 |
labels: "test", |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
604 |
environment: { |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
605 |
"JT_JAVA": common.boot_jdk_home |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
606 |
} |
34491 | 607 |
} |
608 |
}; |
|
609 |
profiles = concatObjects(profiles, testOnlyProfiles); |
|
610 |
||
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
611 |
// Profiles used to run tests using Jib for internal dependencies. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
612 |
var testedProfile = input.testedProfile; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
613 |
if (testedProfile == null) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
614 |
testedProfile = input.build_os + "-" + input.build_cpu; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
615 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
616 |
var testOnlyProfilesPrebuilt = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
617 |
"run-test-prebuilt": { |
45824
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
618 |
target_os: input.build_os, |
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
619 |
target_cpu: input.build_cpu, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
620 |
src: "src.conf", |
44695
aab4fa0803df
8179078: Jib run-test-prebuilt profile missing dependency on bootjdk
erikj
parents:
44583
diff
changeset
|
621 |
dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk", |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
622 |
testedProfile + ".test", "src.full" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
623 |
], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
624 |
work_dir: input.get("src.full", "install_path") + "/test", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
625 |
environment: { |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
626 |
"JT_JAVA": common.boot_jdk_home, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
627 |
"PRODUCT_HOME": input.get(testedProfile + ".jdk", "home_path"), |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
628 |
"TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path"), |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
629 |
"TEST_OUTPUT_DIR": input.src_top_dir |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
630 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
631 |
labels: "test" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
632 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
633 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
634 |
// If actually running the run-test-prebuilt profile, verify that the input |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
635 |
// variable is valid and if so, add the appropriate target_* values from |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
636 |
// the tested profile. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
637 |
if (input.profile == "run-test-prebuilt") { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
638 |
if (profiles[testedProfile] == null) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
639 |
error("testedProfile is not defined: " + testedProfile); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
640 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
641 |
} |
45824
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
642 |
if (profiles[testedProfile] != null) { |
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
643 |
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"] |
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
644 |
= profiles[testedProfile]["target_os"]; |
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
645 |
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] |
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
646 |
= profiles[testedProfile]["target_cpu"]; |
d161a843e941
8184075: Make run-test-prebuilt profile more robust
erikj
parents:
45553
diff
changeset
|
647 |
} |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
648 |
profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
649 |
|
43288
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
650 |
// On macosx add the devkit bin dir to the path in all the run-test profiles. |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
651 |
// This gives us a guaranteed working version of lldb for the jtreg failure handler. |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
652 |
if (input.build_os == "macosx") { |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
653 |
macosxRunTestExtra = { |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
654 |
dependencies: [ "devkit" ], |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
655 |
environment_path: input.get("devkit", "install_path") |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
656 |
+ "/Xcode.app/Contents/Developer/usr/bin" |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
657 |
} |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
658 |
profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra); |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
659 |
profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra); |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
660 |
profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra); |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
661 |
} |
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
662 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
663 |
// |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
664 |
// Define artifacts for profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
665 |
// |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
666 |
// Macosx bundles are named osx |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
667 |
// tar.gz. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
668 |
var artifactData = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
669 |
"linux-x64": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
670 |
platform: "linux-x64", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
671 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
672 |
"linux-x86": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
673 |
platform: "linux-x86", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
674 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
675 |
"macosx-x64": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
676 |
platform: "osx-x64", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
677 |
jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
678 |
jre_subdir: "jre-" + data.version + ".jre/Contents/Home" |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
679 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
680 |
"solaris-x64": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
681 |
platform: "solaris-x64", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
682 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
683 |
"solaris-sparcv9": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
684 |
platform: "solaris-sparcv9", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
685 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
686 |
"windows-x64": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
687 |
platform: "windows-x64", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
688 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
689 |
"windows-x86": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
690 |
platform: "windows-x86", |
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
691 |
}, |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
692 |
"linux-arm64": { |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
693 |
platform: "linux-arm64-vfp-hflt", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
694 |
}, |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
695 |
"linux-arm-vfp-hflt": { |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
696 |
platform: "linux-arm32-vfp-hflt", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
697 |
}, |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
698 |
"linux-arm-vfp-hflt-dyn": { |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
699 |
platform: "linux-arm32-vfp-hflt-dyn", |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
700 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
701 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
702 |
// Generate common artifacts for all main profiles |
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
703 |
Object.keys(artifactData).forEach(function (name) { |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
704 |
profiles[name] = concatObjects(profiles[name], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
705 |
common.main_profile_artifacts(artifactData[name])); |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
706 |
}); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
707 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
708 |
// Generate common artifacts for all debug profiles |
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
709 |
Object.keys(artifactData).forEach(function (name) { |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
710 |
var debugName = name + common.debug_suffix; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
711 |
profiles[debugName] = concatObjects(profiles[debugName], |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
712 |
common.debug_profile_artifacts(artifactData[name])); |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
713 |
}); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
714 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
715 |
// Extra profile specific artifacts |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
716 |
profilesArtifacts = { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
717 |
"linux-x64": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
718 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
719 |
doc_api_spec: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
720 |
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
721 |
remote: [ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
722 |
"bundles/common/jdk-" + data.version + "_doc-api-spec.tar.gz", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
723 |
"bundles/linux-x64/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
724 |
], |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
725 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
726 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
727 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
728 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
729 |
"linux-x64-open": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
730 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
731 |
jdk: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
732 |
local: "bundles/\\(jdk.*bin.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
733 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
734 |
"bundles/openjdk/GPL/linux-x64/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
735 |
+ "_linux-x64_bin.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
736 |
"bundles/openjdk/GPL/linux-x64/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
737 |
], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
738 |
subdir: "jdk-" + data.version |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
739 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
740 |
jre: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
741 |
local: "bundles/\\(jre.*bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
742 |
remote: "bundles/openjdk/GPL/linux-x64/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
743 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
744 |
test: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
745 |
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
746 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
747 |
"bundles/openjdk/GPL/linux-x64/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
748 |
+ "_linux-x64_bin-tests.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
749 |
"bundles/openjdk/GPL/linux-x64/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
750 |
] |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
751 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
752 |
jdk_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
753 |
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
754 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
755 |
"bundles/openjdk/GPL/linux-x64/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
756 |
+ "_linux-x64_bin-symbols.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
757 |
"bundles/openjdk/GPL/linux-x64/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
758 |
], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
759 |
subdir: "jdk-" + data.version |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
760 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
761 |
jre_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
762 |
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
763 |
remote: "bundles/openjdk/GPL/linux-x64/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
764 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
765 |
doc_api_spec: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
766 |
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
767 |
remote: "bundles/openjdk/GPL/linux-x64/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
768 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
769 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
770 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
771 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
772 |
"linux-x86-open": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
773 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
774 |
jdk: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
775 |
local: "bundles/\\(jdk.*bin.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
776 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
777 |
"bundles/openjdk/GPL/linux-x86/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
778 |
+ "_linux-x86_bin.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
779 |
"bundles/openjdk/GPL/linux-x86/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
780 |
], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
781 |
subdir: "jdk-" + data.version |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
782 |
}, |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
783 |
jdk_symbols: { |
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
784 |
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
785 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
786 |
"bundles/openjdk/GPL/linux-x86/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
787 |
+ "_linux-x86_bin-symbols.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
788 |
"bundles/openjdk/GPL/linux-x86/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
789 |
], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
790 |
subdir: "jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
791 |
}, |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
792 |
test: { |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
793 |
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
794 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
795 |
"bundles/openjdk/GPL/linux-x86/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
796 |
+ "_linux-x86_bin-tests.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
797 |
"bundles/openjdk/GPL/linux-x86/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
798 |
] |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
799 |
}, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
800 |
jre: { |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
801 |
// This regexp needs to not match the compact* files below |
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
802 |
local: "bundles/\\(jre.*[+][0-9]\\{1,\\}_linux-x86_bin.tar.gz\\)", |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
803 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
804 |
}, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
805 |
jre_compact1: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
806 |
local: "bundles/\\(jre.*-compact1_linux-x86_bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
807 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
808 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
809 |
jre_compact2: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
810 |
local: "bundles/\\(jre.*-compact2_linux-x86_bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
811 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
812 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
813 |
jre_compact3: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
814 |
local: "bundles/\\(jre.*-compact3_linux-x86_bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
815 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
43043
bf14e07c9075
8172241: Cleanup mistakes in jib publish support change
erikj
parents:
42980
diff
changeset
|
816 |
}, |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
817 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
818 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
819 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
820 |
"windows-x86-open": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
821 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
822 |
jdk: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
823 |
local: "bundles/\\(jdk.*bin.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
824 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
825 |
"bundles/openjdk/GPL/windows-x86/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
826 |
+ "_windows-x86_bin.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
827 |
"bundles/openjdk/GPL/windows-x86/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
828 |
], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
829 |
subdir: "jdk-" + data.version |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
830 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
831 |
jre: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
832 |
local: "bundles/\\(jre.*bin.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
833 |
remote: "bundles/openjdk/GPL/windows-x86/\\1" |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
834 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
835 |
test: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
836 |
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
837 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
838 |
"bundles/openjdk/GPL/windows-x86/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
839 |
+ "_windows-x86_bin-tests.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
840 |
"bundles/openjdk/GPL/windows-x86/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
841 |
] |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
842 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
843 |
jdk_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
844 |
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", |
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
845 |
remote: [ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
846 |
"bundles/openjdk/GPL/windows-x86/jdk-" + data.version |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
847 |
+ "_windows-x86_bin-symbols.tar.gz", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
848 |
"bundles/openjdk/GPL/windows-x86/\\1" |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
849 |
], |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
850 |
subdir: "jdk-" + data.version |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
851 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
852 |
jre_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
853 |
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
854 |
remote: "bundles/openjdk/GPL/windows-x86/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
855 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
856 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
857 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
858 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
859 |
"linux-x86-open-debug": { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
860 |
artifacts: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
861 |
jdk: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
862 |
local: "bundles/\\(jdk.*bin-debug.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
863 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
864 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
865 |
jre: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
866 |
local: "bundles/\\(jre.*bin-debug.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
867 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
868 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
869 |
jdk_symbols: { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
870 |
local: "bundles/\\(jdk.*bin-debug-symbols.tar.gz\\)", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
871 |
remote: "bundles/openjdk/GPL/profile/linux-x86/\\1", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
872 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
873 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
874 |
}, |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
875 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
876 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
877 |
profiles = concatObjects(profiles, profilesArtifacts); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
878 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
879 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
880 |
// Define the reference implementation profiles. These are basically the same |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
881 |
// as the open profiles, but upload artifacts to a different location and |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
882 |
// are only defined for specific platforms. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
883 |
profiles["linux-x64-ri"] = clone(profiles["linux-x64-open"]); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
884 |
profiles["linux-x86-ri"] = clone(profiles["linux-x86-open"]); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
885 |
profiles["linux-x86-ri-debug"] = clone(profiles["linux-x86-open-debug"]); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
886 |
profiles["windows-x86-ri"] = clone(profiles["windows-x86-open"]); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
887 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
888 |
// Generate artifacts for ri profiles |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
889 |
[ "linux-x64-ri", "linux-x86-ri", "linux-x86-ri-debug", "windows-x86-ri" ] |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
890 |
.forEach(function (name) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
891 |
// Rewrite all remote dirs to "bundles/openjdk/BCL/..." |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
892 |
for (artifactName in profiles[name].artifacts) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
893 |
var artifact = profiles[name].artifacts[artifactName]; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
894 |
artifact.remote = replaceAll("\/GPL\/", "/BCL/", |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
895 |
(artifact.remote != null ? artifact.remote : artifact.local)); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
896 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
897 |
}); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
898 |
|
45510
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
899 |
// The windows ri profile needs to add the freetype license file |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
900 |
profilesRiFreetype = { |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
901 |
"windows-x86-ri": { |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
902 |
configure_args: "--with-freetype-license=" |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
903 |
+ input.get("freetype", "install_path") |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
904 |
+ "/freetype-2.7.1-v120-x86/freetype.md" |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
905 |
} |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
906 |
}; |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
907 |
profiles = concatObjects(profiles, profilesRiFreetype); |
ef977f09bac8
8178064: OpenJDK RI binary should include the license file for freetype
erikj
parents:
45107
diff
changeset
|
908 |
|
34491 | 909 |
// Generate the missing platform attributes |
910 |
profiles = generatePlatformAttributes(profiles); |
|
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
911 |
profiles = generateDefaultMakeTargetsConfigureArg(common, profiles); |
34491 | 912 |
return profiles; |
913 |
}; |
|
914 |
||
915 |
/** |
|
916 |
* Generate the dependencies part of the configuration |
|
917 |
* |
|
918 |
* @param input External data to use for generating the configuration |
|
919 |
* @param common The common values |
|
920 |
* @returns {{}} Dependencies part of configuration |
|
921 |
*/ |
|
34496 | 922 |
var getJibProfilesDependencies = function (input, common) { |
34491 | 923 |
|
924 |
var devkit_platform_revisions = { |
|
42425 | 925 |
linux_x64: "gcc4.9.2-OEL6.4+1.1", |
34491 | 926 |
macosx_x64: "Xcode6.3-MacOSX10.9+1.0", |
34595
09596fe63e2d
8145391: Updated jprt.properties, devtools, jib and readme with SS12u4
erikj
parents:
34496
diff
changeset
|
927 |
solaris_x64: "SS12u4-Solaris11u1+1.0", |
09596fe63e2d
8145391: Updated jprt.properties, devtools, jib and readme with SS12u4
erikj
parents:
34496
diff
changeset
|
928 |
solaris_sparcv9: "SS12u4-Solaris11u1+1.0", |
44625
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
929 |
windows_x64: "VS2013SP4+1.0", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
930 |
linux_aarch64: "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0", |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
931 |
linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0 |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
932 |
? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0" |
cf100f579077
8177822: Move closed jib configuration for arm platforms to open
erikj
parents:
44513
diff
changeset
|
933 |
: "arm-linaro-4.7+1.0") |
34491 | 934 |
}; |
935 |
||
936 |
var devkit_platform = (input.target_cpu == "x86" |
|
937 |
? input.target_os + "_x64" |
|
938 |
: input.target_platform); |
|
939 |
||
940 |
var dependencies = { |
|
941 |
||
942 |
boot_jdk: { |
|
943 |
server: "javare", |
|
944 |
module: "jdk", |
|
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
945 |
revision: common.boot_jdk_revision, |
43919 | 946 |
checksum_file: common.boot_jdk_platform + "/MD5_VALUES", |
947 |
file: common.boot_jdk_platform + "/jdk-" + common.boot_jdk_revision |
|
948 |
+ "-" + common.boot_jdk_platform + ".tar.gz", |
|
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
949 |
configure_args: "--with-boot-jdk=" + common.boot_jdk_home, |
43288
58b8748ef90d
8173476: Provide lldb from devkit when running tests on macosx
erikj
parents:
43049
diff
changeset
|
950 |
environment_path: common.boot_jdk_home + "/bin" |
34491 | 951 |
}, |
952 |
||
953 |
devkit: { |
|
954 |
organization: common.organization, |
|
955 |
ext: "tar.gz", |
|
956 |
module: "devkit-" + devkit_platform, |
|
957 |
revision: devkit_platform_revisions[devkit_platform] |
|
958 |
}, |
|
959 |
||
960 |
build_devkit: { |
|
961 |
organization: common.organization, |
|
962 |
ext: "tar.gz", |
|
963 |
module: "devkit-" + input.build_platform, |
|
964 |
revision: devkit_platform_revisions[input.build_platform] |
|
965 |
}, |
|
966 |
||
967 |
cups: { |
|
968 |
organization: common.organization, |
|
969 |
ext: "tar.gz", |
|
970 |
revision: "1.0118+1.0" |
|
971 |
}, |
|
972 |
||
973 |
jtreg: { |
|
974 |
server: "javare", |
|
36506 | 975 |
revision: "4.2", |
44513
1cf28405432d
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44399
diff
changeset
|
976 |
build_number: "b07", |
34491 | 977 |
checksum_file: "MD5_VALUES", |
36506 | 978 |
file: "jtreg_bin-4.2.zip", |
41047
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
979 |
environment_name: "JT_HOME", |
de6f69208f82
8164301: jib should provide a JDK for running jtreg with
erikj
parents:
40241
diff
changeset
|
980 |
environment_path: input.get("jtreg", "install_path") + "/jtreg/bin" |
34491 | 981 |
}, |
982 |
||
983 |
gnumake: { |
|
984 |
organization: common.organization, |
|
985 |
ext: "tar.gz", |
|
986 |
revision: "4.0+1.0", |
|
987 |
||
988 |
module: (input.build_os == "windows" |
|
989 |
? "gnumake-" + input.build_osenv_platform |
|
990 |
: "gnumake-" + input.build_platform), |
|
991 |
||
992 |
configure_args: (input.build_os == "windows" |
|
993 |
? "MAKE=" + input.get("gnumake", "install_path") + "/cygwin/bin/make" |
|
994 |
: "MAKE=" + input.get("gnumake", "install_path") + "/bin/make"), |
|
995 |
||
996 |
environment_path: (input.build_os == "windows" |
|
997 |
? input.get("gnumake", "install_path") + "/cygwin/bin" |
|
998 |
: input.get("gnumake", "install_path") + "/bin") |
|
999 |
}, |
|
1000 |
||
1001 |
freetype: { |
|
1002 |
organization: common.organization, |
|
1003 |
ext: "tar.gz", |
|
44399 | 1004 |
revision: "2.7.1-v120+1.0", |
34491 | 1005 |
module: "freetype-" + input.target_platform |
44727 | 1006 |
}, |
1007 |
||
1008 |
graphviz: { |
|
1009 |
organization: common.organization, |
|
1010 |
ext: "tar.gz", |
|
1011 |
revision: "2.38.0-1+1.1", |
|
1012 |
module: "graphviz-" + input.target_platform, |
|
45107 | 1013 |
configure_args: "DOT=" + input.get("graphviz", "install_path") + "/dot", |
1014 |
environment_path: input.get("graphviz", "install_path") |
|
44727 | 1015 |
}, |
44734 | 1016 |
|
1017 |
pandoc: { |
|
1018 |
organization: common.organization, |
|
1019 |
ext: "tar.gz", |
|
1020 |
revision: "1.17.2+1.0", |
|
1021 |
module: "pandoc-" + input.target_platform, |
|
45107 | 1022 |
configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc", |
1023 |
environment_path: input.get("pandoc", "install_path") + "/pandoc" |
|
44734 | 1024 |
}, |
34491 | 1025 |
}; |
1026 |
||
1027 |
return dependencies; |
|
1028 |
}; |
|
1029 |
||
1030 |
/** |
|
1031 |
* Generate the missing platform attributes for profiles |
|
1032 |
* |
|
1033 |
* @param profiles Profiles map to generate attributes on |
|
1034 |
* @returns {{}} New profiles map with platform attributes fully filled in |
|
1035 |
*/ |
|
1036 |
var generatePlatformAttributes = function (profiles) { |
|
1037 |
var ret = concatObjects(profiles, {}); |
|
1038 |
for (var profile in profiles) { |
|
1039 |
if (ret[profile].build_os == null) { |
|
1040 |
ret[profile].build_os = ret[profile].target_os; |
|
1041 |
} |
|
1042 |
if (ret[profile].build_cpu == null) { |
|
1043 |
ret[profile].build_cpu = ret[profile].target_cpu; |
|
1044 |
} |
|
1045 |
ret[profile].target_platform = ret[profile].target_os + "_" + ret[profile].target_cpu; |
|
1046 |
ret[profile].build_platform = ret[profile].build_os + "_" + ret[profile].build_cpu; |
|
1047 |
} |
|
1048 |
return ret; |
|
1049 |
}; |
|
1050 |
||
1051 |
/** |
|
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1052 |
* The default_make_targets attribute on a profile is not a real Jib attribute. |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1053 |
* This function rewrites that attribute into the corresponding configure arg. |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1054 |
* Calling this function multiple times on the same profiles object is safe. |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1055 |
* |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1056 |
* @param common Common values |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1057 |
* @param profiles Profiles map to rewrite profiles for |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1058 |
* @returns {{}} New map of profiles with the make targets converted |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1059 |
*/ |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1060 |
var generateDefaultMakeTargetsConfigureArg = function (common, profiles) { |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1061 |
var ret = concatObjects(profiles, {}); |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1062 |
for (var profile in ret) { |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1063 |
if (ret[profile]["default_make_targets"] != null) { |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1064 |
var targetsString = concat(ret[profile].default_make_targets).join(" "); |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1065 |
// Iterate over all configure args and see if --with-default-make-target |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1066 |
// is already there and change it, otherwise add it. |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1067 |
var found = false; |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1068 |
for (var i in ret[profile].configure_args) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1069 |
var arg = ret[profile].configure_args[i]; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1070 |
if (arg != null && arg.startsWith("--with-default-make-target=")) { |
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1071 |
found = true; |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1072 |
ret[profile].configure_args[i] |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1073 |
= "--with-default-make-target=" + targetsString; |
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1074 |
} |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1075 |
} |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1076 |
if (!found) { |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1077 |
ret[profile].configure_args = concat( |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1078 |
ret[profile].configure_args, |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1079 |
"--with-default-make-target=" + targetsString); |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1080 |
} |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1081 |
} |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1082 |
} |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1083 |
return ret; |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1084 |
} |
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1085 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1086 |
var getBuildId = function (input) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1087 |
if (input.build_id != null) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1088 |
return input.build_id; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1089 |
} else { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1090 |
var topdir = new java.io.File(__DIR__, "../..").getCanonicalFile().getName(); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1091 |
var userName = java.lang.System.getProperty("user.name"); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1092 |
return userName + "." + topdir; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1093 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1094 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1095 |
|
37649
3809534d4531
8154841: Let different Jib profiles have different default make targets
erikj
parents:
37407
diff
changeset
|
1096 |
/** |
34491 | 1097 |
* Deep clones an object tree. |
1098 |
* |
|
1099 |
* @param o Object to clone |
|
1100 |
* @returns {{}} Clone of o |
|
1101 |
*/ |
|
1102 |
var clone = function (o) { |
|
1103 |
return JSON.parse(JSON.stringify(o)); |
|
1104 |
}; |
|
1105 |
||
1106 |
/** |
|
1107 |
* Concatenates all arguments into a new array |
|
1108 |
* |
|
1109 |
* @returns {Array.<T>} New array containing all arguments |
|
1110 |
*/ |
|
1111 |
var concat = function () { |
|
1112 |
return Array.prototype.concat.apply([], arguments); |
|
1113 |
}; |
|
1114 |
||
1115 |
/** |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1116 |
* Takes a String or Array of Strings and does a replace operation on each |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1117 |
* of them. |
34491 | 1118 |
* |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1119 |
* @param pattern Pattern to look for |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1120 |
* @param replacement Replacement text to insert |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1121 |
* @param a String or Array of Strings to replace |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1122 |
* @returns {Array} Either a new array or a new string depending on the input |
34491 | 1123 |
*/ |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1124 |
var replaceAll = function (pattern, replacement, a) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1125 |
// If a is an array |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1126 |
if (Array === a.constructor) { |
34491 | 1127 |
var newA = []; |
1128 |
for (var i in a) { |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1129 |
newA.push(a[i].replace(pattern, replacement)); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1130 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1131 |
return newA; |
34491 | 1132 |
} else { |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1133 |
return a.replace(pattern, replacement); |
34491 | 1134 |
} |
1135 |
}; |
|
1136 |
||
1137 |
/** |
|
1138 |
* Deep concatenation of two objects. For each node encountered, merge |
|
1139 |
* the contents with the corresponding node in the other object tree, |
|
1140 |
* treating all strings as array elements. |
|
1141 |
* |
|
1142 |
* @param o1 Object to concatenate |
|
1143 |
* @param o2 Object to concatenate |
|
1144 |
* @returns {{}} New object tree containing the concatenation of o1 and o2 |
|
1145 |
*/ |
|
1146 |
var concatObjects = function (o1, o2) { |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1147 |
if (o1 == null) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1148 |
return clone(o2); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1149 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1150 |
if (o2 == null) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1151 |
return clone(o1); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1152 |
} |
34491 | 1153 |
var ret = {}; |
1154 |
for (var a in o1) { |
|
1155 |
if (o2[a] == null) { |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1156 |
ret[a] = clone(o1[a]); |
34491 | 1157 |
} |
1158 |
} |
|
1159 |
for (var a in o2) { |
|
1160 |
if (o1[a] == null) { |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1161 |
ret[a] = clone(o2[a]); |
34491 | 1162 |
} else { |
1163 |
if (typeof o1[a] == 'string') { |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1164 |
ret[a] = clone([o1[a]].concat(o2[a])); |
34491 | 1165 |
} else if (Array.isArray(o1[a])) { |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1166 |
ret[a] = clone(o1[a].concat(o2[a])); |
34491 | 1167 |
} else if (typeof o1[a] == 'object') { |
1168 |
ret[a] = concatObjects(o1[a], o2[a]); |
|
1169 |
} |
|
1170 |
} |
|
1171 |
} |
|
1172 |
return ret; |
|
1173 |
}; |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1174 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1175 |
/** |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1176 |
* Constructs the numeric version string from reading the |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1177 |
* common/autoconf/version-numbers file and removing all trailing ".0". |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1178 |
* |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1179 |
* @param major Override major version |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1180 |
* @param minor Override minor version |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1181 |
* @param security Override security version |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1182 |
* @param patch Override patch version |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1183 |
* @returns {String} The numeric version string |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1184 |
*/ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1185 |
var getVersion = function (major, minor, security, patch) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1186 |
var version_numbers = getVersionNumbers(); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1187 |
var version = (major != null ? major : version_numbers.get("DEFAULT_VERSION_MAJOR")) |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1188 |
+ "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR")) |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1189 |
+ "." + (security != null ? security : version_numbers.get("DEFAULT_VERSION_SECURITY")) |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1190 |
+ "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")); |
43600 | 1191 |
while (version.match(".*\\.0$")) { |
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1192 |
version = version.substring(0, version.length - 2); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1193 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1194 |
return version; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1195 |
}; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1196 |
|
45048
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1197 |
/** |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1198 |
* Constructs the common version configure args based on build type and |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1199 |
* other version inputs |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1200 |
*/ |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1201 |
var versionArgs = function(input, common) { |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1202 |
var args = ["--with-version-build=" + common.build_number]; |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1203 |
if (input.build_type == "promoted") { |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1204 |
args = concat(args, |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1205 |
// This needs to be changed when we start building release candidates |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1206 |
"--with-version-pre=ea", |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1207 |
"--without-version-opt"); |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1208 |
} else { |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1209 |
args = concat(args, "--with-version-opt=" + common.build_id); |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1210 |
} |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1211 |
return args; |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1212 |
} |
665cd82e98dc
8180081: Adjust Jib and JDL configuration for 10 to support promotable builds
erikj
parents:
44894
diff
changeset
|
1213 |
|
42848
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1214 |
// Properties representation of the common/autoconf/version-numbers file. Lazily |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1215 |
// initiated by the function below. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1216 |
var version_numbers; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1217 |
|
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1218 |
/** |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1219 |
* Read the common/autoconf/version-numbers file into a Properties object. |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1220 |
* |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1221 |
* @returns {java.utilProperties} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1222 |
*/ |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1223 |
var getVersionNumbers = function () { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1224 |
// Read version information from common/autoconf/version-numbers |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1225 |
if (version_numbers == null) { |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1226 |
version_numbers = new java.util.Properties(); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1227 |
var stream = new java.io.FileInputStream(__DIR__ + "/../../common/autoconf/version-numbers"); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1228 |
version_numbers.load(stream); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1229 |
stream.close(); |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1230 |
} |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1231 |
return version_numbers; |
27ad8b2418f7
8170741: Enable uploading of built artifacts through Jib
erikj
parents:
42425
diff
changeset
|
1232 |
} |