summaryrefslogtreecommitdiff
path: root/fixVersion.py
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-03-24 10:58:40 -0230
committerDwayne Boone <dwayne@zeroc.com>2008-03-24 10:58:40 -0230
commit75cbe4d54567b69ebdfb33320bef5adcfa6cd7b6 (patch)
tree6b24bc296028352cab143ec126f1a9c1c28a9aff /fixVersion.py
parentUpdated multicast expect script to run IPv4 and IPv6. (diff)
downloadice-75cbe4d54567b69ebdfb33320bef5adcfa6cd7b6.tar.bz2
ice-75cbe4d54567b69ebdfb33320bef5adcfa6cd7b6.tar.xz
ice-75cbe4d54567b69ebdfb33320bef5adcfa6cd7b6.zip
Bug 2884 - Fixed embedded lib paths for deta release
Diffstat (limited to 'fixVersion.py')
-rwxr-xr-xfixVersion.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/fixVersion.py b/fixVersion.py
index 6a2091fdaba..81af526a151 100755
--- a/fixVersion.py
+++ b/fixVersion.py
@@ -42,6 +42,13 @@ def intVersion(version):
patch = 51
return ("%2d%02d%02d" % (major, minor, patch)).strip()
+def betaVersion(version):
+ r = re.search(vpatParse, version)
+ if r.group(3).startswith("b"):
+ return "b"
+ else:
+ return ""
+
def soVersion(version):
r = re.search(vpatParse, version)
major = int(r.group(1))
@@ -206,7 +213,7 @@ if not re.match(vpatCheck, version):
if not patchIceE:
fileMatchAndReplace(os.path.join(ice_dir, "config", "Make.common.rules"),
[("VERSION_MAJOR[\t\s]*= ([0-9]*)", majorVersion(version)),
- ("VERSION_MINOR[\t\s]*= ([0-9]*)", minorVersion(version)),
+ ("VERSION_MINOR[\t\s]*= ([0-9]*b?)", minorVersion(version) + betaVersion(version)),
("VERSION[\t\s]*= " + vpatMatch, version),
("SOVERSION[\t\s]*= ([0-9]+b?)", soVersion(version))])