From cc1e3c69bd88a9767c4cf02edede569e47a125bc Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Tue, 7 Aug 2007 14:01:10 -0230 Subject: Use /opt/Ice.MAJOR.MINOR as default Ice location --- cpp/fixVersion.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/fixVersion.py') 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), \ -- cgit v1.2.3