1019 for (var a in o2) {
1020 if (o1[a] == null) {
1021 ret[a] = clone(o2[a]);
1022 } else {
1023 if (typeof o1[a] == 'string') {
1024 ret[a] = clone([o1[a]].concat(o2[a]));
1025 } else if (Array.isArray(o1[a])) {
1026 ret[a] = clone(o1[a].concat(o2[a]));
1027 } else if (typeof o1[a] == 'object') {
1028 ret[a] = concatObjects(o1[a], o2[a]);
1029 }
1030 }
1031 }
1032 return ret;
1033 };
1034
1035 /**
1036 * Constructs the numeric version string from reading the
1037 * make/autoconf/version-numbers file and removing all trailing ".0".
1038 *
1039 * @param major Override major version
1040 * @param minor Override minor version
1041 * @param security Override security version
1042 * @param patch Override patch version
1043 * @returns {String} The numeric version string
1044 */
1045 var getVersion = function (major, minor, security, patch) {
1046 var version_numbers = getVersionNumbers();
1047 var version = (major != null ? major : version_numbers.get("DEFAULT_VERSION_MAJOR"))
1048 + "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR"))
1049 + "." + (security != null ? security : version_numbers.get("DEFAULT_VERSION_SECURITY"))
1050 + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"));
1051 while (version.match(".*\\.0$")) {
1052 version = version.substring(0, version.length - 2);
1053 }
1054 return version;
1055 };
1056
1057 /**
1058 * Constructs the common version configure args based on build type and
1059 * other version inputs
1060 */
1061 var versionArgs = function(input, common) {
1062 var args = ["--with-version-build=" + common.build_number];
1063 if (input.build_type == "promoted") {
1064 args = concat(args,
1065 // This needs to be changed when we start building release candidates
1066 "--with-version-pre=ea",
1067 "--without-version-opt");
1068 } else {
1069 args = concat(args, "--with-version-opt=" + common.build_id);
|
1019 for (var a in o2) {
1020 if (o1[a] == null) {
1021 ret[a] = clone(o2[a]);
1022 } else {
1023 if (typeof o1[a] == 'string') {
1024 ret[a] = clone([o1[a]].concat(o2[a]));
1025 } else if (Array.isArray(o1[a])) {
1026 ret[a] = clone(o1[a].concat(o2[a]));
1027 } else if (typeof o1[a] == 'object') {
1028 ret[a] = concatObjects(o1[a], o2[a]);
1029 }
1030 }
1031 }
1032 return ret;
1033 };
1034
1035 /**
1036 * Constructs the numeric version string from reading the
1037 * make/autoconf/version-numbers file and removing all trailing ".0".
1038 *
1039 * @param feature Override feature version
1040 * @param interim Override interim version
1041 * @param update Override update version
1042 * @param patch Override patch version
1043 * @returns {String} The numeric version string
1044 */
1045 var getVersion = function (feature, interim, update, patch) {
1046 var version_numbers = getVersionNumbers();
1047 var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE"))
1048 + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM"))
1049 + "." + (update != null ? update : version_numbers.get("DEFAULT_VERSION_UPDATE"))
1050 + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"));
1051 while (version.match(".*\\.0$")) {
1052 version = version.substring(0, version.length - 2);
1053 }
1054 return version;
1055 };
1056
1057 /**
1058 * Constructs the common version configure args based on build type and
1059 * other version inputs
1060 */
1061 var versionArgs = function(input, common) {
1062 var args = ["--with-version-build=" + common.build_number];
1063 if (input.build_type == "promoted") {
1064 args = concat(args,
1065 // This needs to be changed when we start building release candidates
1066 "--with-version-pre=ea",
1067 "--without-version-opt");
1068 } else {
1069 args = concat(args, "--with-version-opt=" + common.build_id);
|