diff options
| author | Kai Engert <kaie@kuix.de> | 2017-05-23 11:27:40 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2017-05-23 11:27:40 +0200 |
| commit | bf5034667aea8ddca701c5006d60023cdbb04dc2 (patch) | |
| tree | 9d528e418652e7987764fd29f13588d687177537 | |
| parent | bd145d8338e55db23fb8c6726d61bc0798af67e6 (diff) | |
| download | nss-hg-bf5034667aea8ddca701c5006d60023cdbb04dc2.tar.gz | |
Bug 1366757, Automate the NSPR version requirement when creating NSS release archives, r=franziskus
DONTBUILD
| -rw-r--r-- | automation/release/nspr-version.txt | 10 | ||||
| -rwxr-xr-x | automation/release/nss-release-helper.py | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/automation/release/nspr-version.txt b/automation/release/nspr-version.txt new file mode 100644 index 000000000..9a4d13089 --- /dev/null +++ b/automation/release/nspr-version.txt @@ -0,0 +1,10 @@ +4.15 + +# The first line of this file must contain the human readable NSPR +# version number, which is the minimum required version of NSPR +# that is supported by this version of NSS. +# +# This information is used by release automation, +# when creating an NSS source archive. +# +# All other lines in this file are ignored. diff --git a/automation/release/nss-release-helper.py b/automation/release/nss-release-helper.py index a7b408828..d168febde 100755 --- a/automation/release/nss-release-helper.py +++ b/automation/release/nss-release-helper.py @@ -171,11 +171,13 @@ def set_4_digit_release_number(): set_all_lib_versions(version, major, minor, patch, build) def create_nss_release_archive(): - ensure_arguments_after_action(4, "nss_release_version nss_hg_release_tag nspr_release_version path_to_stage_directory") + ensure_arguments_after_action(3, "nss_release_version nss_hg_release_tag path_to_stage_directory") nssrel = args[1].strip() #e.g. 3.19.3 nssreltag = args[2].strip() #e.g. NSS_3_19_3_RTM - nsprrel = args[3].strip() #e.g. 4.10.8 - stagedir = args[4].strip() #e.g. ../stage + stagedir = args[3].strip() #e.g. ../stage + + with open('automation/release/nspr-version.txt') as nspr_version_file: + nsprrel = next(nspr_version_file).strip() nspr_tar = "nspr-" + nsprrel + ".tar.gz" nsprtar_with_path= stagedir + "/v" + nsprrel + "/src/" + nspr_tar |