diff options
Diffstat (limited to 'fixVersion.py')
| -rwxr-xr-x | fixVersion.py | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/fixVersion.py b/fixVersion.py index 26a0df84d95..910826f70f0 100755 --- a/fixVersion.py +++ b/fixVersion.py @@ -40,8 +40,8 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "config", "Make.common.rules") FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "config", "Make.common.rules.mak"), [("^VERSION[\t\s]*= " + FixUtil.vpatMatch, version), - ("INTVERSION[\t\s]*= " + FixUtil.vpatMatch, FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + \ - "." + FixUtil.patchVersion(version)), + ("INTVERSION[\t\s]*= " + FixUtil.vpatMatch, FixUtil.majorVersion(version) + "." + \ + FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version)), ("SHORT_VERSION[\t\s]*= ([0-9]*\.[0-9]*)", FixUtil.shortVersion(version)), ("SOVERSION[\t\s]*= ([0-9]+b?)", FixUtil.soVersion(version))]) @@ -51,9 +51,14 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "rpm", [("%define soversion ([0-9]+b?)", FixUtil.soVersion(version))]) FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "rpm", "ice.spec"), [("%define dotnetversion ([0-9]*\.[0-9]*\.[0-9]*)", - FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version))]) + FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + \ + "." + FixUtil.patchVersion(version))]) +FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "common", "build.properties"), + [("ice\.version[\t\s]*= " + FixUtil.vpatMatch, version)]) +for f in FixUtil.find(os.path.join(ice_dir, "distribution", "bin"), "*.py"): + FixUtil.fileMatchAndReplace(f, [("iceVersion[\t\s]*= '" + FixUtil.vpatMatch, version)]) # # Fix version in C++ sources # @@ -69,6 +74,9 @@ if ice_home: FixUtil.fileMatchAndReplace(os.path.join(ice_home, "doc", "swish", "swish.conf"), [("doc/Ice-" + FixUtil.vpatMatch, version)]) + FixUtil.fileMatchAndReplace(os.path.join(ice_home, "doc", "swish", "swishcgi.conf"), + [("ice_version[\t\s]*= '" + FixUtil.vpatMatch, version)]) + FixUtil.fileMatchAndReplace(os.path.join(ice_home, "demo", "IceStorm", "clock", "config.icebox"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) @@ -88,16 +96,13 @@ if ice_home: FixUtil.fileMatchAndReplace(os.path.join(ice_home, "config", "templates.xml"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) - FixUtil.fileMatchAndReplace(os.path.join(ice_home, "test", "IceStorm", "repgrid", "application.xml"), - [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) - - for f in find(os.path.join(ice_home, "src"), "*.rc"): + for f in FixUtil.find(os.path.join(ice_home, "src"), "*.rc"): FixUtil.fileMatchAndReplace(f, [("\"FileVersion\", \"" + FixUtil.vpatMatch, version), \ ("\"ProductVersion\", \"" + FixUtil.vpatMatch, version), \ ("INTERNALNAME \"[^0-9]*2?([0-9][0-9]b?)d?", FixUtil.soVersion(version)), \ ("ORIGINALFILENAME \"[^0-9]*2?([0-9][0-9]b?)d?\.dll", FixUtil.soVersion(version)), \ - ("FILEVERSION ([0-9]+,[0-9]+,[0-9]+)", commaVersion(version)), \ - ("PRODUCTVERSION ([0-9]+,[0-9]+,[0-9]+)", commaVersion(version))]) + ("FILEVERSION ([0-9]+,[0-9]+,[0-9]+)", FixUtil.commaVersion(version)), \ + ("PRODUCTVERSION ([0-9]+,[0-9]+,[0-9]+)", FixUtil.commaVersion(version))]) # # Fix version in Java sources @@ -107,6 +112,9 @@ if icej_home: FixUtil.fileMatchAndReplace(os.path.join(icej_home, "config", "build.properties"), [("ice\.version[\t\s]*= " + FixUtil.vpatMatch, version)]) + FixUtil.fileMatchAndReplace(os.path.join(icej_home, "config", "build.properties"), + [("C:/Ice-" + FixUtil.vpatMatch, version)]) + FixUtil.fileMatchAndReplace(os.path.join(icej_home, "src", "IceUtil", "Version.java"), [("ICE_STRING_VERSION = \"" + FixUtil.vpatMatch +"\"", version), \ ("ICE_INT_VERSION = ([0-9]*)", FixUtil.intVersion(version))]) @@ -123,7 +131,7 @@ if icej_home: # icecs_home = os.path.join(ice_dir, "cs") if icecs_home: - for f in find(icecs_home, "AssemblyInfo.cs"): + for f in FixUtil.find(icecs_home, "AssemblyInfo.cs"): if f.find("generate") < 0 and f.find("ConsoleApplication") < 0: FixUtil.fileMatchAndReplace(f, [("AssemblyVersion\(\"" + FixUtil.vpatMatch + "\"", FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + \ @@ -132,23 +140,24 @@ if icecs_home: FixUtil.fileMatchAndReplace(os.path.join(icecs_home, "demo", "IceStorm", "clock", "config.icebox"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) - for f in find(icecs_home, "*.pc"): + for f in FixUtil.find(icecs_home, "*.pc"): print "matching " + f - FixUtil.fileMatchAndReplace(f, [("[\t\s]*version[\t\s]*=[\t\s]* " + FixUtil.vpatMatch, FixUtil.majorVersion(version) + "." + \ - FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version))]) + FixUtil.fileMatchAndReplace(f, [("[\t\s]*version[\t\s]*=[\t\s]* " + FixUtil.vpatMatch, + FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + \ + FixUtil.patchVersion(version))]) - for f in find(icecs_home, "config*"): + for f in FixUtil.find(icecs_home, "config*"): print "matching " + f FixUtil.fileMatchAndReplace(f, [("Version=*([0-9]*\.[0-9]*\.[0-9]*).0", - FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version))], + FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + + FixUtil.patchVersion(version))], False) # Disable warnings as many files might not have SSL configuration FixUtil.fileMatchAndReplace(os.path.join(icecs_home, "src", "Ice", "Util.cs"), [("return \"" + FixUtil.vpatMatch +"\".*A=major", version), \ ("return ([0-9]*).*AA=major", FixUtil.intVersion(version))]) - # # Fix version in VB sources # @@ -157,11 +166,12 @@ if icevb_home: FixUtil.fileMatchAndReplace(os.path.join(icevb_home, "demo", "IceStorm", "clock", "config.icebox"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) - for f in find(icevb_home, "config*"): + for f in FixUtil.find(icevb_home, "config*"): print "matching " + f FixUtil.fileMatchAndReplace(f, [("Version=*([0-9]*\.[0-9]*\.[0-9]*).0", - FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version))], + FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + \ + FixUtil.patchVersion(version))], False) # Disable warnings as many files might not have SSL configuration # @@ -178,11 +188,6 @@ if icepy_home: FixUtil.fileMatchAndReplace(os.path.join(icepy_home, "demo", "IceStorm", "clock", "config.icebox"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) - FixUtil.fileMatchAndReplace(os.path.join(icepy_home, "demo", "Ice", "bidir", "Server.py"), - [("Ice-" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(os.path.join(icepy_home, "demo", "Ice", "bidir", "Client.py"), - [("Ice-" + FixUtil.vpatMatch, version)]) - # # Fix version in IceRuby # |