diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-16 14:56:26 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-16 14:56:26 +0000 |
| commit | 89521cdc3bb3744a1ca3051003e28449ac344c16 (patch) | |
| tree | 270f0375c41fc6205371a25376da6895b57a82fa /cpp/install/common/makewindist.py | |
| parent | Added install targets for BCC "pdb" files (diff) | |
| download | ice-89521cdc3bb3744a1ca3051003e28449ac344c16.tar.bz2 ice-89521cdc3bb3744a1ca3051003e28449ac344c16.tar.xz ice-89521cdc3bb3744a1ca3051003e28449ac344c16.zip | |
Merged R3_1_branch after 3.1.1 release
Diffstat (limited to 'cpp/install/common/makewindist.py')
| -rwxr-xr-x | cpp/install/common/makewindist.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index ebdb32561e2..267eeee3a3f 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -22,7 +22,7 @@ STLPortVer = '4.6.2' ExpatVer = '1.95.8' DBVer = '4.3.29' -DistPrefixes = ["Ice-", "IceJ-", "IceCS-", "IcePy-", "IcePHP-", "IceVB-"] +DistPrefixes = ["Ice-%s", "IceJ-%s-java2", "IceJ-%s-java5", "IceCS-%s", "IcePy-%s", "IcePHP-%s", "IceVB-%s"] class DistEnvironmentError: def __init__(self, msg = None): @@ -142,7 +142,7 @@ def checkSources(sourceDir): raise DistEnvironmentError(msg) keyVersion = '0.0.0' - exp = re.compile("Ice-([0-9.]*).zip") + exp = re.compile("Ice-([0-9.]*).*.zip") current = None for d in icezip: m = exp.match(os.path.split(d)[1]) @@ -153,10 +153,11 @@ def checkSources(sourceDir): print keyVersion prefixes = list(DistPrefixes) - prefixes.remove("Ice-") + prefixes.remove("Ice-%s") for prefix in prefixes: - if not os.path.exists(os.path.join(sourceDir, "%s%s.zip" % (prefix, keyVersion))): - msg = "Source directory %s does not contain archive for %s." + pkg = prefix % keyVersion + ".zip" + if not os.path.exists(os.path.join(sourceDir, pkg)): + msg = "Source directory %s does not contain archive for %s." % (sourceDir, pkg) logging.error(msg) raise DistEnvironmentError(msg) @@ -645,8 +646,8 @@ def main(): # TODO: See if this can be replaced by ZipFile and native # Python code somehow. # - filename = os.path.join(os.environ['SOURCES'], "%s%s.zip" % (z, sourcesVersion)) - if not os.path.exists(os.path.join(os.environ['BUILD_DIR'], "%s%s" % (z, sourcesVersion))): + filename = os.path.join(os.environ['SOURCES'], z % sourcesVersion + ".zip") + if not os.path.exists(os.path.join(os.environ['BUILD_DIR'], z % sourcesVersion)): runprog("unzip -q %s -d %s" % (filename, os.environ['BUILD_DIR'])) os.environ['ICE_HOME'] = os.path.join(os.environ['BUILD_DIR'], "Ice-%s" % sourcesVersion) |