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 | |
| 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
| -rwxr-xr-x | cpp/fixVersion.py | 4 | ||||
| -rw-r--r-- | java/config/build.properties | 3 | ||||
| -rw-r--r-- | java/config/common.xml | 8 |
3 files changed, 9 insertions, 6 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), \ diff --git a/java/config/build.properties b/java/config/build.properties index 7d36dec4483..4f77bc1bafe 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -19,7 +19,8 @@ debug = on # jdk.version = ${ant.java.version} -ice.version = 3.2.0 +ice.version = 3.2 +ice.version.patch = 3.2.0 # # Define lint.unchecked as on if you want to use the Java5 compiler diff --git a/java/config/common.xml b/java/config/common.xml index bf338b27251..008e37ca4fb 100644 --- a/java/config/common.xml +++ b/java/config/common.xml @@ -98,7 +98,7 @@ <condition property="ice.dir" value="/usr"> <and> - <available file="/usr/share/Ice-${ice.version}/slice"/> + <available file="/usr/share/Ice-${ice.version.patch}/slice"/> <not> <isset property="ice.dir"/> </not> @@ -150,7 +150,7 @@ <!-- RPM --> <condition property="icej.dir" value="/usr"> <and> - <available file="/usr/lib/Ice-${ice.version}/Ice.jar"/> + <available file="/usr/lib/Ice-${ice.version.patch}/Ice.jar"/> <not> <isset property="icej.dir"/> </not> @@ -201,12 +201,12 @@ <!-- In C++, RPM installs have precedence over installs in the default Ice location (i.e. /opt/Ice-${ice.version}) so the same will be done here. --> <condition property="lib.dir" - value="/usr/lib/Ice-${ice.version}" + value="/usr/lib/Ice-${ice.version.patch}" else="${icej.dir}/lib"> <isset property="with-rpm"/> </condition> - <condition property="slice.dir" value="/usr/share/Ice-${ice.version}/slice" else="${ice.dir}/slice"> + <condition property="slice.dir" value="/usr/share/Ice-${ice.version.patch}/slice" else="${ice.dir}/slice"> <isset property="with-rpm"/> </condition> |