diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-03-18 23:53:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-03-18 23:53:29 +0100 |
| commit | ae4f24819aa373ddc342b201de41bd5b8a42435e (patch) | |
| tree | 7e044e5cda298057441062f569b671813c8b7104 | |
| parent | bug 2820: IceBox fixes (diff) | |
| download | ice-ae4f24819aa373ddc342b201de41bd5b8a42435e.tar.bz2 ice-ae4f24819aa373ddc342b201de41bd5b8a42435e.tar.xz ice-ae4f24819aa373ddc342b201de41bd5b8a42435e.zip | |
- Fixed [http://bugzilla/bugzilla/show_bug.cgi?id=2832 bug 2832]
- Fixed [http://bugzilla/bugzilla/show_bug.cgi?id=2833 bug 2833]
- Cleaned up C# IceSSL configuration test.
- Fixed build system bug introduced bug fix for bug [http://bugzilla/bugzilla/show_bug.cgi?id=2831 bug 2831]
- Got rid of some unecessary methods from TestUtil.py (getCertsDir, getBinDir)
- Fixed bug where -I/include was added to the CPPFLAGS on Linux
- Removed generation of {{{Ice-<version>-demos-for-msi.zip}}}
81 files changed, 310 insertions, 390 deletions
diff --git a/config/DemoUtil.py b/config/DemoUtil.py index 6815b4ace2c..680eaa68bf0 100755 --- a/config/DemoUtil.py +++ b/config/DemoUtil.py @@ -17,28 +17,22 @@ toplevel = None testErrors = [] def configurePaths(): - bindist = isBinDist() if ice_home: print "[ using Ice installation from " + ice_home, - if isX64(): - print "(64bit)", - print "]" - elif os.environ.has_key("ICE_HOME") and len(os.environ["ICE_HOME"]) != 0: - print "[ using Ice installation from " + os.environ["ICE_HOME"], - if isX64(): + if x64: print "(64bit)", print "]" binDir = os.path.join(getIceDir("cpp"), "bin") if isCygwin(): - if bindist and isX64(): + if ice_home and x64: binDir = os.path.join(binDir, "x64") else: libDir = os.path.join(getIceDir("cpp"), "lib") if isHpUx(): - if isX64(): - if bindist: + if x64: + if ice_home: libDir = os.path.join(libDir, "pa20_64") binDir = os.path.join(binDir, "pa20_64") os.environ["LD_LIBRARY_PATH"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH", "") @@ -49,8 +43,8 @@ def configurePaths(): elif isAIX(): os.environ["LIBPATH"] = libDir + os.pathsep + os.getenv("LIBPATH", "") elif isSolaris(): - if isX64(): - if bindist: + if x64: + if ice_home: if isSparc(): libDir = os.path.join(libDir, "sparcv9") binDir = os.path.join(binDir, "sparcv9") @@ -61,8 +55,8 @@ def configurePaths(): else: os.environ["LD_LIBRARY_PATH"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH", "") else: - if isX64(): - if bindist: + if x64: + if ice_home: libDir = libDir + "64" binDir = binDir + "64" os.environ["LD_LIBRARY_PATH_64"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH_64", "") @@ -83,7 +77,14 @@ def configurePaths(): if not isCygwin(): os.environ["MONO_PATH"] = os.path.join(getIceDir("cs"), "bin") + os.pathsep + os.getenv("MONO_PATH", "") - os.environ["PYTHONPATH"] = os.path.join(getIceDir("py"), "python") + os.pathsep + os.getenv("PYTHONPATH", "") + # + # On Windows x64, set PYTHONPATH to python/x64. + # + if isCygwin() and x64: + os.environ["PYTHONPATH"] = os.path.join(getIceDir("py"), "python", "x64") + os.pathsep + \ + os.getenv("PYTHONPATH", "") + else: + os.environ["PYTHONPATH"] = os.path.join(getIceDir("py"), "python") + os.pathsep + os.getenv("PYTHONPATH", "") os.environ["RUBYLIB"] = os.path.join(getIceDir("rb"), "ruby") + os.pathsep + os.getenv("RUBYLIB", "") def findTopLevel(): @@ -102,19 +103,6 @@ def findTopLevel(): return toplevel -def isBinDist(): - return (ice_home or (os.environ.has_key("ICE_HOME") and len(os.environ["ICE_HOME"]) != 0)) - -def isX64(): - if x64: - return True - elif isCygwin(): - if (os.environ.has_key("XTARGET") and os.environ["XTARGET"] == "x64"): - return True - elif os.environ.has_key("LP64") and os.environ["LP64"] == "yes": - return True - return False - def getIceDir(subdir = None): # # If ICE_HOME is set we're running the test against a binary distribution. Otherwise, @@ -123,8 +111,6 @@ def getIceDir(subdir = None): global ice_home if ice_home: return ice_home - if os.environ.has_key("ICE_HOME") and len(os.environ["ICE_HOME"]) != 0: - return os.environ["ICE_HOME"] elif subdir: return os.path.join(findTopLevel(), subdir) else: @@ -276,6 +262,12 @@ def run(demos): start += 1 demos = demos[start:] + if not ice_home and os.environ.get("ICE_HOME", "") != "": + ice_home = os.environ["ICE_HOME"] + + if not x64: + x64 = isCygwin() and os.environ.get("XTARGET") == "x64" or os.environ.get("LP64") == "yes" + configurePaths() if demoFilter != None: diff --git a/config/IceStormUtil.py b/config/IceStormUtil.py index ba3a37bfdc7..f6e05bf72cc 100644 --- a/config/IceStormUtil.py +++ b/config/IceStormUtil.py @@ -54,8 +54,8 @@ class IceStormUtil(object): self.toplevel = toplevel self.testdir = testdir self.iceBox = TestUtil.getIceBox(testdir) - self.iceBoxAdmin = os.path.join(TestUtil.getBinDir(testdir), "iceboxadmin") - self.iceStormAdmin = os.path.join(TestUtil.getBinDir(testdir), "icestormadmin") + self.iceBoxAdmin = os.path.join(TestUtil.getCppBinDir(), "iceboxadmin") + self.iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") def runIceBoxAdmin(self, endpts, command): clientCfg = TestUtil.DriverConfig("client") diff --git a/config/TestUtil.py b/config/TestUtil.py index c392e4c4526..f552399b4bc 100755 --- a/config/TestUtil.py +++ b/config/TestUtil.py @@ -36,16 +36,10 @@ testErrors = [] def configurePaths(): toplevel = findTopLevel() - bindist = isBinDist() if ice_home: print "[ using Ice installation from " + ice_home, - if isX64(): - print "(64bit)", - print "]" - elif os.environ.has_key("ICE_HOME") and len(os.environ["ICE_HOME"]) != 0: - print "[ using Ice installation from " + os.environ["ICE_HOME"], - if isX64(): + if x64: print "(64bit)", print "]" @@ -54,8 +48,8 @@ def configurePaths(): else: libDir = os.path.join(getIceDir("cpp"), "lib") if isHpUx(): - if isX64(): - if bindist: + if x64: + if ice_home: libDir = os.path.join(libDir, "pa20_64") os.environ["LD_LIBRARY_PATH"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH", "") else: @@ -65,8 +59,8 @@ def configurePaths(): elif isAIX(): os.environ["LIBPATH"] = libDir + os.pathsep + os.getenv("LIBPATH", "") elif isSolaris(): - if isX64(): - if bindist: + if x64: + if ice_home: if isSparc(): libDir = os.path.join(libDir, "sparcv9") else: @@ -75,8 +69,8 @@ def configurePaths(): else: os.environ["LD_LIBRARY_PATH"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH", "") else: - if isX64(): - if bindist: + if x64: + if ice_home: libDir = libDir + "64" os.environ["LD_LIBRARY_PATH_64"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH_64", "") else: @@ -95,7 +89,7 @@ def configurePaths(): # # On Windows x64, set PYTHONPATH to python/x64. # - if isWin32() and isX64(): + if isWin32() and x64: os.environ["PYTHONPATH"] = os.path.join(getIceDir("py"), "python", "x64") + os.pathsep + \ os.getenv("PYTHONPATH", "") else: @@ -103,19 +97,6 @@ def configurePaths(): os.environ["RUBYLIB"] = os.path.join(getIceDir("rb"), "ruby") + os.pathsep + os.getenv("RUBYLIB", "") -def isBinDist(): - return (ice_home or (os.environ.has_key("ICE_HOME") and len(os.environ["ICE_HOME"]) != 0)) - -def isX64(): - if x64: - return True - elif isWin32(): - if (os.environ.has_key("XTARGET") and os.environ["XTARGET"] == "x64"): - return True - elif os.environ.has_key("LP64") and os.environ["LP64"] == "yes": - return True - return False - def addLdPath(libpath): if isWin32(): os.environ["PATH"] = libpath + os.pathsep + os.getenv("PATH", "") @@ -314,8 +295,6 @@ def getIceDir(subdir = None): global ice_home if ice_home: return ice_home - if os.environ.has_key("ICE_HOME") and len(os.environ["ICE_HOME"]) != 0: - return os.environ["ICE_HOME"] elif subdir: return os.path.join(findTopLevel(), subdir) else: @@ -623,21 +602,21 @@ class InvalidSelectorString(Exception): sslConfigTree = { "cpp" : { - "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL --Ice.Default.Protocol=ssl --IceSSL.DefaultDir=%(certsdir)s " + - "--IceSSL.CertAuthFile=cacert.pem", + "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL --Ice.Default.Protocol=ssl " + + "--IceSSL.DefaultDir=%(certsdir)s --IceSSL.CertAuthFile=cacert.pem", "client" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem", "server" : " --IceSSL.CertFile=s_rsa1024_pub.pem --IceSSL.KeyFile=s_rsa1024_priv.pem", "colloc" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem" }, "java" : { - "plugin" : " --Ice.Plugin.IceSSL=IceSSL.PluginFactory --Ice.Default.Protocol=ssl --IceSSL.DefaultDir=%(certsdir)s " + - " --IceSSL.Truststore=certs.jks --IceSSL.Password=password", + "plugin" : " --Ice.Plugin.IceSSL=IceSSL.PluginFactory --Ice.Default.Protocol=ssl " + + "--IceSSL.DefaultDir=%(certsdir)s --IceSSL.Truststore=certs.jks --IceSSL.Password=password", "client" : " --IceSSL.Keystore=client.jks", "server" : " --IceSSL.Keystore=server.jks", "colloc" : " --IceSSL.Keystore=client.jks" }, "cs" : { - "plugin" : " --Ice.Plugin.IceSSL=%(bindir)s\\IceSSL.dll:IceSSL.PluginFactory --Ice.Default.Protocol=ssl" + + "plugin" : " --Ice.Plugin.IceSSL=IceSSL:IceSSL.PluginFactory --Ice.Default.Protocol=ssl" + " --IceSSL.Password=password --IceSSL.DefaultDir=%(certsdir)s", "client" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.CheckCertName=0", "server" : " --IceSSL.CertFile=s_rsa1024.pfx --IceSSL.ImportCert.CurrentUser.Root=cacert.pem", @@ -675,14 +654,7 @@ def getDefaultMapping(currentDir = ""): def getTestEnv(): env = {} - - lang = getDefaultMapping() - if lang == "cs": - env["bindir"] = os.path.splitdrive(os.path.join(os.path.abspath(findTopLevel()), "cs", "bin"))[1] - env["certsdir"] = os.path.splitdrive(os.path.join(os.path.abspath(findTopLevel()), "certs"))[1] - else: - env["certsdir"] = os.path.join(os.path.abspath(findTopLevel()), "certs") - env["bindir"] = os.path.join(os.path.abspath(findTopLevel()), "cpp", "bin") + env["certsdir"] = os.path.abspath(os.path.join(findTopLevel(), "certs")) return env class DriverConfig: @@ -731,8 +703,11 @@ def argsToDict(argumentString, results): results[current] = None return results -def getCommandLine(exe, config, env = getTestEnv()): +def getCommandLine(exe, config, env=None): + if not env: + env = getTestEnv() + # # Command lines are built up from the items in the components # sequence, which is initialized with command line options common to @@ -992,7 +967,7 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl client = os.path.join(testdir, client) print "starting server...", - serverCmd = getCommandLine(server, DriverConfig("server")) + additionalServerOptions + serverCmd = getCommandLine(server, DriverConfig("server")) + ' ' + additionalServerOptions if debug: print "(" + serverCmd + ")", serverPipe = os.popen(serverCmd + " 2>&1") @@ -1002,7 +977,7 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl print "ok" print "starting client...", - clientCmd = getCommandLine(client, DriverConfig("client")) + additionalClientOptions + clientCmd = getCommandLine(client, DriverConfig("client")) + ' ' + additionalClientOptions if debug: print "(" + clientCmd + ")", clientPipe = os.popen(clientCmd + " 2>&1") @@ -1054,11 +1029,11 @@ def cleanDbDir(path): for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore" and f != "DB_CONFIG" ]: os.remove(filename) -def startClient(exe, args, config=None, env=getTestEnv()): +def startClient(exe, args, config=None, env=None): if config == None: config = DriverConfig("client") if debug: - print "(" + getCommandLine(exe, config, env) + args + ")", + print "(" + getCommandLine(exe, config, env) + ' ' + args + ")", if config.lang == "php": os.chdir(os.path.dirname(os.path.abspath(exe))) @@ -1071,40 +1046,28 @@ def startClient(exe, args, config=None, env=getTestEnv()): tmpini.write("extension=%s\n" % phpExtension) tmpini.close() - return os.popen(getCommandLine(exe, config, env) + args + " 2>&1") + return os.popen(getCommandLine(exe, config, env) + ' ' + args + " 2>&1") -def startServer(exe, args, config=None, env=getTestEnv()): +def startServer(exe, args, config=None, env=None): if config == None: config = DriverConfig("server") if debug: - print "(" + getCommandLine(exe, config, env) + args + ")", - return os.popen(getCommandLine(exe, config, env) + args + " 2>&1") + print "(" + getCommandLine(exe, config, env) + ' ' + args + ")", + return os.popen(getCommandLine(exe, config, env) + ' ' +args + " 2>&1") -def startColloc(exe, args, config=None, env=getTestEnv()): +def startColloc(exe, args, config=None, env=None): if config == None: config = DriverConfig("colloc") if debug: - print "(" + getCommandLine(exe, config, env) + args + ")", - return os.popen(getCommandLine(exe, config, env) + args + " 2>&1") + print "(" + getCommandLine(exe, config, env) + ' ' + args + ")", + return os.popen(getCommandLine(exe, config, env) + ' ' + args + " 2>&1") def getMappingDir(currentDir): return os.path.abspath(os.path.join(findTopLevel(), getDefaultMapping(currentDir))) -def getBinDir(currentDir): - binDir = os.path.join(getIceDir(getMappingDir(currentDir)), "bin") - if isBinDist() and isX64(): - if isHpUx(): - binDir = os.path.join(binDir, "pa20_64") - elif isSolaris(): - if isSparc(): - binDir = os.path.join(binDir, "sparcv9") - else: - binDir = os.path.join(binDir, "amd64") - return binDir - def getCppBinDir(): binDir = os.path.join(getIceDir("cpp"), "bin") - if isBinDist() and isX64(): + if ice_home and x64: if isHpUx(): binDir = os.path.join(binDir, "pa20_64") elif isSolaris(): @@ -1116,9 +1079,6 @@ def getCppBinDir(): binDir = os.path.join(binDir, "x64") return binDir -def getCertsDir(currentDir): - return os.path.abspath(os.path.join(findTopLevel(), "certs")) - def processCmdLine(): def usage(): print "usage: " + sys.argv[0] + """ @@ -1174,6 +1134,13 @@ def processCmdLine(): if len(args) > 0: usage() + # Only use binary distribution from ICE_HOME environment variable if USE_BIN_DIST=yes + if not ice_home and os.environ.get("ICE_HOME", "") != "" and os.environ.get("USE_BIN_DIST", "no") == "yes": + ice_home = os.environ["ICE_HOME"] + + if not x64: + x64 = isWin32() and os.environ.get("XTARGET") == "x64" or os.environ.get("LP64") == "yes" + configurePaths() if os.environ.has_key("ICE_CONFIG"): diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index f4b8d641176..4bf5280c028 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -176,7 +176,7 @@ else STLPORT_LIBS = endif -OPENSSL_FLAGS = $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include) -I$(KERBEROS_HOME)/include +OPENSSL_FLAGS = $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include) OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir))) diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py index d2514a34df1..ff66087b358 100755 --- a/cpp/test/FreezeScript/dbmap/run.py +++ b/cpp/test/FreezeScript/dbmap/run.py @@ -22,7 +22,7 @@ import TestUtil TestUtil.processCmdLine() directory = os.path.dirname(os.path.abspath(__file__)) -transformdb = os.path.join(TestUtil.getBinDir(directory), "transformdb") +transformdb = os.path.join(TestUtil.getCppBinDir(), "transformdb") dbdir = os.path.join(directory, "db") TestUtil.cleanDbDir(dbdir) diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py index e5d155f3f75..c758e6dba4a 100755 --- a/cpp/test/FreezeScript/evictor/run.py +++ b/cpp/test/FreezeScript/evictor/run.py @@ -22,7 +22,7 @@ import TestUtil TestUtil.processCmdLine() directory = os.path.dirname(os.path.abspath(__file__)) -transformdb = os.path.join(TestUtil.getBinDir(directory), "transformdb") +transformdb = os.path.join(TestUtil.getCppBinDir(), "transformdb") dbdir = os.path.join(directory, "db") TestUtil.cleanDbDir(dbdir) diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index 2f8f5650054..615c853f219 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/run.py @@ -21,7 +21,7 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil TestUtil.processCmdLine() -router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = r' --Glacier2.RoutingTable.MaxSize=10' + \ r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py index 0ab8401a702..fc384ea9ccd 100755 --- a/cpp/test/Glacier2/dynamicFiltering/run.py +++ b/cpp/test/Glacier2/dynamicFiltering/run.py @@ -31,7 +31,7 @@ TestUtil.getServerPid(serverPipe) TestUtil.getAdapterReady(serverPipe, True, 3) print "ok" -router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index bcddfc5a9c8..b47044ac228 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -21,7 +21,7 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil TestUtil.processCmdLine() -router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") def startRouter(buffered): diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py index 048eba6a562..3f0cf1a5287 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -32,7 +32,7 @@ TestUtil.getServerPid(serverPipe) TestUtil.getAdapterReady(serverPipe) print "ok" -router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index f0febbd9ec3..2d28a1d5b8f 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -32,7 +32,7 @@ TestUtil.getServerPid(serverPipe) TestUtil.getAdapterReady(serverPipe) print "ok" -router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = r' --Ice.Warn.Dispatch=0' + \ r' --Glacier2.AddSSLContext=1' + \ @@ -43,28 +43,21 @@ args = r' --Ice.Warn.Dispatch=0' + \ r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ - r' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ - r" --Ice.Plugin.IceSSL=IceSSL:createIceSSL" + \ - r" --IceSSL.DefaultDir=" + TestUtil.getCertsDir(__file__) + \ - r' --IceSSL.CertFile=s_rsa1024_pub.pem' + \ - r' --IceSSL.KeyFile=s_rsa1024_priv.pem' + \ - r' --IceSSL.CertAuthFile=cacert.pem' + r' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350 -t 10000"' +routerCfg = TestUtil.DriverConfig("server") +routerCfg.protocol = "ssl" print "starting router...", -starterPipe = TestUtil.startServer(router, args + " 2>&1") +starterPipe = TestUtil.startServer(router, args + " 2>&1", routerCfg) TestUtil.getServerPid(starterPipe) TestUtil.getAdapterReady(starterPipe) print "ok" +clientCfg = TestUtil.DriverConfig("client") +clientCfg.protocol = "ssl" client = os.path.join(testdir, "client") -args = " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" + \ - " --IceSSL.DefaultDir=" + TestUtil.getCertsDir(__file__) + \ - " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ - " --IceSSL.KeyFile=c_rsa1024_priv.pem" + \ - " --IceSSL.CertAuthFile=cacert.pem" - print "starting client...", -clientPipe = TestUtil.startClient(client, args + " 2>&1") +clientPipe = TestUtil.startClient(client, "", clientCfg) print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py index 36f4772a1bf..1900f263aac 100755 --- a/cpp/test/Glacier2/staticFiltering/run.py +++ b/cpp/test/Glacier2/staticFiltering/run.py @@ -203,7 +203,7 @@ elif len(testcases) < 6: print "WARNING: The network configuration for this host does not permit all " print " tests to run correctly, some tests have been disabled." -router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") def pingProgress(): sys.stdout.write('.') diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py index 0fd825d771a..086147b34cd 100755 --- a/cpp/test/IceGrid/distribution/run.py +++ b/cpp/test/IceGrid/distribution/run.py @@ -24,7 +24,7 @@ import IceGridAdmin def icepatch2Calc(datadir, dirname): - icePatch2Calc = os.path.join(TestUtil.getBinDir(__file__), "icepatch2calc") + icePatch2Calc = os.path.join(TestUtil.getCppBinDir(), "icepatch2calc") commandPipe = os.popen(icePatch2Calc + " " + os.path.join(datadir, dirname) + " 2>&1") TestUtil.printOutputFromPipe(commandPipe) diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index a66c664d724..5002f4e31dd 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -27,8 +27,8 @@ testdir = os.path.dirname(os.path.abspath(__file__)) import IceStormUtil iceBox = TestUtil.getIceBox(testdir) -iceBoxAdmin = os.path.join(TestUtil.getBinDir(testdir), "iceboxadmin") -iceStormAdmin = os.path.join(TestUtil.getBinDir(testdir), "icestormadmin") +iceBoxAdmin = os.path.join(TestUtil.getCppBinDir(), "iceboxadmin") +iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") publisher = os.path.join(testdir, "publisher") subscriber = os.path.join(testdir, "subscriber") diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index 4e4a405e053..4ce5c41f392 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -25,8 +25,8 @@ name = os.path.join("IceStorm", "stress") testdir = os.path.dirname(os.path.abspath(__file__)) iceBox = TestUtil.getIceBox(testdir) -iceBoxAdmin = os.path.join(TestUtil.getBinDir(testdir), "iceboxadmin") -iceStormAdmin = os.path.join(TestUtil.getBinDir(testdir), "icestormadmin") +iceBoxAdmin = os.path.join(TestUtil.getCppBinDir(), "iceboxadmin") +iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") import IceStormUtil diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index 9470889ca32..abd3b0053b6 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -25,7 +25,7 @@ import TestUtil TestUtil.processCmdLine() directory = os.path.dirname(os.path.abspath(__file__)) -slice2cpp = os.path.join(TestUtil.getBinDir(directory), "slice2cpp") +slice2cpp = os.path.join(TestUtil.getCppBinDir(), "slice2cpp") regex1 = re.compile(r"\.ice$", re.IGNORECASE) files = [] diff --git a/cs/config/Make.rules.mak.cs b/cs/config/Make.rules.mak.cs index 4c89fc65415..36d8e551e28 100644 --- a/cs/config/Make.rules.mak.cs +++ b/cs/config/Make.rules.mak.cs @@ -79,6 +79,12 @@ bindir = $(top_srcdir)\bin install_bindir = $(prefix)\bin install_libdir = $(prefix)\lib +!if "$(ice_src_dist)" != "" +refdir = $(bindir) +!else +refdir = $(ice_dir)\bin +!endif + !if "$(no_gac)" != "" NOGAC = $(no_gac) !endif @@ -159,8 +165,6 @@ $(TARGETS_CONFIG): cmd /c "set PUBLIC_KEY_TOKEN=%TMP_TOKEN:~-16% && \ del tmp.pub tmp.publicKeyToken && \ nmake /nologo /f Makefile.mak config" - -assemblydir = $(bindir) !else $(TARGETS_CONFIG): @sn -q -T $(ice_dir)\bin\Ice.dll > tmp.publicKeyToken && \ @@ -168,8 +172,6 @@ $(TARGETS_CONFIG): cmd /c "set PUBLIC_KEY_TOKEN=%TMP_TOKEN:~-16% && \ del tmp.pub tmp.publicKeyToken && \ nmake /nologo /f Makefile.mak config" - -assemblydir = $(ice_dir)\bin !endif !else @@ -183,31 +185,31 @@ $(TARGETS_CONFIG): <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Glacier2" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\Glacier2.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\Glacier2.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="Ice" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\Ice.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\Ice.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IcePatch2" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\IcePatch2.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\IcePatch2.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceStorm" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\IceStorm.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\IceStorm.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\IceBox.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\IceBox.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceGrid" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\IceGrid.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\IceGrid.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceSSL" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="$(INTVERSION).0" href="$(assemblydir)\IceSSL.dll"/> + <codeBase version="$(INTVERSION).0" href="$(refdir)\IceSSL.dll"/> </dependentAssembly> <qualifyAssembly partialName="IceSSL" fullName="IceSSL, Version=$(INTVERSION).0, Culture=neutral, PublicKeyToken=$(publicKeyToken)"/> </assemblyBinding> diff --git a/cs/demo/Glacier2/callback/Makefile.mak b/cs/demo/Glacier2/callback/Makefile.mak index d9126e694ec..dc7bbcf335a 100644 --- a/cs/demo/Glacier2/callback/Makefile.mak +++ b/cs/demo/Glacier2/callback/Makefile.mak @@ -29,12 +29,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) sessionserver.exe: $(SS_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll $(SS_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll $(SS_SRCS) !include .depend diff --git a/cs/demo/Ice/async/Makefile.mak b/cs/demo/Ice/async/Makefile.mak index d75730a898f..dd557f453d3 100644 --- a/cs/demo/Ice/async/Makefile.mak +++ b/cs/demo/Ice/async/Makefile.mak @@ -29,9 +29,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = -I$(slicedir) $(SLICE2CSFLAGS) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/bidir/Makefile.mak b/cs/demo/Ice/bidir/Makefile.mak index 2ab55e27819..e8f0b44c8a9 100644 --- a/cs/demo/Ice/bidir/Makefile.mak +++ b/cs/demo/Ice/bidir/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/callback/Makefile.mak b/cs/demo/Ice/callback/Makefile.mak index 2ab55e27819..e8f0b44c8a9 100644 --- a/cs/demo/Ice/callback/Makefile.mak +++ b/cs/demo/Ice/callback/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/hello/Makefile.mak b/cs/demo/Ice/hello/Makefile.mak index 74d67cd6b22..189297bc4d9 100644 --- a/cs/demo/Ice/hello/Makefile.mak +++ b/cs/demo/Ice/hello/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/invoke/Makefile.mak b/cs/demo/Ice/invoke/Makefile.mak index fc230482833..1a34551203b 100644 --- a/cs/demo/Ice/invoke/Makefile.mak +++ b/cs/demo/Ice/invoke/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice --stream -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/latency/Makefile.mak b/cs/demo/Ice/latency/Makefile.mak index 15d599d416d..69935ede88e 100644 --- a/cs/demo/Ice/latency/Makefile.mak +++ b/cs/demo/Ice/latency/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/minimal/Makefile.mak b/cs/demo/Ice/minimal/Makefile.mak index 74d67cd6b22..189297bc4d9 100644 --- a/cs/demo/Ice/minimal/Makefile.mak +++ b/cs/demo/Ice/minimal/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/multicast/Makefile.mak b/cs/demo/Ice/multicast/Makefile.mak index a58fc67cda7..4cb6fd3634c 100644 --- a/cs/demo/Ice/multicast/Makefile.mak +++ b/cs/demo/Ice/multicast/Makefile.mak @@ -29,9 +29,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/nested/Makefile.mak b/cs/demo/Ice/nested/Makefile.mak index 7cd2cc46b05..8af15a937ed 100644 --- a/cs/demo/Ice/nested/Makefile.mak +++ b/cs/demo/Ice/nested/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/session/Makefile.mak b/cs/demo/Ice/session/Makefile.mak index 46990e55cb3..4b9468c9b6b 100644 --- a/cs/demo/Ice/session/Makefile.mak +++ b/cs/demo/Ice/session/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/throughput/Makefile.mak b/cs/demo/Ice/throughput/Makefile.mak index 145bec1ef6c..ec17a651e46 100644 --- a/cs/demo/Ice/throughput/Makefile.mak +++ b/cs/demo/Ice/throughput/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/Ice/value/Makefile.mak b/cs/demo/Ice/value/Makefile.mak index af85138da46..4b3c4d1a3cc 100644 --- a/cs/demo/Ice/value/Makefile.mak +++ b/cs/demo/Ice/value/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/IceBox/hello/Makefile.mak b/cs/demo/IceBox/hello/Makefile.mak index be11ef0c047..ed01b66e87b 100644 --- a/cs/demo/IceBox/hello/Makefile.mak +++ b/cs/demo/IceBox/hello/Makefile.mak @@ -28,10 +28,10 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) helloservice.dll: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -target:library -out:$@ -r:$(bindir)\IceBox.dll -r:$(bindir)\Ice.dll \ + $(MCS) $(MCSFLAGS) -target:library -out:$@ -r:$(refdir)\IceBox.dll -r:$(refdir)\Ice.dll \ $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/IceGrid/icebox/Makefile.mak b/cs/demo/IceGrid/icebox/Makefile.mak index 0cd32b7a0cb..172efa24d25 100644 --- a/cs/demo/IceGrid/icebox/Makefile.mak +++ b/cs/demo/IceGrid/icebox/Makefile.mak @@ -28,10 +28,10 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) helloservice.dll: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -target:library -out:$@ -r:$(bindir)\IceBox.dll -r:$(bindir)\Ice.dll \ + $(MCS) $(MCSFLAGS) -target:library -out:$@ -r:$(refdir)\IceBox.dll -r:$(refdir)\Ice.dll \ $(S_SRCS) $(GEN_SRCS) clean:: diff --git a/cs/demo/IceGrid/simple/Makefile.mak b/cs/demo/IceGrid/simple/Makefile.mak index 6136236b3e4..4ed2021c116 100644 --- a/cs/demo/IceGrid/simple/Makefile.mak +++ b/cs/demo/IceGrid/simple/Makefile.mak @@ -28,10 +28,10 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\IceGrid.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\IceGrid.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) clean:: for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f diff --git a/cs/demo/IceStorm/clock/Makefile.mak b/cs/demo/IceStorm/clock/Makefile.mak index 71a725965fb..6c56d2fa311 100644 --- a/cs/demo/IceStorm/clock/Makefile.mak +++ b/cs/demo/IceStorm/clock/Makefile.mak @@ -28,10 +28,10 @@ MCSFLAGS = $(MCSFLAGS) -target:exe -warnaserror- SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) publisher.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\IceStorm.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\IceStorm.dll $(C_SRCS) $(GEN_SRCS) subscriber.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\IceStorm.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\IceStorm.dll $(S_SRCS) $(GEN_SRCS) clean:: for %f in (db\*) do if not %f == db\.gitignore del /q %f diff --git a/cs/demo/book/lifecycle/Makefile.mak b/cs/demo/book/lifecycle/Makefile.mak index 3a9acdabf76..34fcedaede1 100644 --- a/cs/demo/book/lifecycle/Makefile.mak +++ b/cs/demo/book/lifecycle/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/book/printer/Makefile.mak b/cs/demo/book/printer/Makefile.mak index 2da497dffb2..57585c34ffe 100644 --- a/cs/demo/book/printer/Makefile.mak +++ b/cs/demo/book/printer/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/demo/book/simple_filesystem/Makefile.mak b/cs/demo/book/simple_filesystem/Makefile.mak index 5a08f71ee03..25e0f13a62c 100644 --- a/cs/demo/book/simple_filesystem/Makefile.mak +++ b/cs/demo/book/simple_filesystem/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/src/Glacier2/Makefile.mak b/cs/src/Glacier2/Makefile.mak index 1aedf344049..fe38c42aa96 100644 --- a/cs/src/Glacier2/Makefile.mak +++ b/cs/src/Glacier2/Makefile.mak @@ -31,7 +31,7 @@ MCSFLAGS = $(MCSFLAGS) -keyfile:$(KEYFILE) SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I$(slicedir) $(TARGETS):: $(SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -r:$(bindir)\Ice.dll $(SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS) !if "$(NOGAC)" == "" diff --git a/cs/src/IceBox/Makefile.mak b/cs/src/IceBox/Makefile.mak index b171c1d004b..774a0e4af49 100644 --- a/cs/src/IceBox/Makefile.mak +++ b/cs/src/IceBox/Makefile.mak @@ -32,10 +32,10 @@ LIB_MCSFLAGS = $(LIB_MCSFLAGS) -keyfile:$(KEYFILE) SLICE2CSFLAGS = $(SLICE2CSFLAGS) --checksum --ice -I. -I$(slicedir) $(ICEBOXNET): $(I_SRCS) $(LIBNAME) - $(MCS) $(EXE_MCSFLAGS) -out:$@ -r:$(LIBNAME) -r:$(bindir)\Ice.dll $(I_SRCS) + $(MCS) $(EXE_MCSFLAGS) -out:$@ -r:$(LIBNAME) -r:$(refdir)\Ice.dll $(I_SRCS) $(LIBNAME): $(L_SRCS) $(GEN_SRCS) - $(MCS) $(LIB_MCSFLAGS) -r:$(bindir)\Ice.dll $(L_SRCS) $(GEN_SRCS) + $(MCS) $(LIB_MCSFLAGS) -r:$(refdir)\Ice.dll $(L_SRCS) $(GEN_SRCS) !if "$(NOGAC)" == "" diff --git a/cs/src/IceGrid/Makefile.mak b/cs/src/IceGrid/Makefile.mak index 45d65e8071a..a8fe8142502 100644 --- a/cs/src/IceGrid/Makefile.mak +++ b/cs/src/IceGrid/Makefile.mak @@ -36,7 +36,7 @@ MCSFLAGS = $(MCSFLAGS) -keyfile:$(KEYFILE) SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I$(slicedir) $(TARGETS):: $(SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -r:$(bindir)\Glacier2.dll -r:$(bindir)\Ice.dll $(SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -r:$(refdir)\Glacier2.dll -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS) !if "$(NOGAC)" == "" diff --git a/cs/src/IcePatch2/Makefile.mak b/cs/src/IcePatch2/Makefile.mak index ee35cd8dcba..9a208cd39fc 100644 --- a/cs/src/IcePatch2/Makefile.mak +++ b/cs/src/IcePatch2/Makefile.mak @@ -29,7 +29,7 @@ MCSFLAGS = $(MCSFLAGS) -keyfile:$(KEYFILE) SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I$(slicedir) --ice $(TARGETS):: $(SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -r:$(bindir)\Ice.dll $(SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS) !if "$(NOGAC)" == "" diff --git a/cs/src/IceSSL/Makefile.mak b/cs/src/IceSSL/Makefile.mak index d14fc8f9e32..59790bac693 100644 --- a/cs/src/IceSSL/Makefile.mak +++ b/cs/src/IceSSL/Makefile.mak @@ -34,7 +34,7 @@ MCSFLAGS = $(MCSFLAGS) -target:library -out:$(TARGETS) -warnaserror- MCSFLAGS = $(MCSFLAGS) -keyfile:$(KEYFILE) $(TARGETS):: $(SRCS) - $(MCS) $(MCSFLAGS) -r:$(bindir)\Ice.dll $(SRCS) + $(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) !if "$(NOGAC)" == "" diff --git a/cs/src/IceStorm/Makefile.mak b/cs/src/IceStorm/Makefile.mak index cd178c8b44a..eef4448e9fd 100644 --- a/cs/src/IceStorm/Makefile.mak +++ b/cs/src/IceStorm/Makefile.mak @@ -28,7 +28,7 @@ MCSFLAGS = $(MCSFLAGS) -keyfile:$(KEYFILE) SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I$(slicedir) --ice $(TARGETS):: $(SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -r:$(bindir)\Ice.dll $(SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS) !if "$(NOGAC)" == "" diff --git a/cs/test/Glacier2/attack/Makefile.mak b/cs/test/Glacier2/attack/Makefile.mak index 9a76b92d122..1cc15dbd165 100644 --- a/cs/test/Glacier2/attack/Makefile.mak +++ b/cs/test/Glacier2/attack/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py index 7a8dbe06607..be829eec168 100755 --- a/cs/test/Glacier2/attack/run.py +++ b/cs/test/Glacier2/attack/run.py @@ -21,7 +21,7 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil TestUtil.processCmdLine() -router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") name = os.path.join("Glacier2", "router") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Glacier2/router/Makefile.mak b/cs/test/Glacier2/router/Makefile.mak index fd8bce8e6c4..76d234faf3d 100644 --- a/cs/test/Glacier2/router/Makefile.mak +++ b/cs/test/Glacier2/router/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py index d575ba22b02..ba09312bb99 100755 --- a/cs/test/Glacier2/router/run.py +++ b/cs/test/Glacier2/router/run.py @@ -21,7 +21,7 @@ sys.path.append(os.path.join(toplevel, "config")) import TestUtil TestUtil.processCmdLine() -router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") name = os.path.join("Glacier2", "router") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Ice/adapterDeactivation/Makefile.mak b/cs/test/Ice/adapterDeactivation/Makefile.mak index ab10f47b870..221f17c7c4b 100644 --- a/cs/test/Ice/adapterDeactivation/Makefile.mak +++ b/cs/test/Ice/adapterDeactivation/Makefile.mak @@ -29,12 +29,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/application/Makefile.mak b/cs/test/Ice/application/Makefile.mak index c31f2f95888..9e670a3f2b7 100644 --- a/cs/test/Ice/application/Makefile.mak +++ b/cs/test/Ice/application/Makefile.mak @@ -23,6 +23,6 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) !include .depend diff --git a/cs/test/Ice/background/Makefile.mak b/cs/test/Ice/background/Makefile.mak index 1e35650a030..eefa1f2903e 100644 --- a/cs/test/Ice/background/Makefile.mak +++ b/cs/test/Ice/background/Makefile.mak @@ -30,9 +30,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/binding/Makefile.mak b/cs/test/Ice/binding/Makefile.mak index 077a3fd618b..8c8cb822d02 100644 --- a/cs/test/Ice/binding/Makefile.mak +++ b/cs/test/Ice/binding/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/checksum/client/Makefile.mak b/cs/test/Ice/checksum/client/Makefile.mak index c6bebe3921f..bc213a0a8b2 100644 --- a/cs/test/Ice/checksum/client/Makefile.mak +++ b/cs/test/Ice/checksum/client/Makefile.mak @@ -31,6 +31,6 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --checksum --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/checksum/server/Makefile.mak b/cs/test/Ice/checksum/server/Makefile.mak index 3f370ff6c50..d959071c93a 100644 --- a/cs/test/Ice/checksum/server/Makefile.mak +++ b/cs/test/Ice/checksum/server/Makefile.mak @@ -31,6 +31,6 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --checksum --ice -I. -I$(slicedir) server.exe: $(SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/dictMapping/Makefile.mak b/cs/test/Ice/dictMapping/Makefile.mak index bc638ff29a6..4a3f29c994a 100644 --- a/cs/test/Ice/dictMapping/Makefile.mak +++ b/cs/test/Ice/dictMapping/Makefile.mak @@ -31,15 +31,15 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) !include .depend diff --git a/cs/test/Ice/exceptions/Makefile.mak b/cs/test/Ice/exceptions/Makefile.mak index ef422def80c..80f10fc4aae 100644 --- a/cs/test/Ice/exceptions/Makefile.mak +++ b/cs/test/Ice/exceptions/Makefile.mak @@ -31,15 +31,15 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) !include .depend diff --git a/cs/test/Ice/facets/Makefile.mak b/cs/test/Ice/facets/Makefile.mak index 1cf952efe24..e204b007b82 100644 --- a/cs/test/Ice/facets/Makefile.mak +++ b/cs/test/Ice/facets/Makefile.mak @@ -29,12 +29,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/faultTolerance/Makefile.mak b/cs/test/Ice/faultTolerance/Makefile.mak index 4459fa45320..80c37328b90 100644 --- a/cs/test/Ice/faultTolerance/Makefile.mak +++ b/cs/test/Ice/faultTolerance/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/hold/Makefile.mak b/cs/test/Ice/hold/Makefile.mak index f048c84cff3..2b094353636 100644 --- a/cs/test/Ice/hold/Makefile.mak +++ b/cs/test/Ice/hold/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/inheritance/Makefile.mak b/cs/test/Ice/inheritance/Makefile.mak index e8ca2d04a83..3d056c0aebb 100644 --- a/cs/test/Ice/inheritance/Makefile.mak +++ b/cs/test/Ice/inheritance/Makefile.mak @@ -29,12 +29,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/interceptor/Makefile.mak b/cs/test/Ice/interceptor/Makefile.mak index e4b9317e6a3..3cd007838f6 100644 --- a/cs/test/Ice/interceptor/Makefile.mak +++ b/cs/test/Ice/interceptor/Makefile.mak @@ -28,6 +28,6 @@ GDIR = generated MCSFLAGS = $(MCSFLAGS) -target:exe client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/location/Makefile.mak b/cs/test/Ice/location/Makefile.mak index fb3ffa13e5b..4e9b12eb153 100644 --- a/cs/test/Ice/location/Makefile.mak +++ b/cs/test/Ice/location/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/objects/Makefile.mak b/cs/test/Ice/objects/Makefile.mak index 5a1d7aed748..32e1a8bbe75 100644 --- a/cs/test/Ice/objects/Makefile.mak +++ b/cs/test/Ice/objects/Makefile.mak @@ -31,12 +31,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. --stream client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/operations/Makefile.mak b/cs/test/Ice/operations/Makefile.mak index d74d153a038..b6b6b6fe83c 100644 --- a/cs/test/Ice/operations/Makefile.mak +++ b/cs/test/Ice/operations/Makefile.mak @@ -32,15 +32,15 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) !include .depend diff --git a/cs/test/Ice/proxy/Makefile.mak b/cs/test/Ice/proxy/Makefile.mak index c39677f8473..35ebbd44bb7 100644 --- a/cs/test/Ice/proxy/Makefile.mak +++ b/cs/test/Ice/proxy/Makefile.mak @@ -31,15 +31,15 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) !include .depend diff --git a/cs/test/Ice/retry/Makefile.mak b/cs/test/Ice/retry/Makefile.mak index 8e76402de0b..c99295785dc 100644 --- a/cs/test/Ice/retry/Makefile.mak +++ b/cs/test/Ice/retry/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/seqMapping/Makefile.mak b/cs/test/Ice/seqMapping/Makefile.mak index 1566206e86d..2bbd8f92e3b 100644 --- a/cs/test/Ice/seqMapping/Makefile.mak +++ b/cs/test/Ice/seqMapping/Makefile.mak @@ -31,15 +31,15 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) !include .depend diff --git a/cs/test/Ice/servantLocator/Makefile.mak b/cs/test/Ice/servantLocator/Makefile.mak index 5eefdd085fd..8374c65e058 100644 --- a/cs/test/Ice/servantLocator/Makefile.mak +++ b/cs/test/Ice/servantLocator/Makefile.mak @@ -31,15 +31,15 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) collocated.exe: $(COL_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(COL_SRCS) $(GEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) !include .depend diff --git a/cs/test/Ice/slicing/exceptions/Makefile.mak b/cs/test/Ice/slicing/exceptions/Makefile.mak index 76d11ef0840..6db30423790 100644 --- a/cs/test/Ice/slicing/exceptions/Makefile.mak +++ b/cs/test/Ice/slicing/exceptions/Makefile.mak @@ -32,12 +32,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) $(SAMD_GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) $(SAMD_GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) $(SAMD_GEN_SRCS) !include .depend diff --git a/cs/test/Ice/slicing/objects/Makefile.mak b/cs/test/Ice/slicing/objects/Makefile.mak index e86c805d537..b5d47d94e4d 100644 --- a/cs/test/Ice/slicing/objects/Makefile.mak +++ b/cs/test/Ice/slicing/objects/Makefile.mak @@ -35,12 +35,12 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. client.exe: $(C_SRCS) $(GEN_SRCS) $(CGEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) $(CGEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) $(CGEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS) serveramd.exe: $(SAMD_SRCS) $(GEN_AMD_SRCS) $(SAMD_GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) $(SAMD_GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(SAMD_SRCS) $(GEN_AMD_SRCS) $(SAMD_GEN_SRCS) !include .depend diff --git a/cs/test/Ice/stream/Makefile.mak b/cs/test/Ice/stream/Makefile.mak index 0af70afa769..770b0b9dcd4 100644 --- a/cs/test/Ice/stream/Makefile.mak +++ b/cs/test/Ice/stream/Makefile.mak @@ -27,6 +27,6 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream -I. client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/Ice/timeout/Makefile.mak b/cs/test/Ice/timeout/Makefile.mak index ba762e55595..4b9f2b2ae70 100644 --- a/cs/test/Ice/timeout/Makefile.mak +++ b/cs/test/Ice/timeout/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/IceBox/configuration/Makefile.mak b/cs/test/IceBox/configuration/Makefile.mak index e94e86811e6..afd2d2cddae 100644 --- a/cs/test/IceBox/configuration/Makefile.mak +++ b/cs/test/IceBox/configuration/Makefile.mak @@ -28,10 +28,10 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) testservice.dll: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -target:library -out:$@ -r:$(bindir)\IceBox.dll -r:$(bindir)\Ice.dll \ + $(MCS) $(MCSFLAGS) -target:library -out:$@ -r:$(refdir)\IceBox.dll -r:$(refdir)\Ice.dll \ $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/IceGrid/simple/Makefile.mak b/cs/test/IceGrid/simple/Makefile.mak index fe7154b4a00..8cf7f688999 100644 --- a/cs/test/IceGrid/simple/Makefile.mak +++ b/cs/test/IceGrid/simple/Makefile.mak @@ -28,11 +28,11 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll -r:$(bindir)\IceGrid.dll \ + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll -r:$(refdir)\IceGrid.dll \ $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\Glacier2.dll -r:$(bindir)\IceGrid.dll \ + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\Glacier2.dll -r:$(refdir)\IceGrid.dll \ $(S_SRCS) $(GEN_SRCS) clean:: diff --git a/cs/test/IceSSL/configuration/AllTests.cs b/cs/test/IceSSL/configuration/AllTests.cs index f17109930e5..325ce3f0d67 100644 --- a/cs/test/IceSSL/configuration/AllTests.cs +++ b/cs/test/IceSSL/configuration/AllTests.cs @@ -27,7 +27,7 @@ public class AllTests } private static Ice.InitializationData - createClientProps(Ice.Properties defaultProperties, string testDir, string defaultHost, bool threadPool) + createClientProps(Ice.Properties defaultProperties, string testDir, string defaultHost) { Ice.InitializationData result = new Ice.InitializationData(); result.properties = Ice.Util.createProperties(); @@ -40,7 +40,7 @@ public class AllTests // // When Mono supports .NET 2.0, we'll need to fix this. // - result.properties.setProperty("Ice.Plugin.IceSSL", testDir + "/../../../bin/IceSSL.dll:IceSSL.PluginFactory"); + result.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory"); if(defaultProperties.getProperty("Ice.IPv6").Length > 0) { result.properties.setProperty("Ice.IPv6", defaultProperties.getProperty("Ice.IPv6")); @@ -54,10 +54,10 @@ public class AllTests } private static Dictionary<string, string> - createServerProps(Ice.Properties defaultProperties, string testDir, string defaultHost, bool threadPool) + createServerProps(Ice.Properties defaultProperties, string testDir, string defaultHost) { Dictionary<string, string> result = new Dictionary<string, string>(); - result["Ice.Plugin.IceSSL"] = testDir + "/../../../bin/IceSSL.dll:IceSSL.PluginFactory"; + result["Ice.Plugin.IceSSL"] = "IceSSL:IceSSL.PluginFactory"; if(defaultProperties.getProperty("Ice.IPv6").Length > 0) { result["Ice.IPv6"] = defaultProperties.getProperty("Ice.IPv6"); @@ -69,7 +69,7 @@ public class AllTests return result; } - public static Test.ServerFactoryPrx allTests(Ice.Communicator communicator, string testDir, bool threadPool) + public static Test.ServerFactoryPrx allTests(Ice.Communicator communicator, string testDir) { string factoryRef = "factory:tcp -p 12010 -t 10000"; Ice.ObjectPrx b = communicator.stringToProxy(factoryRef); @@ -112,8 +112,7 @@ public class AllTests Console.Out.Write("testing manual initialization... "); Console.Out.Flush(); { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Ice.ObjectPrx p = comm.stringToProxy("dummy:ssl -p 9999"); @@ -133,8 +132,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -144,7 +142,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -168,8 +166,7 @@ public class AllTests X509Certificate2 cert = new X509Certificate2(defaultDir + "/c_rsa_nopass_ca1.pfx", "password"); X509Certificate2Collection coll = new X509Certificate2Collection(); coll.Add(cert); - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Ice.PluginManager pm = comm.getPluginManager(); @@ -180,7 +177,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -206,12 +203,11 @@ public class AllTests // // Test IceSSL.VerifyPeer=1. Client does not have a certificate. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "1"; @@ -244,7 +240,7 @@ public class AllTests // Test IceSSL.VerifyPeer=2. This should fail because the client // does not supply a certificate. // - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -276,7 +272,7 @@ public class AllTests comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "1"; @@ -307,7 +303,7 @@ public class AllTests // // Test IceSSL.VerifyPeer=2. Client has a certificate. // - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -332,11 +328,11 @@ public class AllTests // Test IceSSL.VerifyPeer=1. This should fail because the // client doesn't trust the server's CA. // - initData = createClientProps(defaultProperties, testDir, defaultHost, threadPool); + initData = createClientProps(defaultProperties, testDir, defaultHost); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "1"; @@ -362,13 +358,13 @@ public class AllTests // // Verify that IceSSL.CheckCertName has no effect in a server. // - initData = createClientProps(defaultProperties, testDir, defaultHost, threadPool); + initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.CheckCertName"] = "1"; @@ -394,8 +390,7 @@ public class AllTests // // Verify that a server certificate is present. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); @@ -406,7 +401,7 @@ public class AllTests Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -455,8 +450,7 @@ public class AllTests // // Verify that verifier is installed via property. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); initData.properties.setProperty("IceSSL.CertVerifier", "CertificateVerifierI"); @@ -475,15 +469,14 @@ public class AllTests // This should fail because the client and server have no protocol // in common. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); initData.properties.setProperty("IceSSL.Protocols", "ssl3"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -513,7 +506,7 @@ public class AllTests comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -540,14 +533,13 @@ public class AllTests // // This should fail because the server's certificate is expired. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1_exp.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -578,7 +570,7 @@ public class AllTests comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -606,14 +598,13 @@ public class AllTests Console.Out.Write("testing multiple CA certificates... "); Console.Out.Flush(); { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca2.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.VerifyPeer"] = "2"; @@ -641,8 +632,7 @@ public class AllTests // // Test password failure. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); // Don't specify the password. //props.setProperty("IceSSL.Password", "password"); @@ -664,8 +654,7 @@ public class AllTests // // Test password failure with callback. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); @@ -693,8 +682,7 @@ public class AllTests // // Test installation of password callback. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); @@ -718,8 +706,7 @@ public class AllTests // // Test password callback property. // - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.PasswordCallback", "PasswordCallbackI"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); @@ -734,8 +721,7 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly... "); Console.Out.Flush(); { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -747,7 +733,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -765,8 +751,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -778,7 +763,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -796,8 +781,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -809,7 +793,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -827,8 +811,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -838,7 +821,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly"] = @@ -858,8 +841,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -870,7 +852,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -888,8 +870,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -899,7 +880,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly"] = "CN=Client"; @@ -918,8 +899,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -930,7 +910,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -948,8 +928,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -959,7 +938,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly"] = "CN=Server"; @@ -978,8 +957,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -990,7 +968,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -1008,8 +986,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1020,7 +997,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -1042,8 +1019,7 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly.Client... "); Console.Out.Flush(); { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1055,7 +1031,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly.Client"] = @@ -1075,8 +1051,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1087,7 +1062,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; store.Add(caCert1); @@ -1109,8 +1084,7 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly.Server... "); Console.Out.Flush(); { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1122,7 +1096,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly.Server"] = @@ -1142,8 +1116,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1153,7 +1126,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly.Server"] = "CN=Server"; @@ -1176,8 +1149,7 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly.Server.<AdapterName>... "); Console.Out.Flush(); { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1187,7 +1159,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly.Server"] = "CN=bogus"; @@ -1208,8 +1180,7 @@ public class AllTests comm.destroy(); } { - Ice.InitializationData initData = - createClientProps(defaultProperties, testDir, defaultHost, threadPool); + Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx"); initData.properties.setProperty("IceSSL.Password", "password"); @@ -1219,7 +1190,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost, threadPool); + Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost); d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx"; d["IceSSL.Password"] = "password"; d["IceSSL.TrustOnly.Server.ServerAdapter"] = "CN=bogus"; diff --git a/cs/test/IceSSL/configuration/Client.cs b/cs/test/IceSSL/configuration/Client.cs index ea962ab5041..dacb9ad78fd 100644 --- a/cs/test/IceSSL/configuration/Client.cs +++ b/cs/test/IceSSL/configuration/Client.cs @@ -28,15 +28,8 @@ public class Client } Test.ServerFactoryPrx factory; - - Console.Out.WriteLine("testing with thread-per-connection."); - factory = AllTests.allTests(communicator, args[0], false); - if(factory != null) - { - Console.Out.WriteLine("testing with thread pool."); - AllTests.allTests(communicator, args[0], true); - factory.shutdown(); - } + factory = AllTests.allTests(communicator, args[0]); + factory.shutdown(); return 0; } diff --git a/cs/test/IceSSL/configuration/Makefile.mak b/cs/test/IceSSL/configuration/Makefile.mak index 19fbd57ddf4..a987fd12841 100644 --- a/cs/test/IceSSL/configuration/Makefile.mak +++ b/cs/test/IceSSL/configuration/Makefile.mak @@ -28,9 +28,9 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --ice -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\IceSSL.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\IceSSL.dll $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll -r:$(bindir)\IceSSL.dll $(S_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll -r:$(refdir)\IceSSL.dll $(S_SRCS) $(GEN_SRCS) !include .depend diff --git a/cs/test/IceUtil/inputUtil/Makefile.mak b/cs/test/IceUtil/inputUtil/Makefile.mak index dd9e2b8ab23..12c44bc19f9 100644 --- a/cs/test/IceUtil/inputUtil/Makefile.mak +++ b/cs/test/IceUtil/inputUtil/Makefile.mak @@ -23,4 +23,4 @@ GDIR = generated MCSFLAGS = $(MCSFLAGS) -target:exe client.exe: $(C_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) diff --git a/cs/test/Slice/keyword/Makefile.mak b/cs/test/Slice/keyword/Makefile.mak index abcb02262df..adc0e7326e7 100644 --- a/cs/test/Slice/keyword/Makefile.mak +++ b/cs/test/Slice/keyword/Makefile.mak @@ -27,6 +27,6 @@ MCSFLAGS = $(MCSFLAGS) -target:exe SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream client.exe: $(C_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\Ice.dll $(C_SRCS) $(GEN_SRCS) + $(MCS) $(MCSFLAGS) -out:$@ -r:$(refdir)\Ice.dll $(C_SRCS) $(GEN_SRCS) !include .depend diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py index 9d036c198a6..a839d19abed 100755 --- a/java/test/Glacier2/attack/run.py +++ b/java/test/Glacier2/attack/run.py @@ -23,7 +23,7 @@ TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) -router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = r' --Ice.PrintProcessId' \ r' --Glacier2.RoutingTable.MaxSize=10' + \ diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py index 6c3f8ba7ae0..c81b0945089 100755 --- a/java/test/Glacier2/router/run.py +++ b/java/test/Glacier2/router/run.py @@ -23,7 +23,7 @@ TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) -router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") +router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = r' --Ice.Warn.Dispatch=0' + \ r' --Ice.Warn.Connections=0' + \ diff --git a/makedist.py b/makedist.py index 0441cedefea..71da29a0361 100755 --- a/makedist.py +++ b/makedist.py @@ -109,7 +109,7 @@ def copy(srcpath, destpath): if os.path.exists(destpath): print "warning: overwritting " + destpath - shutil.copyfile(srcpath, destpath) + shutil.copy(srcpath, destpath) fixFilePermission(destpath) # @@ -514,6 +514,8 @@ for root, dirnames, filesnames in os.walk('.'): os.rename("distribution", os.path.join("..", "distribution")) # Move the distribution directory to the top-level os.rename("demoscript", os.path.join(demoscriptDistDir, "demoscript")) # Move the demoscript directory +os.mkdir(os.path.join(demoscriptDistDir, "config")) +copy(os.path.join("config", "DemoUtil.py"), os.path.join(demoscriptDistDir, "config")) print "ok" @@ -549,14 +551,14 @@ copyMatchingFiles(os.path.join("cs", "config"), os.path.join(demoDistDir, "confi for d in os.listdir('.'): if os.path.isdir(d) and os.path.exists(os.path.join(d, "allDemos.py")): - os.rename(os.path.join(d, "allDemos.py"), os.path.join(demoscriptDistDir, d, "allDemos.py")) - os.rename(os.path.join(demoscriptDistDir, d), os.path.join(demoscriptDistDir, getMappingDir("demo", d))) + md = os.path.join(demoscriptDistDir, getMappingDir("demo", d)) + os.rename(os.path.join(demoscriptDistDir, d, "demo"), md) + os.rename(os.path.join(d, "allDemos.py"), os.path.join(md, "allDemos.py")) if os.path.isdir(d) and os.path.exists(os.path.join(d, "demo")): copytree(os.path.join(d, "demo"), os.path.join(demoDistDir, getMappingDir("demo", d))) rmFilesForUnix = [] -rmFilesForMsi = [ "README.DEMOS", "ICE_LICENSE" ] configSubstituteExprs = [(re.compile(regexpEscape("../../certs")), "../certs")] exeConfigSubstituteExprs = [(re.compile(regexpEscape("\\..\\cs")), "")] for root, dirnames, filesnames in os.walk(demoDistDir): @@ -573,19 +575,7 @@ for root, dirnames, filesnames in os.walk(demoDistDir): if fnmatch.fnmatch(f, m): rmFilesForUnix.append(os.path.join(root[len(demoDistDir) + 1:], f)) - for m in [ "Make*"]: - if fnmatch.fnmatch(f, m): - rmFilesForMsi.append(os.path.join(root[len(demoDistDir) + 1:], f)) - -# -# Copy Ice-x.y.z-demos to Ice-x.y.z-demos-for-msi -# -demoMsiDistDir = os.path.join(distDir, "Ice-" + version + "-demos-for-msi") -copytree(demoDistDir, demoMsiDistDir) - -# Remove files from Msi and Unix demo distributions. for f in rmFilesForUnix: os.remove(os.path.join(demoDistDir, f)) -for f in rmFilesForMsi: os.remove(os.path.join(demoMsiDistDir, f)) print "ok" # @@ -614,14 +604,27 @@ print "Archiving..." sys.stdout.flush() os.chdir(distDir) os.rename("distribution", "distfiles-" + version) -for d in [srcDistDir, demoDistDir, demoscriptDistDir, "distfiles-" + version, rpmBuildDistDir]: +for d in [srcDistDir, demoDistDir, "distfiles-" + version, rpmBuildDistDir]: dist = os.path.basename(d) print " creating " + dist + ".tar.gz ...", sys.stdout.flush() os.system("tar c" + quiet + "f - " + dist + " | gzip -9 - > " + dist + ".tar.gz") print "ok" -for d in [srcDistDir, demoDistDir, demoMsiDistDir]: +for (d, archiveDir) in [(demoscriptDistDir, "Ice-" + version + "-demos")]: + dist = os.path.basename(d) + print " creating " + dist + ".tar.gz ...", + sys.stdout.flush() + os.mkdir("tmp") + os.rename(dist, os.path.join("tmp", archiveDir)) + os.chdir("tmp") + os.system("tar c" + quiet + "f - " + archiveDir + " | gzip -9 - > " + os.path.join("..", dist) + ".tar.gz") + os.chdir("..") + os.rename(os.path.join("tmp", archiveDir), dist) + os.rmdir("tmp") + print "ok" + +for d in [srcDistDir, demoDistDir]: dist = os.path.basename(d) print " creating " + dist + ".zip ...", sys.stdout.flush() @@ -658,7 +661,6 @@ sys.stdout.flush() rmtree(os.path.join(distDir, "distfiles-" + version)) rmtree(srcDistDir) rmtree(demoDistDir) -rmtree(demoMsiDistDir) rmtree(demoscriptDistDir) rmtree(rpmBuildDistDir) print "ok" |