http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2394

4 files changed, 14 insertions, 10 deletions

diff --git a/cpp/fixVersion.py b/cpp/fixVersion.py
index 3e7da8b3fd5..18f7d8515e9 100755
--- a/cpp/fixVersion.py
+++ b/cpp/fixVersion.py
@@ -212,7 +212,7 @@ if not patchIceE:
     #
     # Fix version in Ice sources
     #
-    ice_home = findSourceTree("ice", os.path.join("include", "IceUtil", "Config.h"))
+    ice_home = findSourceTree("cpp", os.path.join("include", "IceUtil", "Config.h"))
     if ice_home:
         fileMatchAndReplace(os.path.join(ice_home, "include", "IceUtil", "Config.h"),
                             [("ICE_STRING_VERSION \"" + vpatMatch + "\"", version), \
@@ -258,7 +258,7 @@ if not patchIceE:
     #
     # Fix version in IceJ sources
     #
-    icej_home = findSourceTree("icej", os.path.join("src", "IceUtil", "Version.java"))
+    icej_home = findSourceTree("java", os.path.join("src", "IceUtil", "Version.java"))
     if icej_home:
         fileMatchAndReplace(os.path.join(icej_home, "config", "build.properties"),
                             [("ice\.version[\t\s]*= " + vpatMatch, \
@@ -275,7 +275,7 @@ if not patchIceE:
     #
     # Fix version in IceCS sources
     #
-    icecs_home = findSourceTree("icecs", os.path.join("src", "Ice", "AssemblyInfo.cs"))
+    icecs_home = findSourceTree("cs", os.path.join("src", "Ice", "AssemblyInfo.cs"))
     if icecs_home:
         for f in find(icecs_home, "AssemblyInfo.cs"):
             if f.find("generate") < 0 and f.find("ConsoleApplication") < 0:
@@ -314,7 +314,7 @@ if not patchIceE:
     #
     # Fix version in IceVB sources
     #
-    icevb_home = findSourceTree("icevb", os.path.join("generate", "Generate.vb"))
+    icevb_home = findSourceTree("vb", os.path.join("generate", "Generate.vb"))
     if icevb_home:
         fileMatchAndReplace(os.path.join(icevb_home, "config", "Make.rules.mak.vb"),
                             [("VERSION[\t\s]*= " + vpatMatch, version)])
@@ -336,7 +336,7 @@ if not patchIceE:
     #
     # Fix version in IcePHP
     #
-    icephp_home = findSourceTree("icephp", os.path.join("src", "IcePHP", "Profile.h"))
+    icephp_home = findSourceTree("php", os.path.join("src", "IcePHP", "Profile.h"))
     if icephp_home:
         fileMatchAndReplace(os.path.join(icephp_home, "config", "Make.rules"),
                             [("VERSION_MAJOR[\t\s]*= ([0-9]*)", majorVersion(version)),
@@ -353,7 +353,7 @@ if not patchIceE:
     #
     # Fix version in IcePy
     #
-    icepy_home = findSourceTree("icepy", os.path.join("modules", "IcePy", "Config.h"))
+    icepy_home = findSourceTree("py", os.path.join("modules", "IcePy", "Config.h"))
     if icepy_home:
         fileMatchAndReplace(os.path.join(icepy_home, "config", "Make.rules"),
                             [("VERSION_MAJOR[\t\s]*= ([0-9]*)", majorVersion(version)),
@@ -377,7 +377,7 @@ if not patchIceE:
     #
     # Fix version in IceRuby
     #
-    icerb_home = findSourceTree("icerb", os.path.join("src", "IceRuby", "Config.h"))
+    icerb_home = findSourceTree("rb", os.path.join("src", "IceRuby", "Config.h"))
     if icerb_home:
         fileMatchAndReplace(os.path.join(icerb_home, "config", "Make.rules"),
                             [("VERSION[\t\s]*= " + vpatMatch, version),
@@ -400,7 +400,7 @@ if not patchIceE:
 #
 # Fix version in Ice-E sources
 #
-icee_home = findSourceTree("icee", os.path.join("include", "IceE", "Config.h"))
+icee_home = findSourceTree("cppe", os.path.join("include", "IceE", "Config.h"))
 if icee_home:
     fileMatchAndReplace(os.path.join(icee_home, "include", "IceE", "Config.h"),
                         [("ICEE_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
@@ -420,7 +420,7 @@ if icee_home:
 #
 # Fix version in IceJ sources
 #
-iceje_home = findSourceTree("iceje", os.path.join("src", "IceUtil", "Version.java"))
+iceje_home = findSourceTree("javae", os.path.join("src", "IceUtil", "Version.java"))
 if iceje_home:
     fileMatchAndReplace(os.path.join(iceje_home, "src", "IceUtil", "Version.java"),
                         [("ICEE_STRING_VERSION = \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
diff --git a/demoscript/Util.py b/demoscript/Util.py
index 85e14b4cd98..6ad51faa61c 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -110,7 +110,7 @@ class spawn(pexpect.spawn):
             return self.exitstatus
 
 def cleanDbDir(path):
-    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore"]:
+    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore" and f != "DB_CONFIG"]:
         if os.path.isdir(filename):
             cleanDbDir(filename)
             try:
diff --git a/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py
index 503ead24a27..464d77510ef 100644
--- a/py/demo/Ice/bidir/Client.py
+++ b/py/demo/Ice/bidir/Client.py
@@ -16,6 +16,8 @@ if len(slice_dir) == 0 or not os.path.exists(os.path.join(slice_dir, 'slice')):
 if len(slice_dir) == 0 or not os.path.exists(os.path.join(slice_dir, 'slice')):
     slice_dir = os.path.join('/', 'usr', 'share', 'Ice-3.2.0')
 if not os.path.exists(os.path.join(slice_dir, 'slice')):
+    slice_dir = os.path.join('/', 'opt', 'Ice-3.2.0')
+if not os.path.exists(os.path.join(slice_dir, 'slice')):
     print sys.argv[0] + ': Slice directory not found. Define ICEPY_HOME or ICE_HOME.'
     sys.exit(1)
 
diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py
index 1f7351436c7..82a2c159948 100644
--- a/py/demo/Ice/bidir/Server.py
+++ b/py/demo/Ice/bidir/Server.py
@@ -16,6 +16,8 @@ if len(slice_dir) == 0 or not os.path.exists(os.path.join(slice_dir, 'slice')):
 if len(slice_dir) == 0 or not os.path.exists(os.path.join(slice_dir, 'slice')):
     slice_dir = os.path.join('/', 'usr', 'share', 'Ice-3.2.0')
 if not os.path.exists(os.path.join(slice_dir, 'slice')):
+    slice_dir = os.path.join('/', 'opt', 'Ice-3.2.0')
+if not os.path.exists(os.path.join(slice_dir, 'slice')):
     print sys.argv[0] + ': Slice directory not found. Define ICEPY_HOME or ICE_HOME.'
     sys.exit(1)