Swiftdiff options
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/Version.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/BuildTools/SCons/Version.py b/BuildTools/SCons/Version.py index a912e02..fe5fde1 100644 --- a/BuildTools/SCons/Version.py +++ b/BuildTools/SCons/Version.py @@ -35,28 +35,29 @@ def convertToWindowsVersion(version) : version_match = re.match("(\d+)\.(\d+)(.*)", version) major = int(version_match.group(1)) if version_match else 0 minor = int(version_match.group(2)) if version_match else 0 if version_match and len(version_match.group(3)) == 0 : patch = 99999 else : match = re.match("^beta(\d+)(.*)", version_match.group(3)) build_string = "" if match : patch = 1000*int(match.group(1)) build_string = match.group(2) else : - match = re.match("^rc(\d+)(.*)", version_match.group(3)) - if match : + rc_match = re.match("^rc(\d+)(.*)", version_match.group(3)) + if rc_match : patch = 10000*int(rc_match.group(1)) - build_string = match.group(2) + build_string = rc_match.group(2) else : - match = re.match("^alpha(.*)", version_match.group(3)) - if match : - build_string = match.group(1) + patch = 0 + alpha_match = re.match("^alpha(.*)", version_match.group(3)) + if alpha_match : + build_string = alpha_match.group(1) if len(build_string) > 0 : build_match = re.match("^-dev(\d+)", build_string) if build_match : patch += int(build_match.group(1)) return (major, minor, patch) |