From 4df13c7c62f5aacd60ac0a76bec6416100b0b9b8 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 14 Nov 2012 13:16:08 +0000 Subject: Produce Windows installers with versions other than beta Change-Id: I91ee9d1509bbd824fdc23ac2313310044065d4a1 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 @@ -44,14 +44,15 @@ def convertToWindowsVersion(version) : 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) -- cgit v0.10.2-6-g49f6