diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-02-01 13:49:07 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-02-01 13:49:07 +0000 |
| commit | 5ace184aae39540d1080dfea63bc2728211555b8 (patch) | |
| tree | 465ca2811a75b131e5ddf4a0c02fa71d27c142fa /cpp/install/common/makewindist.py | |
| parent | Added inputUtil, re-enabled slicing/objects test (diff) | |
| download | ice-5ace184aae39540d1080dfea63bc2728211555b8.tar.bz2 ice-5ace184aae39540d1080dfea63bc2728211555b8.tar.xz ice-5ace184aae39540d1080dfea63bc2728211555b8.zip | |
fix for bug 799
Diffstat (limited to 'cpp/install/common/makewindist.py')
| -rwxr-xr-x | cpp/install/common/makewindist.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index 974f2b0ca91..18808e8c65b 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -150,6 +150,7 @@ def checkSources(sourceDir): current = m.group(1)
keyVersion = maxVersion(keyVersion, current)
+ print keyVersion
prefixes = list(DistPrefixes)
prefixes.remove("Ice-")
for prefix in prefixes:
@@ -420,14 +421,13 @@ def buildMergeModules(startDir, stageDir, sourcesVersion, installVersion): ("ExpatRuntime", "EXPAT_RUNTIME"),
("OpenSSLDevKit", "OPENSSL_DEV_KIT"),
("OpenSSLRuntime", "OPENSSL_RUNTIME"),
- ("JGoodies", "JGOODIES_RUNTIME")
+ ("JGoodies", "JGOODIES_RUNTIME"),
+ ("BerkeleyDBJava", "BERKELEYDB_JAVA")
]
if installVersion == "vc60":
extras = [ ("STLPortDevKit", "STLPORT_DEV_KIT"), ("STLPortRuntime", "STLPORT_RUNTIME") ]
modules.extend(extras)
- if installVersion != "vc60":
- modules.append(("BerkeleyDBJava", "BERKELEYDB_JAVA"))
#
# Build modules.
#
|