summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-11-14 13:16:08 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-11-14 13:16:08 (GMT)
commit4df13c7c62f5aacd60ac0a76bec6416100b0b9b8 (patch)
tree5f0eaf8f389687d8f01d406b6f1c61add4d8df6f /BuildTools/SCons
parentc733ee6f86513adf59ead706fc82711c3ca1e1ec (diff)
downloadswift-contrib-973b67b22d000d0e6109a9d9c8c64ff2f638fc6b.zip
swift-contrib-973b67b22d000d0e6109a9d9c8c64ff2f638fc6b.tar.bz2
Produce Windows installers with versions other than betaswift-2.0rc1
Change-Id: I91ee9d1509bbd824fdc23ac2313310044065d4a1
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Version.py13
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
@@ -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)