equal
deleted
inserted
replaced
201 |
201 |
202 // Exclude list to use when Jib creates a source bundle |
202 // Exclude list to use when Jib creates a source bundle |
203 data.src_bundle_excludes = "./build webrev* */webrev* */*/webrev* */*/*/webrev* .hg */.hg */*/.hg */*/*/.hg"; |
203 data.src_bundle_excludes = "./build webrev* */webrev* */*/webrev* */*/*/webrev* .hg */.hg */*/.hg */*/*/.hg"; |
204 // Include list to use when creating a minimal jib source bundle which |
204 // Include list to use when creating a minimal jib source bundle which |
205 // contains just the jib configuration files. |
205 // contains just the jib configuration files. |
206 data.conf_bundle_includes = "*/conf/jib-profiles.* common/autoconf/version-numbers" |
206 data.conf_bundle_includes = "*/conf/jib-profiles.* make/autoconf/version-numbers" |
207 |
207 |
208 // Define some common values |
208 // Define some common values |
209 var common = getJibProfilesCommon(input, data); |
209 var common = getJibProfilesCommon(input, data); |
210 // Generate the profiles part of the configuration |
210 // Generate the profiles part of the configuration |
211 data.profiles = getJibProfilesProfiles(input, common, data); |
211 data.profiles = getJibProfilesProfiles(input, common, data); |
1041 return ret; |
1041 return ret; |
1042 }; |
1042 }; |
1043 |
1043 |
1044 /** |
1044 /** |
1045 * Constructs the numeric version string from reading the |
1045 * Constructs the numeric version string from reading the |
1046 * common/autoconf/version-numbers file and removing all trailing ".0". |
1046 * make/autoconf/version-numbers file and removing all trailing ".0". |
1047 * |
1047 * |
1048 * @param major Override major version |
1048 * @param major Override major version |
1049 * @param minor Override minor version |
1049 * @param minor Override minor version |
1050 * @param security Override security version |
1050 * @param security Override security version |
1051 * @param patch Override patch version |
1051 * @param patch Override patch version |
1078 args = concat(args, "--with-version-opt=" + common.build_id); |
1078 args = concat(args, "--with-version-opt=" + common.build_id); |
1079 } |
1079 } |
1080 return args; |
1080 return args; |
1081 } |
1081 } |
1082 |
1082 |
1083 // Properties representation of the common/autoconf/version-numbers file. Lazily |
1083 // Properties representation of the make/autoconf/version-numbers file. Lazily |
1084 // initiated by the function below. |
1084 // initiated by the function below. |
1085 var version_numbers; |
1085 var version_numbers; |
1086 |
1086 |
1087 /** |
1087 /** |
1088 * Read the common/autoconf/version-numbers file into a Properties object. |
1088 * Read the make/autoconf/version-numbers file into a Properties object. |
1089 * |
1089 * |
1090 * @returns {java.utilProperties} |
1090 * @returns {java.utilProperties} |
1091 */ |
1091 */ |
1092 var getVersionNumbers = function () { |
1092 var getVersionNumbers = function () { |
1093 // Read version information from common/autoconf/version-numbers |
1093 // Read version information from make/autoconf/version-numbers |
1094 if (version_numbers == null) { |
1094 if (version_numbers == null) { |
1095 version_numbers = new java.util.Properties(); |
1095 version_numbers = new java.util.Properties(); |
1096 var stream = new java.io.FileInputStream(__DIR__ + "/../autoconf/version-numbers"); |
1096 var stream = new java.io.FileInputStream(__DIR__ + "/../autoconf/version-numbers"); |
1097 version_numbers.load(stream); |
1097 version_numbers.load(stream); |
1098 stream.close(); |
1098 stream.close(); |