aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2020-05-25 14:46:29 +0300
committerSimo Fält <simo.falt@qt.io>2020-05-25 19:37:51 +0300
commit10390cc16084c5f386163664f6e42d9e4d28b129 (patch)
tree7762f9ca99568a87b2332ba18b3f67b07a9a3d08 /build_scripts
parentb8427aa18824e89a3b28b6b821da4efe0827951b (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>
Diffstat (limited to 'build_scripts')
-rw-r--r--build_scripts/main.py8
1 files changed, 5 insertions, 3 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.