equal
deleted
inserted
replaced
1299 */ |
1299 */ |
1300 var versionArgs = function(input, common) { |
1300 var versionArgs = function(input, common) { |
1301 var args = ["--with-version-build=" + common.build_number]; |
1301 var args = ["--with-version-build=" + common.build_number]; |
1302 if (input.build_type == "promoted") { |
1302 if (input.build_type == "promoted") { |
1303 args = concat(args, |
1303 args = concat(args, |
1304 // This needs to be changed when we start building release candidates |
1304 "--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTION_VERSION_PRE"), |
1305 // with-version-pre must be set to ea for 'ea' and empty for fcs build |
|
1306 "--with-version-pre=ea", |
|
1307 "--without-version-opt"); |
1305 "--without-version-opt"); |
|
1306 } else if (input.build_type == "ci") { |
|
1307 var optString = input.build_id_data.ciBuildNumber; |
|
1308 var preString = input.build_id_data.projectName; |
|
1309 if (preString == "jdk") { |
|
1310 preString = version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"); |
|
1311 } |
|
1312 args = concat(args, "--with-version-pre=" + preString, |
|
1313 "--with-version-opt=" + optString); |
1308 } else { |
1314 } else { |
1309 args = concat(args, "--with-version-opt=" + common.build_id); |
1315 args = concat(args, "--with-version-opt=" + common.build_id); |
1310 } |
1316 } |
1311 return args; |
1317 return args; |
1312 } |
1318 } |