Fixed makedist to substitute @ver@ with the version in README & INSTALL

    files.

1 files changed, 162 insertions, 0 deletions

diff --git a/cpp/fixVersion.py b/cpp/fixVersion.py
new file mode 100755
index 00000000000..06e2c46d7f0
--- /dev/null
+++ b/cpp/fixVersion.py
@@ -0,0 +1,162 @@
+#!/usr/bin/env python
+
+import os, sys, shutil, fnmatch, re, glob
+
+#
+# Program usage.
+#
+def usage():
+    print "Usage: " + sys.argv[0] + " VERSION"
+    print
+    print "Options:"
+    print "-h    Show this message."
+    print
+
+
+def intVersion(version):
+    r = re.search("([0-9]*)\.([0-9]*)\.([0-9]*)", version)
+    major = int(r.group(1))
+    minor = int(r.group(2))
+    patch = int(r.group(3))
+    return ("%2d%02d%02d" % (major, minor, patch)).strip()
+
+def soVersion(version):
+    r = re.search("([0-9]*)\.([0-9]*)\.([0-9]*)", version)
+    major = int(r.group(1))
+    minor = int(r.group(2))
+    return ("%d%d" % (major, minor)).strip()
+
+
+#
+# Find files matching a pattern.
+#
+def find(path, patt):
+    result = [ ]
+    files = os.listdir(path)
+    for x in files:
+        fullpath = os.path.join(path, x);
+        if os.path.isdir(fullpath) and not os.path.islink(fullpath):
+            result.extend(find(fullpath, patt))
+        elif fnmatch.fnmatch(x, patt):
+            result.append(fullpath)
+    return result
+
+def findSourceTree(tree, file):
+    for path in [".", "..", "../..", "../../..", "../../../.."]:
+        path = os.path.normpath(path)
+        if os.path.exists(os.path.join(path, file)):
+            break
+        path = os.path.join(path, tree)
+        if os.path.exists(os.path.join(path, file)):
+            break
+        path = None
+    if not path:
+        print "warning: can't find " + tree + " directory!"
+    return path
+
+#
+# Replace a string matched by the first group of regular expression.
+#
+# For example: the regular expression "ICE_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\""
+# will match the string version in "ICE_STRING_VERSION "2.1.0"" and will replace it with
+# the given version.
+#
+def fileMatchAndReplace(filename, matchAndReplaceExps):
+
+    oldConfigFile = open(filename, "r")
+    newConfigFile = open(filename + ".new", "w")
+
+    #
+    # Compile the regular expressions
+    #
+    regexps = [ ]
+    for (regexp, replace) in matchAndReplaceExps:
+        regexps.append((re.compile(regexp), replace))
+
+    #
+    # Search for the line with the given regular expressions and
+    # replace the matching string
+    #
+    updated = False
+    for line in oldConfigFile.readlines():
+        for (regexp, replace) in regexps:
+            match = regexp.search(line)
+            if match != None:
+                oldLine = line
+                line = oldLine.replace(match.group(1), replace)
+#                print oldLine + line
+                updated = True
+                break
+        newConfigFile.write(line)
+
+    newConfigFile.close()
+    oldConfigFile.close()
+
+    if updated:
+        print "updated " + filename
+        os.rename(filename + ".new", filename)
+    else:
+        print "warning: " + filename + " didn't contain any version"
+        os.unlink(filename + ".new")
+
+if len(sys.argv) != 2:
+    usage()
+    sys.exit(0)
+
+version = sys.argv[1]
+if not re.match("[0-9]*\.[0-9]*\.[0-9]*$", version):
+    print "invalid version number: " + version + " (it should have the form A.B.C)"
+    sys.exit(0)
+
+#
+# Fix version in Ice sources
+#
+ice_home = findSourceTree("ice", os.path.join("include", "IceUtil", "Config.h"))
+if ice_home:
+    fileMatchAndReplace(os.path.join(ice_home, "include", "IceUtil", "Config.h"),
+                        [("ICE_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
+                         ("ICE_INT_VERSION ([0-9]*)", intVersion(version))])
+
+    fileMatchAndReplace(os.path.join(ice_home, "config", "Make.rules"),
+                        [("VERSION[\t\s]*= ([0-9]*\.[0-9]*\.[0-9]*)", version),
+                         ("SOVERSION[\t\s]*= ([0-9]*)", soVersion(version))])
+
+#
+# Fix version in IceJ sources
+#
+icej_home = findSourceTree("icej", os.path.join("src", "IceUtil", "Version.java"))
+if icej_home:
+    fileMatchAndReplace(os.path.join(icej_home, "src", "IceUtil", "Version.java"),
+                        [("ICE_STRING_VERSION = \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
+                         ("ICE_INT_VERSION = ([0-9]*)", intVersion(version))])
+
+#
+# Fix version in IceCS sources
+#
+icecs_home = findSourceTree("icecs", os.path.join("src", "Ice", "AssemblyInfo.cs"))
+if icecs_home:
+    for f in find(icecs_home, "AssemblyInfo.cs"):
+        if f.find("generate") < 0:
+            fileMatchAndReplace(f, [("AssemblyVersion\(\"([0-9]*\.[0-9]*\.[0-9]*)\"\)", version)])
+
+    fileMatchAndReplace(os.path.join(icecs_home, "config", "Make.rules.cs"),
+                        [("VERSION[\t\s]*= ([0-9]*\.[0-9]*\.[0-9]*)", version)])
+
+#
+# Fix version in IcePHP
+#
+icephp_home = findSourceTree("icephp", os.path.join("src", "ice", "php_ice.h"))
+if icephp_home:
+    fileMatchAndReplace(os.path.join(icephp_home, "src", "ice", "php_ice.h"),
+                        [("ICEPHP_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
+                         ("ICEPHP_INT_VERSION ([0-9]*)", intVersion(version))])
+    
+#
+# Fix version in IcePHP
+#
+icephp_home = findSourceTree("icepy", os.path.join("modules", "IcePy", "Config.h"))
+if icephp_home:
+    fileMatchAndReplace(os.path.join(icephp_home, "config", "Make.rules"),
+                        [("^VERSION[ \t]+=[^\d]*([\d\.]+)", version),
+                         ("^SOVERSION[\t\s]*= ([0-9]*)", soVersion(version))])
+