diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-08-07 14:01:10 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-08-07 14:01:10 -0230 |
| commit | cc1e3c69bd88a9767c4cf02edede569e47a125bc (patch) | |
| tree | 13e24c08407425ab0b840bc3bfef90ef6106c66c /cpp | |
| parent | Added CS policy files (diff) | |
| download | ice-cc1e3c69bd88a9767c4cf02edede569e47a125bc.tar.bz2 ice-cc1e3c69bd88a9767c4cf02edede569e47a125bc.tar.xz ice-cc1e3c69bd88a9767c4cf02edede569e47a125bc.zip | |
Use /opt/Ice.MAJOR.MINOR as default Ice location
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/fixVersion.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/fixVersion.py b/cpp/fixVersion.py index c1f6e703a64..3e7da8b3fd5 100755 --- a/cpp/fixVersion.py +++ b/cpp/fixVersion.py @@ -261,7 +261,9 @@ if not patchIceE: icej_home = findSourceTree("icej", os.path.join("src", "IceUtil", "Version.java")) if icej_home: fileMatchAndReplace(os.path.join(icej_home, "config", "build.properties"), - [("ice\.version[\t\s]*= " + vpatMatch, version)]) + [("ice\.version[\t\s]*= " + vpatMatch, \ + majorVersion(version) + "." + minorVersion(version)), \ + ("ice\.version\.patch[\t\s]*= " + vpatMatch, version)]) fileMatchAndReplace(os.path.join(icej_home, "src", "IceUtil", "Version.java"), [("ICE_STRING_VERSION = \"" + vpatMatch +"\"", version), \ |