< prev index next >

make/conf/jib-profiles.js

Print this page

        

*** 1281,1294 **** var getVersion = function (feature, interim, update, patch) { var version_numbers = getVersionNumbers(); var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE")) + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM")) + "." + (update != null ? update : version_numbers.get("DEFAULT_VERSION_UPDATE")) ! + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")) ! + "." + version_numbers.get("DEFAULT_VERSION_EXTRA1") ! + "." + version_numbers.get("DEFAULT_VERSION_EXTRA2") ! + "." + version_numbers.get("DEFAULT_VERSION_EXTRA3"); while (version.match(".*\\.0$")) { version = version.substring(0, version.length - 2); } return version; }; --- 1281,1291 ---- var getVersion = function (feature, interim, update, patch) { var version_numbers = getVersionNumbers(); var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE")) + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM")) + "." + (update != null ? update : version_numbers.get("DEFAULT_VERSION_UPDATE")) ! + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")); while (version.match(".*\\.0$")) { version = version.substring(0, version.length - 2); } return version; };
*** 1299,1318 **** */ var versionArgs = function(input, common) { var args = ["--with-version-build=" + common.build_number]; if (input.build_type == "promoted") { args = concat(args, ! "--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"), "--without-version-opt"); - } else if (input.build_type == "ci") { - var optString = input.build_id_data.ciBuildNumber; - var preString = input.build_id_data.projectName; - if (preString == "jdk") { - preString = version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"); - } - args = concat(args, "--with-version-pre=" + preString, - "--with-version-opt=" + optString); } else { args = concat(args, "--with-version-opt=" + common.build_id); } return args; } --- 1296,1309 ---- */ var versionArgs = function(input, common) { var args = ["--with-version-build=" + common.build_number]; if (input.build_type == "promoted") { args = concat(args, ! // This needs to be changed when we start building release candidates ! // with-version-pre must be set to ea for 'ea' and empty for fcs build ! "--with-version-pre=ea", "--without-version-opt"); } else { args = concat(args, "--with-version-opt=" + common.build_id); } return args; }
< prev index next >