diff options
| author | Michi Henning <michi@zeroc.com> | 2009-03-10 10:27:53 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-03-10 10:27:53 +1000 |
| commit | e6ad28e2ba40f28b620edd2b2767a06b833f568e (patch) | |
| tree | d52ca51b2bdefc3222e334ba5ca7a1ceeb119648 /fixVersion.py | |
| parent | Bug 3797: nrvo errata (diff) | |
| download | ice-e6ad28e2ba40f28b620edd2b2767a06b833f568e.tar.bz2 ice-e6ad28e2ba40f28b620edd2b2767a06b833f568e.tar.xz ice-e6ad28e2ba40f28b620edd2b2767a06b833f568e.zip | |
Changed makefiles to use $(VERSION) instead of $(SHORT_VERSION).$(PATCH_VERSION).
Changed PATCH_VERSION to VERSION_PATCH, for consistency.
Diffstat (limited to 'fixVersion.py')
| -rwxr-xr-x | fixVersion.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fixVersion.py b/fixVersion.py index d4bf5123043..ded90c8a4ba 100755 --- a/fixVersion.py +++ b/fixVersion.py @@ -35,7 +35,7 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "config", "Make.common.rules") [("VERSION_MAJOR[\t\s]*= ([0-9]*)", FixUtil.majorVersion(version)), ("VERSION_MINOR[\t\s]*= ([0-9]*b?)", FixUtil.minorVersion(version) + FixUtil.betaVersion(version)), ("SHORT_VERSION[\t\s]*= ([0-9]*\.[0-9]*)", FixUtil.shortVersion(version)), - ("PATCH_VERSION[\t\s]*= ([0-9]*)", FixUtil.patchVersion(version)), + ("VERSION_PATCH[\t\s]*= ([0-9]*)", FixUtil.patchVersion(version)), ("VERSION[\t\s]*= " + FixUtil.vpatMatch, version), ("SOVERSION[\t\s]*= ([0-9]+b?)", FixUtil.soVersion(version))]) @@ -44,7 +44,7 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "config", "Make.common.rules.m ("INTVERSION[\t\s]*= " + FixUtil.vpatMatch, FixUtil.majorVersion(version) + "." + \ FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version)), ("SHORT_VERSION[\t\s]*= ([0-9]*\.[0-9]*)", FixUtil.shortVersion(version)), - ("PATCH_VERSION[\t\s]*= ([0-9]*)", FixUtil.patchVersion(version)), + ("VERSION_PATCH[\t\s]*= ([0-9]*)", FixUtil.patchVersion(version)), ("SOVERSION[\t\s]*= ([0-9]+b?)", FixUtil.soVersion(version))]) FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "rpm", "ice.spec"), |