More fixes for binary distributions

4 files changed, 98 insertions, 132 deletions

diff --git a/cpp/demo/IceGrid/customLoadBalancing/config.grid b/cpp/demo/IceGrid/customLoadBalancing/config.grid
index 118608cc9da..7b6547cd52d 100644
--- a/cpp/demo/IceGrid/customLoadBalancing/config.grid
+++ b/cpp/demo/IceGrid/customLoadBalancing/config.grid
@@ -24,7 +24,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # Enable the IceGrid registry plugin from the demo to perform custom
 # load balancing for the replica group.
 #
-Ice.Plugin.RegistryPlugin=RegistryPlugin:createRegistryPlugin
+Ice.Plugin.RegistryPlugin=./RegistryPlugin:createRegistryPlugin
 
 #
 # IceGrid node configuration.
diff --git a/demoscript/Util.py b/demoscript/Util.py
index 21e8edba739..2896e64544c 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -27,7 +27,7 @@ if len(head) > 0:
     path = [os.path.join(head, p) for p in path]
 path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "demoscript")) ]
 toplevel = path[0]
-if os.path.isdir(os.path.join(toplevel, "cpp")):
+if os.path.isdir(os.path.join(toplevel, "cpp", "demo")):
     sourcedist = True
 else:
     sourcedist = False
@@ -311,6 +311,7 @@ def configurePaths():
     addenv("CLASSPATH", os.path.join(javaDir, "lib", "IceStorm.jar"))
     addenv("CLASSPATH", os.path.join(javaDir, "lib", "IceGrid.jar"))
     addenv("CLASSPATH", os.path.join(javaDir, "lib", "IcePatch2.jar"))
+    addenv("CLASSPATH", os.path.join(javaDir, "lib", "IceDiscovery.jar"))
     if not iceHome:
         addenv("CLASSPATH", os.path.join(javaDir, "lib"))
     addenv("CLASSPATH", os.path.join("build", "classes"))
@@ -342,25 +343,13 @@ def configurePaths():
         addenv("NODE_PATH", os.path.join(getIceDir("js"), "node_modules" if iceHome else "src"))
         addenv("NODE_PATH", ".")
 
-# Mapping to the associated subdirectory.
-mappingDirs = {
-    "cpp" : ( os.path.join("cpp", "demo"), "demo"),
-    "java" : ( os.path.join("java", "demo"), "demoj"),
-    "js" : ( os.path.join("js", "demo"), "demojs"),
-    "cs" : ( os.path.join("cs", "demo"), "democs"),
-    "vb" : ( os.path.join("vb", "demo"), "demovb"),
-    "py" : ( os.path.join("py", "demo"), "demopy"),
-    "rb" : ( os.path.join("rb", "demo"), "demorb"),
-    "php" : ( os.path.join("php", "demo"), "demophp"),
-}
-
-def getMappingDir(suffix, mapping):
+def getMappingDir(mapping):
     """Get the directory containing the demos for the given mapping."""
     # In the source tree
     if sourcedist:
-        return mappingDirs[mapping][0]
+        return os.path.join(mapping, "demo")
     else:
-        return mappingDirs[mapping][1]
+        return mapping
 
 def getMirrorDir(mapping = None):
     """Get the mirror directory for the current demo in the given mapping."""
@@ -374,11 +363,9 @@ def getMirrorDir(mapping = None):
     # In the source tree
     if sourcedist:
         scriptPath = os.sep.join(post.split(os.sep)[2:])
-        mappingDir = mappingDirs[mapping][0]
     else:
         scriptPath = os.sep.join(post.split(os.sep)[1:])
-        mappingDir = mappingDirs[mapping][1]
-    return os.path.join(pref, mappingDir, scriptPath)
+    return os.path.join(pref, getMappingDir(mapping), scriptPath)
 
 def getIceDir(subdir = None):
     """Get the top level directory of the ice distribution. If ICE_HOME
@@ -437,14 +424,7 @@ def getMapping():
     """Determine the current mapping based on the cwd."""
     here = os.path.abspath(os.getcwd())
     assert os.path.normcase(here[:len(toplevel)]) == os.path.normcase(toplevel)
-    dir = here[len(toplevel)+1:].split(os.sep)[0]
-
-    if sourcedist:
-        mapping = { "cpp": "cpp", "cs": "cs", "java": "java", "js": "js", "php": "php", "py": "py", "rb": "rb", "vb": "vb" }
-    else:
-        mapping = { "demo": "cpp", "democs": "cs", "demoj": "java", "demojs": "js", "demophp": "php", "demopy": "py",
-                    "demorb": "rb", "demovb": "vb" }
-    return mapping[dir]
+    return here[len(toplevel)+1:].split(os.sep)[0]
 
 def runDemos(start, args, demos, num = 0, script = False, root = False):
     global demoErrors
@@ -465,7 +445,7 @@ def runDemos(start, args, demos, num = 0, script = False, root = False):
         if root:
             dir = os.path.join(toplevel, i)
         else:
-            dir = os.path.join(toplevel, getMappingDir(toplevel, getMapping()), i)
+            dir = os.path.join(toplevel, getMappingDir(getMapping()), i)
 
         if script:
             prefix = "echo \""
diff --git a/distribution/bin/makemsi.py b/distribution/bin/makemsi.py
index 1461db558aa..afbe4fb02e6 100755
--- a/distribution/bin/makemsi.py
+++ b/distribution/bin/makemsi.py
@@ -96,7 +96,7 @@ debugFilterFiles = ["dumpdb.exe",
 def filterDebugFiles(f):
     if f in debugFilterFiles:
         return True
-    if os.path.splitext(f)[1] in [".exe", ".dll", ".pdb"]:
+    if os.path.splitext(f)[1] in [".exe", ".dll", ".pdb", ".lib"]:
         return False
     return True
 
@@ -416,7 +416,6 @@ if not os.path.exists(signTool):
     print("signtool `%s' not found")
     sys.exit(1)
 
-
 if not certFile:
     if os.path.exists("c:\\release\\authenticode\\zeroc2014.pfx"):
         certFile = "c:\\release\\authenticode\\zeroc2014.pfx"
@@ -438,111 +437,111 @@ if certPassword is None:
     print("You need to set the sign certificate password using --cert-password option")
     sys.exit(1)
 
-    
-if not keyFile:
-    if os.path.exists("c:\\release\\strongname\\IceReleaseKey.snk"):
-        keyFile = "c:\\release\\strongname\\IceReleaseKey.snk"
-    elif os.path.exists(os.path.join(os.getcwd(), "..", "..", "release", "strongname", "IceReleaseKey.snk")):
-        keyFile = os.path.join(os.getcwd(), "..", "..", "release", "strongname", "IceReleaseKey.snk")
-else:
-    if not os.path.isabs(keyFile):
-        keyFile = os.path.abspath(os.path.join(os.getcwd(), keyFile))
-        
-if keyFile is None:
-    print("You need to specify the key file to sign assemblies using --key-file option")
-    sys.exit(1)
+if not winrt:
+    if not keyFile:
+        if os.path.exists("c:\\release\\strongname\\IceReleaseKey.snk"):
+            keyFile = "c:\\release\\strongname\\IceReleaseKey.snk"
+        elif os.path.exists(os.path.join(os.getcwd(), "..", "..", "release", "strongname", "IceReleaseKey.snk")):
+            keyFile = os.path.join(os.getcwd(), "..", "..", "release", "strongname", "IceReleaseKey.snk")
+    else:
+        if not os.path.isabs(keyFile):
+            keyFile = os.path.abspath(os.path.join(os.getcwd(), keyFile))
+            
+    if keyFile is None:
+        print("You need to specify the key file to sign assemblies using --key-file option")
+        sys.exit(1)
 
-if not os.path.exists(keyFile):
-    print("Key file `%s' not found")
-    sys.exit(1)
+    if not os.path.exists(keyFile):
+        print("Key file `%s' not found")
+        sys.exit(1)
 
-if proguardHome:
-    if not os.path.isabs(proguardHome):
-        proguardHome = os.path.abspath(os.path.join(os.getcwd(), proguardHome))
+    if proguardHome:
+        if not os.path.isabs(proguardHome):
+            proguardHome = os.path.abspath(os.path.join(os.getcwd(), proguardHome))
 
-    if not os.path.exists(proguardHome):
-        #
-        # Invalid proguard-home setting
-        #
-        print("--proguard-home points to nonexistent directory")
-        sys.exit(1)
+        if not os.path.exists(proguardHome):
+            #
+            # Invalid proguard-home setting
+            #
+            print("--proguard-home points to nonexistent directory")
+            sys.exit(1)
 
-if phpHome:
-    if not os.path.isabs(phpHome):
-        phpHome = os.path.abspath(os.path.join(os.getcwd(), phpHome))
+    if phpHome:
+        if not os.path.isabs(phpHome):
+            phpHome = os.path.abspath(os.path.join(os.getcwd(), phpHome))
 
-    if not os.path.exists(phpHome):
-        #
-        # Invalid proguard-home setting
-        #
-        print("--php-home points to nonexistent directory")
-        sys.exit(1)
+        if not os.path.exists(phpHome):
+            #
+            # Invalid proguard-home setting
+            #
+            print("--php-home points to nonexistent directory")
+            sys.exit(1)
 
-if phpBinHome:
-    if not os.path.isabs(phpBinHome):
-        phpBinHome = os.path.abspath(os.path.join(os.getcwd(), phpBinHome))
+    if phpBinHome:
+        if not os.path.isabs(phpBinHome):
+            phpBinHome = os.path.abspath(os.path.join(os.getcwd(), phpBinHome))
 
-    if not os.path.exists(phpBinHome):
-        #
-        # Invalid proguard-home setting
-        #
-        print("--php-bin-home points to nonexistent directory")
-        sys.exit(1)
+        if not os.path.exists(phpBinHome):
+            #
+            # Invalid proguard-home setting
+            #
+            print("--php-bin-home points to nonexistent directory")
+            sys.exit(1)
 
-if rubyDevKitAmd64Home is None:
-    defaultRubyAmd64Home = "C:\\DevKit-mingw64-64-4.7.2"
-    if not os.path.exists(defaultRubyAmd64Home):
-        print("Ruby DevKit x64 not found in %s" % defaultRubyAmd64Home)
+    if rubyDevKitAmd64Home is None:
+        defaultRubyAmd64Home = "C:\\DevKit-mingw64-64-4.7.2"
+        if not os.path.exists(defaultRubyAmd64Home):
+            print("Ruby DevKit x64 not found in %s" % defaultRubyAmd64Home)
+            sys.exit(1)
+        rubyDevKitAmd64Home = defaultRubyAmd64Home
+    elif not os.path.exists(rubyDevKitAmd64Home):
+        print("Ruby DevKit x64 not found in %s" % rubyDevKitAmd64Home)
         sys.exit(1)
-    rubyDevKitAmd64Home = defaultRubyAmd64Home
-elif not os.path.exists(rubyDevKitAmd64Home):
-    print("Ruby DevKit x64 not found in %s" % rubyDevKitAmd64Home)
-    sys.exit(1)
 
-if rubyDevKitX86Home is None:
-    defaultRubyX86Home = "C:\\DevKit-mingw64-32-4.7.3"
-    if not os.path.exists(defaultRubyX86Home):
-        print("Ruby DevKit x64 not found in %s" % defaultRubyX86Home)
+    if rubyDevKitX86Home is None:
+        defaultRubyX86Home = "C:\\DevKit-mingw64-32-4.7.3"
+        if not os.path.exists(defaultRubyX86Home):
+            print("Ruby DevKit x64 not found in %s" % defaultRubyX86Home)
+            sys.exit(1)
+        rubyDevKitX86Home = defaultRubyX86Home
+    elif not os.path.exists(rubyDevKitX86Home):
+        print("Ruby DevKit x86 not found in %s" % rubyDevKitX86Home)
         sys.exit(1)
-    rubyDevKitX86Home = defaultRubyX86Home
-elif not os.path.exists(rubyDevKitX86Home):
-    print("Ruby DevKit x86 not found in %s" % rubyDevKitX86Home)
-    sys.exit(1)
 
-if nodejsHome:
-    if not os.path.isabs(nodejsHome):
-        nodejsHome = os.path.abspath(os.path.join(os.getcwd(), nodejsHome))
+    if nodejsHome:
+        if not os.path.isabs(nodejsHome):
+            nodejsHome = os.path.abspath(os.path.join(os.getcwd(), nodejsHome))
 
-    nodejsExe = os.path.join(nodejsHome, "node.exe")
-    if not os.path.exists(nodejsExe):
-        #
-        # Invalid proguard-home setting
-        #
-        print("node.exe not found in " + nodejsHome)
-        sys.exit(1)
+        nodejsExe = os.path.join(nodejsHome, "node.exe")
+        if not os.path.exists(nodejsExe):
+            #
+            # Invalid proguard-home setting
+            #
+            print("node.exe not found in " + nodejsHome)
+            sys.exit(1)
 
-if gzipHome:
-    if not os.path.isabs(gzipHome):
-        gzipHome = os.path.abspath(os.path.join(os.getcwd(), gzipHome))
+    if gzipHome:
+        if not os.path.isabs(gzipHome):
+            gzipHome = os.path.abspath(os.path.join(os.getcwd(), gzipHome))
 
-    gzipExe = os.path.join(gzipHome, "bin", "gzip.exe")
-    if not os.path.exists(gzipExe):
-        #
-        # Invalid proguard-home setting
-        #
-        print("node.exe not found in " + os.path.join(gzipHome, "bin"))
-        sys.exit(1)
+        gzipExe = os.path.join(gzipHome, "bin", "gzip.exe")
+        if not os.path.exists(gzipExe):
+            #
+            # Invalid proguard-home setting
+            #
+            print("node.exe not found in " + os.path.join(gzipHome, "bin"))
+            sys.exit(1)
 
-if closureHome:
-    if not os.path.isabs(closureHome):
-        closureHome = os.path.abspath(os.path.join(os.getcwd(), closureHome))
+    if closureHome:
+        if not os.path.isabs(closureHome):
+            closureHome = os.path.abspath(os.path.join(os.getcwd(), closureHome))
 
-    if not os.path.exists(closureHome):
-        #
-        # Invalid proguard-home setting
-        #
-        print("--closure-home points to nonexistent directory")
-        sys.exit(1)
+        if not os.path.exists(closureHome):
+            #
+            # Invalid proguard-home setting
+            #
+            print("--closure-home points to nonexistent directory")
+            sys.exit(1)
 
 if not os.path.exists(sourceArchive):
     print("Couldn't find %s in %s" % (os.path.basename(sourceArchive), os.path.dirname(sourceArchive)))
diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py
index 6b6aa3ff221..52ce1195a0d 100644
--- a/distribution/lib/DistUtils.py
+++ b/distribution/lib/DistUtils.py
@@ -185,19 +185,6 @@ def copyMatchingFiles(srcpath, destpath, patterns, warnDestExists = True, verbos
             copy(f, os.path.join(destpath, os.path.basename(f)), warnDestExists)
 
 #
-# Get the language mapping directory for a given suffix.
-#
-def getMappingDir(suffix, mapping):
-    if mapping == "cpp":
-        return suffix
-    elif mapping == "java":
-        return suffix + "j"
-    elif mapping == "android":
-        return suffix + "a"
-    else:
-        return suffix + mapping
-
-#
 # Comment out rules in a Makefile.
 #
 def fixMakefileForFile(path):