diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-05-25 14:46:29 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-05-25 19:37:51 +0300 |
| commit | 10390cc16084c5f386163664f6e42d9e4d28b129 (patch) | |
| tree | 7762f9ca99568a87b2332ba18b3f67b07a9a3d08 | |
| parent | b8427aa18824e89a3b28b6b821da4efe0827951b (diff) | |
Rename pre_release_version_type to release_version_type
Renaming pre_release_version_type to release_version_type to match its
future usage to differentiate between wheel/package types.
Change-Id: I70a2361f639a36b17f63b7f76d8c231a144bd825
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | build_scripts/main.py | 8 | ||||
| -rw-r--r-- | coin_build_instructions.py | 4 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 4 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index cf56850df..55cc6a882 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -74,10 +74,12 @@ def get_package_version(): final_version = "{}.{}.{}".format( d['major_version'], d['minor_version'], d['patch_version']) - pre_release_version_type = d['pre_release_version_type'] + release_version_type = d['release_version_type'] pre_release_version = d['pre_release_version'] - if pre_release_version and pre_release_version_type: - final_version += pre_release_version_type + pre_release_version + if pre_release_version and release_version_type: + final_version += release_version_type + pre_release_version + if release_version_type.startswith("comm"): + final_version += "." + release_version_type # Add the current timestamp to the version number, to suggest it # is a development snapshot build. diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 5c3033b04..bfb10410c 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -95,9 +95,9 @@ def is_snapshot_build(): setup_script_dir, "sources", "pyside2", "pyside_version.py") d = get_python_dict(pyside_version_py) - pre_release_version_type = d['pre_release_version_type'] + release_version_type = d['release_version_type'] pre_release_version = d['pre_release_version'] - if pre_release_version or pre_release_version_type: + if pre_release_version and release_version_type: return True return False diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index c022fc803..f5ef03613 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -44,7 +44,7 @@ patch_version = "0" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). # An empty string means the generated package will be an official release. -pre_release_version_type = "a" +release_version_type = "a" # For example: "1", "2" (which means "beta1", "beta2", if type is "b"). pre_release_version = "1" @@ -52,4 +52,4 @@ pre_release_version = "1" if __name__ == '__main__': # Used by CMake. print('{0};{1};{2};{3};{4}'.format(major_version, minor_version, patch_version, - pre_release_version_type, pre_release_version)) + release_version_type, pre_release_version)) diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index c022fc803..f5ef03613 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -44,7 +44,7 @@ patch_version = "0" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). # An empty string means the generated package will be an official release. -pre_release_version_type = "a" +release_version_type = "a" # For example: "1", "2" (which means "beta1", "beta2", if type is "b"). pre_release_version = "1" @@ -52,4 +52,4 @@ pre_release_version = "1" if __name__ == '__main__': # Used by CMake. print('{0};{1};{2};{3};{4}'.format(major_version, minor_version, patch_version, - pre_release_version_type, pre_release_version)) + release_version_type, pre_release_version)) |