diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-01-28 10:36:50 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-01-28 10:36:50 -0330 |
| commit | 610ce006b8a59de191cf44788a1b791aea0095e1 (patch) | |
| tree | a3b348b8725efd0e14a1119354ea675a5b903005 /distribution/lib/FixUtil.py | |
| parent | Fixed (ICE-6190) - Improve WinRT ssl/wss testing (diff) | |
| download | ice-610ce006b8a59de191cf44788a1b791aea0095e1.tar.bz2 ice-610ce006b8a59de191cf44788a1b791aea0095e1.tar.xz ice-610ce006b8a59de191cf44788a1b791aea0095e1.zip | |
Changed version to 3.6.0
Diffstat (limited to 'distribution/lib/FixUtil.py')
| -rwxr-xr-x | distribution/lib/FixUtil.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/distribution/lib/FixUtil.py b/distribution/lib/FixUtil.py index 8e3665d4ddc..27ef4a61df1 100755 --- a/distribution/lib/FixUtil.py +++ b/distribution/lib/FixUtil.py @@ -50,7 +50,7 @@ def intVersion(version): patch = 50 + int(gr3[1:]) else: patch = 51 - return ("%2d%02d%02d" % (major, minor, patch)).strip() + return ("%2d%02d%02d" % (major, minor, patch)).strip() def betaVersion(version): r = re.search(vpatParse, version) @@ -87,7 +87,7 @@ def shortVersion(version): def patchVersion(version): r = re.search(vpatParse, version) - + gr3 = r.group(3) patch = -1 if gr3.startswith("."): @@ -100,6 +100,16 @@ def patchVersion(version): return ("%d" % (patch)).strip() +def jsonVersion(version): + r = re.search(vpatParse, version) + major = int(r.group(1)) + minor = int(r.group(2)) + v = ("%d.%d" % (major, minor)).strip() + if r.group(3).startswith("b"): + return v + "0-beta.0" + else: + return ("%s%s" % (v, r.group(3))).strip() + # # Find files matching a pattern. # |