diff options
252 files changed, 200 insertions, 4240 deletions
diff --git a/config/IceGridAdmin.py b/config/IceGridAdmin.py index 162c27e2b21..0cf8ad49e78 100644 --- a/config/IceGridAdmin.py +++ b/config/IceGridAdmin.py @@ -77,7 +77,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): - iceGrid = os.path.join(TestUtil.getIceCppDir(), "bin", "icegridregistry") + iceGrid = os.path.join(TestUtil.getIceDir("cpp"), "bin", "icegridregistry") command = ' --nowarn ' + registryOptions if dynamicRegistration: @@ -131,7 +131,7 @@ def shutdownIceGridRegistry(): def startIceGridNode(testdir): - iceGrid = os.path.join(TestUtil.getIceCppDir(), "bin", "icegridnode") + iceGrid = os.path.join(TestUtil.getIceDir("cpp"), "bin", "icegridnode") dataDir = os.path.join(testdir, "db", "node") if not os.path.exists(dataDir): @@ -170,7 +170,7 @@ def startIceGridNode(testdir): def iceGridAdmin(cmd, ignoreFailure = False): - iceGridAdmin = os.path.join(TestUtil.getIceCppDir(), "bin", "icegridadmin") + iceGridAdmin = os.path.join(TestUtil.getIceDir("cpp"), "bin", "icegridadmin") user = r"admin1" if cmd == "registry shutdown": @@ -219,7 +219,7 @@ def iceGridTest(testdir, name, application, additionalOptions = "", applicationO if application != "": print "adding application...", iceGridAdmin('application add ' + os.path.join(testdir, application) + ' ' + \ - '"test.dir=' + testdir + '" "ice.dir=' + TestUtil.getIceCppDir() + '" ' + applicationOptions) + '"test.dir=' + testdir + '" "ice.dir=' + TestUtil.getIceDir("cpp") + '" ' + applicationOptions) print "ok" print "starting client...", diff --git a/config/Make.common.rules b/config/Make.common.rules index a58e39c25c8..f73340f6b63 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -33,6 +33,10 @@ ifndef ice_language $(error ice_language must be defined) endif +ifeq ($(USE_BIN_DIST),yes) +ice_bin_dist = 1 +endif + # # The following variables might also be defined: # @@ -52,36 +56,34 @@ endif # defined to the directory containing the C++ binaries and headers to # use to build the sources. # -ifeq ($(shell test -d $(top_srcdir)/../$(ice_language) && echo 0),0) - - ice_dir = $(top_srcdir)/.. - ice_src_dist = 1 - - # - # When building a source distribution, if ICE_HOME is specified, it takes precedence over - # the source tree for building the language mappings. For example, this can be used to - # build the Python language mapping using the translators from the distribution specified - # by ICE_HOME. - # - ifneq ($(ICE_HOME),) - - ifdef slice_translator - ifneq ($(shell test -f $(ICE_HOME)/bin/$(slice_translator) && echo 0), 0) +ifndef ice_bin_dist + ifeq ($(shell test -d $(top_srcdir)/../$(ice_language) && echo 0),0) + ice_dir = $(top_srcdir)/.. + ice_src_dist = 1 + + # + # When building a source distribution, if ICE_HOME is specified, it takes precedence over + # the source tree for building the language mappings. For example, this can be used to + # build the Python language mapping using the translators from the distribution specified + # by ICE_HOME. + # + ifneq ($(ICE_HOME),) + ifdef slice_translator + ifneq ($(shell test -f $(ICE_HOME)/bin/$(slice_translator) && echo 0), 0) $(error Unable to find $(slice_translator) in $(ICE_HOME), please verify ICE_HOME is properly configured and Ice is correctly installed.) - endif - ice_cpp_dir = $(ICE_HOME) - else + endif + ifeq ($(shell test -f $(ice_dir)/cpp/bin/$(slice_translator) && echo 0), 0) +$(warning Found $(slice_translator) in both ICE_HOME/bin and $(ice_dir)/cpp/bin, ICE_HOME/bin/$(slice_translator) will be used!) + endif + ice_cpp_dir = $(ICE_HOME) + else $(warning Ignoring ICE_HOME environment variable to build current source tree.) + ice_cpp_dir = $(ice_dir)/cpp + endif + else ice_cpp_dir = $(ice_dir)/cpp endif - - ifeq ($(shell test -f $(ice_dir)/cpp/bin/$(slice_translator) && echo 0), 0) -$(warning Found $(slice_translator) in both ICE_HOME/bin and $(ice_dir)/cpp/bin, ICE_HOME/bin/$(slice_translator) will be used!) - endif - else - ice_cpp_dir = $(ice_dir)/cpp endif - endif # @@ -126,12 +128,12 @@ endif # ifeq ($(ice_require_cpp), "yes") ifdef ice_src_dist - ice_cpp_header = $(ice_cpp_dir)/include/Ice/Config.h + ice_cpp_header = $(ice_cpp_dir)/include/Ice/Ice.h else - ice_cpp_header = $(ice_dir)/include/Ice/Config.h + ice_cpp_header = $(ice_dir)/include/Ice/Ice.h endif ifneq ($(shell test -f $(ice_cpp_header) && echo 0),0) -$(error Unable to find the C++ header files in $(ice_dir), please verify ICE_HOME is properly configured and Ice is correctly installed.) +$(error Unable to find the C++ header file $(ice_cpp_header), please verify ICE_HOME is properly configured and Ice is correctly installed.) endif endif diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 67e35b7f399..60008c609f1 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -24,6 +24,10 @@ OBJEXT = .obj !error ice_language must be defined !endif +!if "$(USE_BIN_DIST)" == "yes" +ice_bin_dist = 1 +!endif + # # The following variables might also be defined: # @@ -43,7 +47,7 @@ OBJEXT = .obj # defined to the directory containing the C++ binaries and headers to # use to build the sources. # -!if exist ($(top_srcdir)\..\$(ice_language)) +!if "$(ice_bin_dist)" == "" && exist ($(top_srcdir)\..\$(ice_language)) ice_dir = $(top_srcdir)\.. ice_src_dist = 1 @@ -109,12 +113,12 @@ ice_bin_dist = 1 # !if "$(ice_require_cpp)" == "yes" !if "$(ice_src_dist)" != "" -ice_cpp_header = $(ice_cpp_dir)\include\Ice\Config.h +ice_cpp_header = $(ice_cpp_dir)\include\Ice\Ice.h !else -ice_cpp_header = $(ice_dir)\include\Ice\Config.h +ice_cpp_header = $(ice_dir)\include\Ice\Ice.h !endif !if !exist ($(ice_cpp_header)) -!error Unable to find a valid Ice distribution with the C++ header files, please verify ICE_HOME is properly configured and Ice is correctly installed. +!error Unable to find the C++ header file $(ice_cpp_header), please verify ICE_HOME is properly configured and Ice is correctly installed. !endif !endif diff --git a/config/TestUtil.py b/config/TestUtil.py index 2fe8002477e..a14f3214699 100755 --- a/config/TestUtil.py +++ b/config/TestUtil.py @@ -20,6 +20,7 @@ debug = 0 # Set to 1 to enable test suite debugging. mono = 0 # Set to 1 to use Mono as the default .NET CLR. keepGoing = 0 # Set to 1 to have the tests continue on failure. ipv6 = 0 # Default to use IPv4 only +ice_home = None # Binary distribution to use (None to use binaries from source distribution) javaCmd = "java" # Default java loader phpCmd = "php" # Name of default php binary (usually php or php5) @@ -36,32 +37,31 @@ def configurePaths(): toplevel = findTopLevel() if isWin32(): - os.environ["PATH"] = os.path.join(toplevel, "cpp", "bin") + os.pathsep + os.getenv("PATH", "") - elif isHpUx(): - os.environ["SHLIB_PATH"] = os.path.join(toplevel, "cpp", "lib") + os.pathsep + os.getenv("SHLIB_PATH", "") - elif isDarwin(): - os.environ["DYLD_LIBRARY_PATH"] = os.path.join(toplevel, "cpp", "lib") + os.pathsep + os.getenv("DYLD_LIBRARY_PATH", "") - elif isAIX(): - os.environ["LIBPATH"] = os.path.join(toplevel, "cpp", "lib") + os.pathsep + os.getenv("LIBPATH", "") - else: - os.environ["LD_LIBRARY_PATH"] = os.path.join(toplevel, "cpp", "lib") + os.pathsep + os.getenv("LD_LIBRARY_PATH", "") - os.environ["LD_LIBRARY_PATH_64"] = os.path.join(toplevel, "cpp", "lib") + os.pathsep + os.getenv("LD_LIBRARY_PATH_64", "") - - os.environ["CLASSPATH"] = os.path.join(toplevel, "java", "lib", "Ice.jar") + os.pathsep + os.getenv("CLASSPATH", "") - os.environ["CLASSPATH"] = os.path.join(toplevel, "java", "lib") + os.pathsep + os.getenv("CLASSPATH", "") - - if isWin32(): - # This isn't needed, each test executable has a configuration file that specfies the assemblies to use. - #os.environ["PATH"] = os.path.join(toplevel, "cs", "bin") + os.pathsep + os.getenv("PATH", "") - pass + os.environ["PATH"] = os.path.join(getIceDir("cpp"), "bin") + os.pathsep + os.getenv("PATH", "") else: - os.environ["MONO_PATH"] = os.path.join(toplevel, "cs", "bin") + os.pathsep + os.getenv("MONO_PATH", "") - - # Not necessary, the tests look for python directly - #os.environ["PYTHONPATH"] = os.path.join(toplevel, "py", "python") + os.pathsep + os.getenv("PYTHONPATH", "") + libDir = os.path.join(getIceDir("cpp"), "lib") + if isHpUx(): + os.environ["SHLIB_PATH"] = libDir + os.pathsep + os.getenv("SHLIB_PATH", "") + elif isDarwin(): + os.environ["DYLD_LIBRARY_PATH"] = libDir + os.pathsep + os.getenv("DYLD_LIBRARY_PATH", "") + elif isAIX(): + os.environ["LIBPATH"] = libDir + os.pathsep + os.getenv("LIBPATH", "") + else: + os.environ["LD_LIBRARY_PATH"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH", "") + os.environ["LD_LIBRARY_PATH_64"] = libDir + os.pathsep + os.getenv("LD_LIBRARY_PATH_64", "") + + javaDir = getIceDir("java") + os.environ["CLASSPATH"] = os.path.join(javaDir, "lib", "Ice.jar") + os.pathsep + os.getenv("CLASSPATH", "") + os.environ["CLASSPATH"] = os.path.join(javaDir, "lib") + os.pathsep + os.getenv("CLASSPATH", "") - # Not necessary, the tests look for ruby directly - #os.environ["RUBYLIB"] = os.path.join(toplevel, "rb", "ruby") + os.pathsep + os.getenv("RUBYLIB", "") + # + # On Windows, C# assemblies are found thanks to the .exe.config files. + # + if not isWin32(): + 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", "") + os.environ["RUBYLIB"] = os.path.join(getIceDir("rb"), "ruby") + os.pathsep + os.getenv("RUBYLIB", "") def addLdPath(libpath): if isWin32(): @@ -129,6 +129,7 @@ def run(tests, root = False): --continue Keep running when a test fails --ipv6 Use IPv6 addresses. --mono Use mono when running C# tests. + --ice-home=<path> Use the binary distribution from the given path. """ sys.exit(2) @@ -136,7 +137,7 @@ def run(tests, root = False): opts, args = getopt.getopt(sys.argv[1:], "lr:R:", ["start=", "start-after=", "filter=", "rfilter=", "all", "loop", "debug", "protocol=", "compress", "host=", "threadPerConnection", "continue", "ipv6", - "mono"]) + "mono", "ice-home="]) except getopt.GetoptError: usage() @@ -173,7 +174,8 @@ def run(tests, root = False): if a not in ( "ssl", "tcp"): usage() - if o in ( "--protocol", "--host", "--debug", "--compress", "--threadPerConnection", "--ipv6", "--mono"): + if o in ( "--protocol", "--host", "--debug", "--compress", "--threadPerConnection", "--ipv6", "--mono", \ + "--ice-home"): arg += " " + o if len(a) > 0: arg += " " + a @@ -242,14 +244,20 @@ def findTopLevel(): return toplevel -def getIceCppDir(): - - # - # TODO: Right now, we simply return the source distribution cpp directory. In - # the future we could allow running the tests against a binary distribution - # specified with ICE_HOME? +def getIceDir(subdir = None): # - return os.path.join(findTopLevel(), "cpp") + # If ICE_HOME is set we're running the test against a binary distribution. Otherwise, + # we're running the test against a source distribution. + # + global ice_home + if ice_home: + return ice_home + if os.environ.has_key("ICE_HOME"): + return os.environ["ICE_HOME"] + elif subdir: + return os.path.join(findTopLevel(), subdir) + else: + return findTopLevel() findTopLevel() configurePaths() @@ -502,11 +510,11 @@ def getIceBox(testdir): build = open(os.path.join(testdir, "build.txt"), "r") type = build.read().strip() if type == "debug": - iceBox = os.path.join(getBinDir(testdir), "iceboxd.exe") + iceBox = os.path.join(getIceDir("cpp"), "bin", "iceboxd.exe") elif type == "release": - iceBox = os.path.join(getBinDir(testdir), "icebox.exe") + iceBox = os.path.join(getIceDir("cpp"), "bin", "icebox.exe") else: - iceBox = os.path.join(getBinDir(testdir), "icebox") + iceBox = os.path.join(getIceDir("cpp"), "bin", "icebox") if not os.path.exists(iceBox): print "couldn't find icebox executable to run the test" @@ -514,7 +522,7 @@ def getIceBox(testdir): elif lang == "java": iceBox = "IceBox.Server" elif lang == "cs": - iceBox = os.path.join(getBinDir(testdir), "iceboxnet") + iceBox = os.path.join(getIceDir("cs"), "bin", "iceboxnet") if iceBox == "": print "couldn't find icebox executable to run the test" @@ -1026,7 +1034,7 @@ def getMappingDir(currentDir): return os.path.abspath(os.path.join(findTopLevel(), getDefaultMapping(currentDir))) def getBinDir(currentDir): - return os.path.abspath(os.path.join(getMappingDir(currentDir), "bin")) + return os.path.join(getIceDir(getMappingDir(currentDir)), "bin") def getCertsDir(currentDir): return os.path.abspath(os.path.join(findTopLevel(), "certs")) @@ -1041,12 +1049,14 @@ def processCmdLine(): --threadPerConnection Run with thread-per-connection concurrency model. --ipv6 Use IPv6 addresses. --mono Use mono when running C# tests. + --ice-home=<path> Use the binary distribution from the given path. """ sys.exit(2) try: opts, args = getopt.getopt( - sys.argv[1:], "", ["debug", "protocol=", "compress", "host=", "threadPerConnection", "ipv6", "mono"]) + sys.argv[1:], "", ["debug", "protocol=", "compress", "host=", "threadPerConnection", "ipv6", "mono", \ + "ice-home="]) except getopt.GetoptError: usage() @@ -1057,6 +1067,9 @@ def processCmdLine(): if o in ["--mono"]: global mono mono = 1 + elif o == "--ice-home": + global ice_home + ice_home = a elif o == "--compress": global compress compress = 1 diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index ed6f03c25ac..f8abdc0937b 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -115,9 +115,9 @@ USE_READLINE ?= no # Common definitions # ice_language = cpp -ifneq ($(shell test -d $(top_srcdir)/../cpp && echo 0),0) - # Don't check for slice2cpp in ICE_HOME if building the source distribution +ifneq ($(shell test "$(USE_BIN_DIST)" != "yes" -a -d $(top_srcdir)/../$(ice_language) && echo 0),0) slice_translator = slice2cpp + ice_require_cpp = 1 endif ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0) diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 8c147dd040e..7f0251747dd 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -86,9 +86,9 @@ MT = mt.exe # Common definitions # ice_language = cpp -!if !exist ($(top_srcdir)\..\cpp) -# Don't check for slice2cpp in ICE_HOME if building the source distribution +!if "$(USE_BIN_DIST)" == "yes" || !exist ($(top_srcdir)\..\cpp) slice_translator = slice2cpp.exe +ice_require_cpp = 1 !endif !if exist ($(top_srcdir)\..\config\Make.common.rules) diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py index bba63dcc45e..d2514a34df1 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(toplevel, "cpp", "bin", "transformdb") +transformdb = os.path.join(TestUtil.getBinDir(directory), "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 eac5e2a36e9..e5d155f3f75 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(toplevel, "cpp", "bin", "transformdb") +transformdb = os.path.join(TestUtil.getBinDir(directory), "transformdb") dbdir = os.path.join(directory, "db") TestUtil.cleanDbDir(dbdir) diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 2641badd573..77e75df725f 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -52,7 +52,7 @@ IceGridAdmin.registryOptions += \ r' --IceGrid.Registry.SSLPermissionsVerifier="SSLPermissionsVerifier"' IceGridAdmin.iceGridTest(testdir, name, "application.xml", \ - "--IceDir=\"" + TestUtil.getMappingDir(__file__) + "\" --TestDir=\"" + testdir + "\"", \ + "--IceDir=\"" + TestUtil.getIceDir("cpp") + "\" --TestDir=\"" + testdir + "\"", \ '\\"properties-override=' + \ TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") + '\\"') diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py index 07133c53ad6..4ca99cbaf5b 100755 --- a/cpp/test/IceGrid/update/run.py +++ b/cpp/test/IceGrid/update/run.py @@ -37,7 +37,7 @@ if not os.path.exists(node2Dir): else: IceGridAdmin.cleanDbDir(node2Dir) -nodeOverrideOptions = "--IceDir=\"" + TestUtil.getMappingDir(__file__) + "\" --TestDir=\"" + testdir + "\"" + \ +nodeOverrideOptions = "--IceDir=\"" + TestUtil.getIceDir("cpp") + "\" --TestDir=\"" + testdir + "\"" + \ ' --NodePropertiesOverride="' + \ TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "") + \ ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0' + '"' diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index 81554dfc998..8dcb60d5454 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(__file__), "slice2cpp") +slice2cpp = os.path.join(TestUtil.getIceDir("cpp"), "bin", "slice2cpp") regex1 = re.compile(r"\.ice$", re.IGNORECASE) files = [] diff --git a/cs/config/Make.rules.cs b/cs/config/Make.rules.cs index 79db835acd1..87d97586a9a 100644 --- a/cs/config/Make.rules.cs +++ b/cs/config/Make.rules.cs @@ -127,7 +127,7 @@ GEN_AMD_SRCS = $(subst .ice,.cs,$(addprefix $(GDIR)/,$(notdir $(SLICE_AMD_SRCS)) SAMD_GEN_SRCS = $(subst .ice,.cs,$(addprefix $(GDIR)/,$(notdir $(SLICE_SAMD_SRCS)))) -EVERYTHING = all depend clean install config +EVERYTHING = all depend clean install .SUFFIXES: .SUFFIXES: .cs .ice @@ -166,9 +166,6 @@ depend:: $(SLICE_SRCS) $(SLICE_C_SRCS) $(SLICE_S_SRCS) $(SLICE_AMD_SRCS) $(SLICE clean:: -rm -f $(TARGETS) $(patsubst %,%.mdb,$(TARGETS)) *.bak *.dll *.pdb *.mdb -config:: - $(top_srcdir)/config/makeconfig.py $(top_srcdir) $(TARGETS) - ifneq ($(SLICE_SRCS),) clean:: -rm -f $(GEN_SRCS) diff --git a/cs/config/Make.rules.mak.cs b/cs/config/Make.rules.mak.cs index 994565652d8..3faed70b270 100644 --- a/cs/config/Make.rules.mak.cs +++ b/cs/config/Make.rules.mak.cs @@ -99,7 +99,7 @@ SLICE2CS = "$(ice_cpp_dir)\bin\slice2cs.exe" SLICE2CS = "$(ice_dir)\bin\slice2cs.exe" !endif -EVERYTHING = all clean install +EVERYTHING = all clean install config .SUFFIXES: .SUFFIXES: .cs .ice @@ -110,10 +110,23 @@ EVERYTHING = all clean install {$(SDIR)\}.ice{$(GDIR)}.cs: $(SLICE2CS) --output-dir $(GDIR) $(SLICE2CSFLAGS) $< -all:: $(TARGETS) +!if "$(TARGETS_CONFIG)" != "" +$(TARGETS_CONFIG): +!if "$(ice_src_dist)" != "" + @echo Generating $(TARGETS_CONFIG) ... && \ + python "$(top_srcdir)/config/makeconfig.py" "$(top_srcdir)" $(TARGETS_CONFIG:.exe.config=.exe) +!else + @echo Generating $(TARGETS_CONFIG) ... && \ + python "$(top_srcdir)/config/makeconfig.py" "$(ice_dir)" $(TARGETS_CONFIG:.exe.config=.exe) +!endif +!endif + +all:: $(TARGETS) $(TARGETS_CONFIG) + +config:: $(TARGETS_CONFIG) clean:: - del /q $(TARGETS) *.pdb + del /q $(TARGETS) $(TARGETS_CONFIG) *.pdb !if "$(GEN_SRCS)" != "" clean:: diff --git a/cs/config/makeconfig.py b/cs/config/makeconfig.py index a53faaa3b79..09be413594d 100755 --- a/cs/config/makeconfig.py +++ b/cs/config/makeconfig.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import sys +import sys, os def usage(): print sys.argv[0] + " top_srcdir file1 file2 ..." @@ -19,10 +19,11 @@ if len(sys.argv) < 2: assemblies = ['glacier2cs', 'icecs', 'icepatch2cs', 'icestormcs', 'iceboxcs', 'icegridcs', 'icesslcs'] -top_srcdir = sys.argv[1] +top_srcdir = os.path.normpath(sys.argv[1]) for s in sys.argv[2:]: if s[len(s)-4:] != ".exe": continue + f = file(s + ".config", 'w') f.write('<?xml version="1.0"?>\n'); f.write(' <configuration>\n'); @@ -31,7 +32,7 @@ for s in sys.argv[2:]: for a in assemblies: f.write(" <dependentAssembly>\n"); f.write(' <assemblyIdentity name="' + a + '" culture="neutral" publicKeyToken="1f998c50fec78381"/>\n'); - f.write(' <codeBase version="3.3.0.0" href="' + top_srcdir + '/bin/' + a + '.dll"/>\n'); + f.write(' <codeBase version="3.3.0.0" href="' + top_srcdir + '\\bin\\' + a + '.dll"/>\n'); f.write(' </dependentAssembly>\n'); f.write(' </assemblyBinding>\n'); f.write(' </runtime>\n'); diff --git a/cs/demo/Glacier2/callback/Makefile.mak b/cs/demo/Glacier2/callback/Makefile.mak index 73380c68ffc..a466381143a 100644 --- a/cs/demo/Glacier2/callback/Makefile.mak +++ b/cs/demo/Glacier2/callback/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe sessionserver.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = CallbackReceiverI.cs Client.cs S_SRCS = CallbackI.cs Server.cs diff --git a/cs/demo/Glacier2/callback/client.exe.config b/cs/demo/Glacier2/callback/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Glacier2/callback/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Glacier2/callback/server.exe.config b/cs/demo/Glacier2/callback/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Glacier2/callback/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Glacier2/callback/sessionserver.exe.config b/cs/demo/Glacier2/callback/sessionserver.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Glacier2/callback/sessionserver.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/async/Makefile.mak b/cs/demo/Ice/async/Makefile.mak index 57a55572a4b..8e478221c99 100644 --- a/cs/demo/Ice/async/Makefile.mak +++ b/cs/demo/Ice/async/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = HelloI.cs \ diff --git a/cs/demo/Ice/async/client.exe.config b/cs/demo/Ice/async/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/async/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/async/server.exe.config b/cs/demo/Ice/async/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/async/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/bidir/Makefile.mak b/cs/demo/Ice/bidir/Makefile.mak index 62e6bb4afe7..a4f4a8b0a79 100644 --- a/cs/demo/Ice/bidir/Makefile.mak +++ b/cs/demo/Ice/bidir/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = CallbackReceiverI.cs Client.cs S_SRCS = CallbackSenderI.cs Server.cs diff --git a/cs/demo/Ice/bidir/client.exe.config b/cs/demo/Ice/bidir/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/bidir/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/bidir/server.exe.config b/cs/demo/Ice/bidir/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/bidir/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/callback/Makefile.mak b/cs/demo/Ice/callback/Makefile.mak index 62e6bb4afe7..a4f4a8b0a79 100644 --- a/cs/demo/Ice/callback/Makefile.mak +++ b/cs/demo/Ice/callback/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = CallbackReceiverI.cs Client.cs S_SRCS = CallbackSenderI.cs Server.cs diff --git a/cs/demo/Ice/callback/client.exe.config b/cs/demo/Ice/callback/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/callback/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/callback/server.exe.config b/cs/demo/Ice/callback/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/callback/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/hello/Makefile.mak b/cs/demo/Ice/hello/Makefile.mak index b1f5519449d..03657449853 100644 --- a/cs/demo/Ice/hello/Makefile.mak +++ b/cs/demo/Ice/hello/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = HelloI.cs Server.cs diff --git a/cs/demo/Ice/hello/client.exe.config b/cs/demo/Ice/hello/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/hello/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/hello/server.exe.config b/cs/demo/Ice/hello/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/hello/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/invoke/Makefile.mak b/cs/demo/Ice/invoke/Makefile.mak index 6bf30675a05..59631dc7d81 100644 --- a/cs/demo/Ice/invoke/Makefile.mak +++ b/cs/demo/Ice/invoke/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = PrinterI.cs Server.cs diff --git a/cs/demo/Ice/invoke/client.exe.config b/cs/demo/Ice/invoke/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/invoke/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/invoke/server.exe.config b/cs/demo/Ice/invoke/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/invoke/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/latency/Makefile.mak b/cs/demo/Ice/latency/Makefile.mak index 564997943cb..ecbcaea6007 100644 --- a/cs/demo/Ice/latency/Makefile.mak +++ b/cs/demo/Ice/latency/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = Server.cs diff --git a/cs/demo/Ice/latency/client.exe.config b/cs/demo/Ice/latency/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/latency/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/latency/server.exe.config b/cs/demo/Ice/latency/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/latency/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/minimal/Makefile.mak b/cs/demo/Ice/minimal/Makefile.mak index b1f5519449d..03657449853 100644 --- a/cs/demo/Ice/minimal/Makefile.mak +++ b/cs/demo/Ice/minimal/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = HelloI.cs Server.cs diff --git a/cs/demo/Ice/minimal/client.exe.config b/cs/demo/Ice/minimal/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/minimal/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/minimal/server.exe.config b/cs/demo/Ice/minimal/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/minimal/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/multicast/Makefile.mak b/cs/demo/Ice/multicast/Makefile.mak index 11b64383037..bcb1c619706 100644 --- a/cs/demo/Ice/multicast/Makefile.mak +++ b/cs/demo/Ice/multicast/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = DiscoverReplyI.cs Client.cs S_SRCS = DiscoverI.cs HelloI.cs Server.cs diff --git a/cs/demo/Ice/multicast/client.exe.config b/cs/demo/Ice/multicast/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/multicast/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/multicast/server.exe.config b/cs/demo/Ice/multicast/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/multicast/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/nested/Makefile.mak b/cs/demo/Ice/nested/Makefile.mak index c46ef5986ef..a899cd40b8e 100644 --- a/cs/demo/Ice/nested/Makefile.mak +++ b/cs/demo/Ice/nested/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs NestedI.cs S_SRCS = Server.cs NestedI.cs diff --git a/cs/demo/Ice/nested/client.exe.config b/cs/demo/Ice/nested/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/nested/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/nested/server.exe.config b/cs/demo/Ice/nested/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/nested/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/session/Makefile.mak b/cs/demo/Ice/session/Makefile.mak index 6735ed00cbf..212cdc16fa6 100644 --- a/cs/demo/Ice/session/Makefile.mak +++ b/cs/demo/Ice/session/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = HelloI.cs ReapThread.cs Server.cs SessionFactoryI.cs SessionI.cs diff --git a/cs/demo/Ice/session/client.exe.config b/cs/demo/Ice/session/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/session/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/session/server.exe.config b/cs/demo/Ice/session/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/session/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/throughput/Makefile.mak b/cs/demo/Ice/throughput/Makefile.mak index dff942b0d10..394d8785461 100644 --- a/cs/demo/Ice/throughput/Makefile.mak +++ b/cs/demo/Ice/throughput/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = Server.cs ThroughputI.cs diff --git a/cs/demo/Ice/throughput/client.exe.config b/cs/demo/Ice/throughput/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/throughput/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/throughput/server.exe.config b/cs/demo/Ice/throughput/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/throughput/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/value/Makefile.mak b/cs/demo/Ice/value/Makefile.mak index 179ba37709b..3825b55d29c 100644 --- a/cs/demo/Ice/value/Makefile.mak +++ b/cs/demo/Ice/value/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs DerivedPrinterI.cs ObjectFactory.cs PrinterI.cs S_SRCS = DerivedPrinterI.cs InitialI.cs PrinterI.cs Server.cs diff --git a/cs/demo/Ice/value/client.exe.config b/cs/demo/Ice/value/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/value/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/Ice/value/server.exe.config b/cs/demo/Ice/value/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/Ice/value/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/IceBox/hello/Makefile.mak b/cs/demo/IceBox/hello/Makefile.mak index 4ec0a1f02b3..7af4e80a8c3 100644 --- a/cs/demo/IceBox/hello/Makefile.mak +++ b/cs/demo/IceBox/hello/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe helloservice.dll +TARGETS_CONFIG = client.exe.config C_SRCS = Client.cs S_SRCS = HelloI.cs HelloServiceI.cs diff --git a/cs/demo/IceBox/hello/client.exe.config b/cs/demo/IceBox/hello/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/IceBox/hello/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/IceGrid/icebox/Makefile.mak b/cs/demo/IceGrid/icebox/Makefile.mak index d0b92fb537c..246a4a3dd1b 100644 --- a/cs/demo/IceGrid/icebox/Makefile.mak +++ b/cs/demo/IceGrid/icebox/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe helloservice.dll +TARGETS_CONFIG = client.exe.config C_SRCS = Client.cs S_SRCS = HelloI.cs HelloServiceI.cs diff --git a/cs/demo/IceGrid/icebox/client.exe.config b/cs/demo/IceGrid/icebox/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/IceGrid/icebox/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/IceGrid/simple/Makefile.mak b/cs/demo/IceGrid/simple/Makefile.mak index 4d5804f2864..bbeb880fcd8 100644 --- a/cs/demo/IceGrid/simple/Makefile.mak +++ b/cs/demo/IceGrid/simple/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = HelloI.cs Server.cs diff --git a/cs/demo/IceGrid/simple/client.exe.config b/cs/demo/IceGrid/simple/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/IceGrid/simple/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/IceGrid/simple/server.exe.config b/cs/demo/IceGrid/simple/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/IceGrid/simple/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/IceStorm/clock/Makefile.mak b/cs/demo/IceStorm/clock/Makefile.mak index 4c39deb0267..6cf8eda9656 100644 --- a/cs/demo/IceStorm/clock/Makefile.mak +++ b/cs/demo/IceStorm/clock/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = publisher.exe subscriber.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Publisher.cs S_SRCS = Subscriber.cs diff --git a/cs/demo/IceStorm/clock/publisher.exe.config b/cs/demo/IceStorm/clock/publisher.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/IceStorm/clock/publisher.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/IceStorm/clock/subscriber.exe.config b/cs/demo/IceStorm/clock/subscriber.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/IceStorm/clock/subscriber.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/book/lifecycle/Makefile.mak b/cs/demo/book/lifecycle/Makefile.mak index 68923ff168e..551c22de3ac 100644 --- a/cs/demo/book/lifecycle/Makefile.mak +++ b/cs/demo/book/lifecycle/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs Parser.cs Grammar.cs Scanner.cs Token.cs S_SRCS = DirectoryI.cs FileI.cs NodeI.cs Server.cs diff --git a/cs/demo/book/lifecycle/client.exe.config b/cs/demo/book/lifecycle/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/book/lifecycle/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/book/lifecycle/server.exe.config b/cs/demo/book/lifecycle/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/book/lifecycle/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/book/printer/Makefile.mak b/cs/demo/book/printer/Makefile.mak index 32368f9eae2..b6bfb196167 100644 --- a/cs/demo/book/printer/Makefile.mak +++ b/cs/demo/book/printer/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = Server.cs diff --git a/cs/demo/book/printer/client.exe.config b/cs/demo/book/printer/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/book/printer/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/book/printer/server.exe.config b/cs/demo/book/printer/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/book/printer/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/book/simple_filesystem/Makefile.mak b/cs/demo/book/simple_filesystem/Makefile.mak index a6599a19697..ad769286f2b 100644 --- a/cs/demo/book/simple_filesystem/Makefile.mak +++ b/cs/demo/book/simple_filesystem/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = DirectoryI.cs FileI.cs Server.cs diff --git a/cs/demo/book/simple_filesystem/client.exe.config b/cs/demo/book/simple_filesystem/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/book/simple_filesystem/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/demo/book/simple_filesystem/server.exe.config b/cs/demo/book/simple_filesystem/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/demo/book/simple_filesystem/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Glacier2/attack/Makefile.mak b/cs/test/Glacier2/attack/Makefile.mak index 7f71ab32950..8563b3aeaff 100644 --- a/cs/test/Glacier2/attack/Makefile.mak +++ b/cs/test/Glacier2/attack/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs S_SRCS = Server.cs BackendI.cs diff --git a/cs/test/Glacier2/attack/client.exe.config b/cs/test/Glacier2/attack/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Glacier2/attack/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py index c75548871db..7a8dbe06607 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.getIceCppDir(), "bin", "glacier2router") +router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") name = os.path.join("Glacier2", "router") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Glacier2/attack/server.exe.config b/cs/test/Glacier2/attack/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Glacier2/attack/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Glacier2/router/Makefile.mak b/cs/test/Glacier2/router/Makefile.mak index e145ab974ff..59f24ba359e 100644 --- a/cs/test/Glacier2/router/Makefile.mak +++ b/cs/test/Glacier2/router/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs CallbackI.cs S_SRCS = Server.cs CallbackI.cs diff --git a/cs/test/Glacier2/router/client.exe.config b/cs/test/Glacier2/router/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Glacier2/router/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py index 132ef27241e..d575ba22b02 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.getIceCppDir(), "bin", "glacier2router") +router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") name = os.path.join("Glacier2", "router") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Glacier2/router/server.exe.config b/cs/test/Glacier2/router/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Glacier2/router/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/adapterDeactivation/Makefile.mak b/cs/test/Ice/adapterDeactivation/Makefile.mak index 33886995565..ba7a7a96b75 100644 --- a/cs/test/Ice/adapterDeactivation/Makefile.mak +++ b/cs/test/Ice/adapterDeactivation/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs AllTests.cs S_SRCS = Server.cs CookieI.cs ServantLocatorI.cs TestI.cs diff --git a/cs/test/Ice/adapterDeactivation/client.exe.config b/cs/test/Ice/adapterDeactivation/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/adapterDeactivation/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/adapterDeactivation/collocated.exe.config b/cs/test/Ice/adapterDeactivation/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/adapterDeactivation/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/adapterDeactivation/server.exe.config b/cs/test/Ice/adapterDeactivation/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/adapterDeactivation/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/application/Makefile.mak b/cs/test/Ice/application/Makefile.mak index 05848796531..8e6445acd99 100644 --- a/cs/test/Ice/application/Makefile.mak +++ b/cs/test/Ice/application/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs diff --git a/cs/test/Ice/application/client.exe.config b/cs/test/Ice/application/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/application/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/background/Makefile.mak b/cs/test/Ice/background/Makefile.mak index 7d53d65d2bb..8da4985dc9c 100644 --- a/cs/test/Ice/background/Makefile.mak +++ b/cs/test/Ice/background/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) COMMON_SRCS = Acceptor.cs Configuration.cs Connector.cs EndpointFactory.cs EndpointI.cs PluginI.cs Transceiver.cs C_SRCS = AllTests.cs Client.cs $(COMMON_SRCS) diff --git a/cs/test/Ice/background/client.exe.config b/cs/test/Ice/background/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/background/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/background/server.exe.config b/cs/test/Ice/background/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/background/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/binding/Makefile.mak b/cs/test/Ice/binding/Makefile.mak index 697ad49ad52..3c61e2bba91 100644 --- a/cs/test/Ice/binding/Makefile.mak +++ b/cs/test/Ice/binding/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = Server.cs TestI.cs RemoteObjectAdapterI.cs RemoteCommunicatorI.cs diff --git a/cs/test/Ice/binding/client.exe.config b/cs/test/Ice/binding/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/binding/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/binding/server.exe.config b/cs/test/Ice/binding/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/binding/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/checksum/client/Makefile.mak b/cs/test/Ice/checksum/client/Makefile.mak index 042bb05a4b0..08e49be5da9 100755 --- a/cs/test/Ice/checksum/client/Makefile.mak +++ b/cs/test/Ice/checksum/client/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\..\.. TARGETS = client.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs diff --git a/cs/test/Ice/checksum/client/client.exe.config b/cs/test/Ice/checksum/client/client.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/checksum/client/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/checksum/server/Makefile.mak b/cs/test/Ice/checksum/server/Makefile.mak index 17732bbc404..8b8692307c9 100755 --- a/cs/test/Ice/checksum/server/Makefile.mak +++ b/cs/test/Ice/checksum/server/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\..\.. TARGETS = server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) SRCS = Server.cs TestI.cs diff --git a/cs/test/Ice/checksum/server/server.exe.config b/cs/test/Ice/checksum/server/server.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/checksum/server/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/dictMapping/Makefile.mak b/cs/test/Ice/dictMapping/Makefile.mak index ea62ca30c43..4b31a86b23c 100644 --- a/cs/test/Ice/dictMapping/Makefile.mak +++ b/cs/test/Ice/dictMapping/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs Twoways.cs TwowaysAMI.cs S_SRCS = MyClassI.cs Server.cs diff --git a/cs/test/Ice/dictMapping/client.exe.config b/cs/test/Ice/dictMapping/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/dictMapping/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/dictMapping/collocated.exe.config b/cs/test/Ice/dictMapping/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/dictMapping/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/dictMapping/server.exe.config b/cs/test/Ice/dictMapping/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/dictMapping/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/dictMapping/serveramd.exe.config b/cs/test/Ice/dictMapping/serveramd.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/dictMapping/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/exceptions/Makefile.mak b/cs/test/Ice/exceptions/Makefile.mak index a44316893b0..8ea20f48881 100644 --- a/cs/test/Ice/exceptions/Makefile.mak +++ b/cs/test/Ice/exceptions/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs EmptyI.cs ObjectFactoryI.cs ServantLocatorI.cs S_SRCS = EmptyI.cs ObjectFactoryI.cs ServantLocatorI.cs Server.cs ThrowerI.cs diff --git a/cs/test/Ice/exceptions/client.exe.config b/cs/test/Ice/exceptions/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/exceptions/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/exceptions/collocated.exe.config b/cs/test/Ice/exceptions/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/exceptions/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/exceptions/server.exe.config b/cs/test/Ice/exceptions/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/exceptions/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/exceptions/serveramd.exe.config b/cs/test/Ice/exceptions/serveramd.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/exceptions/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/facets/Makefile.mak b/cs/test/Ice/facets/Makefile.mak index 1695efca6d1..742d4fcd671 100644 --- a/cs/test/Ice/facets/Makefile.mak +++ b/cs/test/Ice/facets/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs EmptyI.cs S_SRCS = AI.cs BI.cs CI.cs DI.cs EI.cs EmptyI.cs FI.cs GI.cs HI.cs Server.cs diff --git a/cs/test/Ice/facets/client.exe.config b/cs/test/Ice/facets/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/facets/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/facets/collocated.exe.config b/cs/test/Ice/facets/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/facets/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/facets/server.exe.config b/cs/test/Ice/facets/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/facets/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/faultTolerance/Makefile.mak b/cs/test/Ice/faultTolerance/Makefile.mak index 678502c5116..11190534f09 100644 --- a/cs/test/Ice/faultTolerance/Makefile.mak +++ b/cs/test/Ice/faultTolerance/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = Server.cs TestI.cs diff --git a/cs/test/Ice/faultTolerance/client.exe.config b/cs/test/Ice/faultTolerance/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/faultTolerance/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/faultTolerance/server.exe.config b/cs/test/Ice/faultTolerance/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/faultTolerance/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/hold/Makefile.mak b/cs/test/Ice/hold/Makefile.mak index 31dd9b3f1d6..e46ad9db534 100644 --- a/cs/test/Ice/hold/Makefile.mak +++ b/cs/test/Ice/hold/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = HoldI.cs Server.cs diff --git a/cs/test/Ice/hold/client.exe.config b/cs/test/Ice/hold/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/hold/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/hold/server.exe.config b/cs/test/Ice/hold/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/hold/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/inheritance/Makefile.mak b/cs/test/Ice/inheritance/Makefile.mak index 74ad1b73ef5..0aa18e9ab14 100644 --- a/cs/test/Ice/inheritance/Makefile.mak +++ b/cs/test/Ice/inheritance/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = CAI.cs CBI.cs CCI.cs CDI.cs IAI.cs IB1I.cs IB2I.cs ICI.cs InitialI.cs Server.cs diff --git a/cs/test/Ice/inheritance/client.exe.config b/cs/test/Ice/inheritance/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/inheritance/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/inheritance/collocated.exe.config b/cs/test/Ice/inheritance/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/inheritance/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/inheritance/server.exe.config b/cs/test/Ice/inheritance/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/inheritance/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/interceptor/Makefile.mak b/cs/test/Ice/interceptor/Makefile.mak index fe4b6815edf..3b2d1700c64 100755 --- a/cs/test/Ice/interceptor/Makefile.mak +++ b/cs/test/Ice/interceptor/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs \ AMDInterceptorI.cs \ diff --git a/cs/test/Ice/interceptor/client.exe.config b/cs/test/Ice/interceptor/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/interceptor/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/location/Makefile.mak b/cs/test/Ice/location/Makefile.mak index 56f71c645da..1c97c749458 100644 --- a/cs/test/Ice/location/Makefile.mak +++ b/cs/test/Ice/location/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs HelloI.cs S_SRCS = HelloI.cs Server.cs ServerLocator.cs ServerLocatorRegistry.cs ServerManagerI.cs TestI.cs diff --git a/cs/test/Ice/location/client.exe.config b/cs/test/Ice/location/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/location/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/location/server.exe.config b/cs/test/Ice/location/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/location/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/objects/Makefile.mak b/cs/test/Ice/objects/Makefile.mak index 077ce9808d0..cc217d13a73 100644 --- a/cs/test/Ice/objects/Makefile.mak +++ b/cs/test/Ice/objects/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs BI.cs CI.cs DI.cs EI.cs FI.cs II.cs JI.cs HI.cs Client.cs S_SRCS = InitialI.cs BI.cs CI.cs DI.cs EI.cs FI.cs II.cs JI.cs HI.cs Server.cs \ diff --git a/cs/test/Ice/objects/client.exe.config b/cs/test/Ice/objects/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/objects/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/objects/collocated.exe.config b/cs/test/Ice/objects/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/objects/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/objects/server.exe.config b/cs/test/Ice/objects/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/objects/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/operations/Makefile.mak b/cs/test/Ice/operations/Makefile.mak index d557c6665d4..a8fcd30ff7d 100644 --- a/cs/test/Ice/operations/Makefile.mak +++ b/cs/test/Ice/operations/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs Twoways.cs TwowaysAMI.cs BatchOneways.cs Oneways.cs OnewaysAMI.cs S_SRCS = MyDerivedClassI.cs Server.cs diff --git a/cs/test/Ice/operations/client.exe.config b/cs/test/Ice/operations/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/operations/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/operations/collocated.exe.config b/cs/test/Ice/operations/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/operations/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/operations/server.exe.config b/cs/test/Ice/operations/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/operations/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/operations/serveramd.exe.config b/cs/test/Ice/operations/serveramd.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/operations/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/proxy/Makefile.mak b/cs/test/Ice/proxy/Makefile.mak index 22284f08d60..3fd6a582921 100644 --- a/cs/test/Ice/proxy/Makefile.mak +++ b/cs/test/Ice/proxy/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = MyDerivedClassI.cs Server.cs diff --git a/cs/test/Ice/proxy/client.exe.config b/cs/test/Ice/proxy/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/proxy/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/proxy/collocated.exe.config b/cs/test/Ice/proxy/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/proxy/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/proxy/server.exe.config b/cs/test/Ice/proxy/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/proxy/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/proxy/serveramd.exe.config b/cs/test/Ice/proxy/serveramd.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/proxy/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/retry/Makefile.mak b/cs/test/Ice/retry/Makefile.mak index 7d172873f94..54129b2ac57 100644 --- a/cs/test/Ice/retry/Makefile.mak +++ b/cs/test/Ice/retry/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = RetryI.cs Server.cs diff --git a/cs/test/Ice/retry/client.exe.config b/cs/test/Ice/retry/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/retry/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/retry/server.exe.config b/cs/test/Ice/retry/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/retry/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/seqMapping/Makefile.mak b/cs/test/Ice/seqMapping/Makefile.mak index fd6ddebb6c2..ac9ed286884 100644 --- a/cs/test/Ice/seqMapping/Makefile.mak +++ b/cs/test/Ice/seqMapping/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe collocated.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs Twoways.cs TwowaysAMI.cs Custom.cs S_SRCS = MyClassI.cs Server.cs Custom.cs diff --git a/cs/test/Ice/seqMapping/client.exe.config b/cs/test/Ice/seqMapping/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/seqMapping/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/seqMapping/collocated.exe.config b/cs/test/Ice/seqMapping/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/seqMapping/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/seqMapping/server.exe.config b/cs/test/Ice/seqMapping/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/seqMapping/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/seqMapping/serveramd.exe.config b/cs/test/Ice/seqMapping/serveramd.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/seqMapping/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/servantLocator/Makefile.mak b/cs/test/Ice/servantLocator/Makefile.mak index becef23628f..dc598863d19 100644 --- a/cs/test/Ice/servantLocator/Makefile.mak +++ b/cs/test/Ice/servantLocator/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe serveramd.exe collocated.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs AllTests.cs S_SRCS = Server.cs CookieI.cs ServantLocatorI.cs TestI.cs diff --git a/cs/test/Ice/servantLocator/client.exe.config b/cs/test/Ice/servantLocator/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/servantLocator/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/servantLocator/collocated.exe.config b/cs/test/Ice/servantLocator/collocated.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/servantLocator/collocated.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/servantLocator/server.exe.config b/cs/test/Ice/servantLocator/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/servantLocator/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/servantLocator/serveramd.exe.config b/cs/test/Ice/servantLocator/serveramd.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/servantLocator/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/slicing/exceptions/Makefile.mak b/cs/test/Ice/slicing/exceptions/Makefile.mak index 8ea6be9d4f4..6b6c8dd611a 100644 --- a/cs/test/Ice/slicing/exceptions/Makefile.mak +++ b/cs/test/Ice/slicing/exceptions/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\..\.. TARGETS = client.exe server.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = Server.cs TestI.cs diff --git a/cs/test/Ice/slicing/exceptions/client.exe.config b/cs/test/Ice/slicing/exceptions/client.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/slicing/exceptions/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/slicing/exceptions/server.exe.config b/cs/test/Ice/slicing/exceptions/server.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/slicing/exceptions/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/slicing/exceptions/serveramd.exe.config b/cs/test/Ice/slicing/exceptions/serveramd.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/slicing/exceptions/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/slicing/objects/Makefile.mak b/cs/test/Ice/slicing/objects/Makefile.mak index ebd61e78a82..5d064b11a09 100644 --- a/cs/test/Ice/slicing/objects/Makefile.mak +++ b/cs/test/Ice/slicing/objects/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\..\.. TARGETS = client.exe server.exe serveramd.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = Server.cs TestI.cs diff --git a/cs/test/Ice/slicing/objects/client.exe.config b/cs/test/Ice/slicing/objects/client.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/slicing/objects/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/slicing/objects/server.exe.config b/cs/test/Ice/slicing/objects/server.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/slicing/objects/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/slicing/objects/serveramd.exe.config b/cs/test/Ice/slicing/objects/serveramd.exe.config deleted file mode 100755 index e5f22332e67..00000000000 --- a/cs/test/Ice/slicing/objects/serveramd.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/stream/Makefile.mak b/cs/test/Ice/stream/Makefile.mak index f20bf50ba3d..93cd308b168 100755 --- a/cs/test/Ice/stream/Makefile.mak +++ b/cs/test/Ice/stream/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs diff --git a/cs/test/Ice/stream/client.exe.config b/cs/test/Ice/stream/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/stream/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/threads/Makefile.mak b/cs/test/Ice/threads/Makefile.mak index 7b1a1dcb11c..bd529c86e60 100644 --- a/cs/test/Ice/threads/Makefile.mak +++ b/cs/test/Ice/threads/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = Server.cs TestI.cs diff --git a/cs/test/Ice/threads/client.exe.config b/cs/test/Ice/threads/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/threads/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/threads/server.exe.config b/cs/test/Ice/threads/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/threads/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/timeout/Makefile.mak b/cs/test/Ice/timeout/Makefile.mak index 0fffe390669..44be2579130 100644 --- a/cs/test/Ice/timeout/Makefile.mak +++ b/cs/test/Ice/timeout/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs S_SRCS = TimeoutI.cs Server.cs diff --git a/cs/test/Ice/timeout/client.exe.config b/cs/test/Ice/timeout/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/timeout/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Ice/timeout/server.exe.config b/cs/test/Ice/timeout/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Ice/timeout/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/IceBox/configuration/Makefile.mak b/cs/test/IceBox/configuration/Makefile.mak index 4e8ffb35892..314ac224143 100644 --- a/cs/test/IceBox/configuration/Makefile.mak +++ b/cs/test/IceBox/configuration/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe testservice.dll +TARGETS_CONFIG = client.exe.config C_SRCS = Client.cs AllTests.cs S_SRCS = TestI.cs TestServiceI.cs diff --git a/cs/test/IceBox/configuration/client.exe.config b/cs/test/IceBox/configuration/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/IceBox/configuration/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/IceGrid/simple/Makefile b/cs/test/IceGrid/simple/Makefile index 70737383d26..c51ae17a780 100644 --- a/cs/test/IceGrid/simple/Makefile +++ b/cs/test/IceGrid/simple/Makefile @@ -30,7 +30,7 @@ client.exe: $(C_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icegridcs) $(call ref,icecs) $(call ref,glacier2cs) $(subst /,$(DSEP),$^) server.exe: $(S_SRCS) $(GEN_SRCS) - $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) -r:$(bindir)/glacier2cs.dll $(subst /,$(DSEP),$^) + $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(call ref,glacier2cs) $(subst /,$(DSEP),$^) clean:: -rm -rf db/node db/registry db/replica-* diff --git a/cs/test/IceGrid/simple/Makefile.mak b/cs/test/IceGrid/simple/Makefile.mak index bb5a9bccbbe..a354f1b8cdf 100644 --- a/cs/test/IceGrid/simple/Makefile.mak +++ b/cs/test/IceGrid/simple/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs AllTests.cs S_SRCS = Server.cs TestI.cs diff --git a/cs/test/IceGrid/simple/client.exe.config b/cs/test/IceGrid/simple/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/IceGrid/simple/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/IceGrid/simple/server.exe.config b/cs/test/IceGrid/simple/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/IceGrid/simple/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/IceSSL/certs/makecerts.py b/cs/test/IceSSL/certs/makecerts.py index 52e84e1e360..9664cc7ec32 100755 --- a/cs/test/IceSSL/certs/makecerts.py +++ b/cs/test/IceSSL/certs/makecerts.py @@ -49,7 +49,7 @@ for x in sys.argv[1:]: usage() sys.exit(1) -cppcerts = os.path.join(TestUtil.getIceCppDir(), "test", "IceSSL", "certs") +cppcerts = os.path.join(TestUtil.getIceDir("cpp"), "test", "IceSSL", "certs") for x in ("cacert1.pem", "cacert2.pem"): if force or not os.path.exists(x): diff --git a/cs/test/IceSSL/configuration/Makefile.mak b/cs/test/IceSSL/configuration/Makefile.mak index e45b1cd2509..3ca70bd787c 100644 --- a/cs/test/IceSSL/configuration/Makefile.mak +++ b/cs/test/IceSSL/configuration/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe server.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = AllTests.cs Client.cs CertificateVerifierI.cs PasswordCallbackI.cs S_SRCS = TestI.cs Server.cs diff --git a/cs/test/IceSSL/configuration/client.exe.config b/cs/test/IceSSL/configuration/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/IceSSL/configuration/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/IceSSL/configuration/server.exe.config b/cs/test/IceSSL/configuration/server.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/IceSSL/configuration/server.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/IceUtil/inputUtil/Makefile.mak b/cs/test/IceUtil/inputUtil/Makefile.mak index 8f9367310e1..f3a06fe0d02 100644 --- a/cs/test/IceUtil/inputUtil/Makefile.mak +++ b/cs/test/IceUtil/inputUtil/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs diff --git a/cs/test/IceUtil/inputUtil/client.exe.config b/cs/test/IceUtil/inputUtil/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/IceUtil/inputUtil/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/cs/test/Slice/keyword/Makefile.mak b/cs/test/Slice/keyword/Makefile.mak index b82babb4c74..e044238beca 100644 --- a/cs/test/Slice/keyword/Makefile.mak +++ b/cs/test/Slice/keyword/Makefile.mak @@ -10,6 +10,7 @@ top_srcdir = ..\..\.. TARGETS = client.exe +TARGETS_CONFIG = $(TARGETS:.exe=.exe.config) C_SRCS = Client.cs diff --git a/cs/test/Slice/keyword/client.exe.config b/cs/test/Slice/keyword/client.exe.config deleted file mode 100755 index 1eeb15fea8f..00000000000 --- a/cs/test/Slice/keyword/client.exe.config +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - <configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/glacier2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icecs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icepatch2cs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icestormcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/iceboxcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icegridcs.dll"/> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/> - <codeBase version="3.3.0.0" href="../../../bin/icesslcs.dll"/> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/java/config/common.xml b/java/config/common.xml index 8afef02e586..670ca77257c 100644 --- a/java/config/common.xml +++ b/java/config/common.xml @@ -86,10 +86,20 @@ </condition> </fail> + <condition property="ice.bin.dist"> + <or> + <equals arg1="${use.bin.dist}" arg2="yes"/> + <equals arg1="${env.USE_BIN_DIST}" arg2="yes"/> + </or> + </condition> + <!-- First, check if we're building a source distribution. --> <condition property="ice.dir" value="${ice.top.dir}/.."> - <available file="${ice.top.dir}/../java"/> + <and> + <available file="${ice.top.dir}/../java"/> + <not><isset property="ice.bin.dist"/></not> + </and> </condition> <!-- When building a source distribution, we allow using either the translators from a binary distribution or the local translators, --> diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py index 570571973f4..9d036c198a6 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.getIceCppDir(), "bin", "glacier2router") +router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "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 e6e033dcdac..6c3f8ba7ae0 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.getIceCppDir(), "bin", "glacier2router") +router = os.path.join(TestUtil.getIceDir("cpp"), "bin", "glacier2router") args = r' --Ice.Warn.Dispatch=0' + \ r' --Ice.Warn.Connections=0' + \ diff --git a/java/test/IceSSL/certs/makecerts.py b/java/test/IceSSL/certs/makecerts.py index 6d95acb1790..d1c474ca07f 100755 --- a/java/test/IceSSL/certs/makecerts.py +++ b/java/test/IceSSL/certs/makecerts.py @@ -49,7 +49,7 @@ for x in sys.argv[1:]: usage() sys.exit(1) -cppcerts = os.path.join(TestUtil.getIceCppDir(), "test", "IceSSL", "certs") +cppcerts = os.path.join(TestUtil.getIceDir("cpp"), "test", "IceSSL", "certs") certs = [\ "c_dsa_nopass_ca1", \ diff --git a/py/test/Ice/adapterDeactivation/Client.py b/py/test/Ice/adapterDeactivation/Client.py index 4637d93a02d..30027f180b2 100644 --- a/py/test/Ice/adapterDeactivation/Client.py +++ b/py/test/Ice/adapterDeactivation/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, AllTests diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py index 88e8b2f5bfc..d9d33612bff 100644 --- a/py/test/Ice/adapterDeactivation/Collocated.py +++ b/py/test/Ice/adapterDeactivation/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI, AllTests diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py index 6e05ae3f20a..20c663efaa3 100644 --- a/py/test/Ice/adapterDeactivation/Server.py +++ b/py/test/Ice/adapterDeactivation/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI diff --git a/py/test/Ice/binding/Client.py b/py/test/Ice/binding/Client.py index 8a209ef166a..ceb94b83a78 100644 --- a/py/test/Ice/binding/Client.py +++ b/py/test/Ice/binding/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py index 9251acf0841..39b5e5d211c 100644 --- a/py/test/Ice/binding/Server.py +++ b/py/test/Ice/binding/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI diff --git a/py/test/Ice/blobject/Client.py b/py/test/Ice/blobject/Client.py index 26381353d00..b0645fc0552 100644 --- a/py/test/Ice/blobject/Client.py +++ b/py/test/Ice/blobject/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test diff --git a/py/test/Ice/blobject/Server.py b/py/test/Ice/blobject/Server.py index 986f1825fa3..af986ad5dd3 100644 --- a/py/test/Ice/blobject/Server.py +++ b/py/test/Ice/blobject/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') diff --git a/py/test/Ice/checksum/Client.py b/py/test/Ice/checksum/Client.py index 36d291c11d2..1290c7ae641 100644 --- a/py/test/Ice/checksum/Client.py +++ b/py/test/Ice/checksum/Client.py @@ -17,8 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) - import Ice # diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py index 7b4f6a1cd7e..0f3fc551cf4 100644 --- a/py/test/Ice/checksum/Server.py +++ b/py/test/Ice/checksum/Server.py @@ -17,8 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) - import Ice # diff --git a/py/test/Ice/custom/Client.py b/py/test/Ice/custom/Client.py index 16fe589378c..b2b2e281a4f 100644 --- a/py/test/Ice/custom/Client.py +++ b/py/test/Ice/custom/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, AllTests diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py index 6b15244fe5b..8a2f638971e 100644 --- a/py/test/Ice/custom/Server.py +++ b/py/test/Ice/custom/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test diff --git a/py/test/Ice/exceptions/Client.py b/py/test/Ice/exceptions/Client.py index 173a56127cf..af419d19e1d 100644 --- a/py/test/Ice/exceptions/Client.py +++ b/py/test/Ice/exceptions/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import AllTests diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py index bec27c63d4e..50aab50055f 100644 --- a/py/test/Ice/exceptions/Collocated.py +++ b/py/test/Ice/exceptions/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI, AllTests diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py index 68145921ae1..f89adc3b362 100644 --- a/py/test/Ice/exceptions/Server.py +++ b/py/test/Ice/exceptions/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py index 30b1bf2eadb..38580006f7a 100644 --- a/py/test/Ice/exceptions/ServerAMD.py +++ b/py/test/Ice/exceptions/ServerAMD.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('TestAMD.ice') import Test diff --git a/py/test/Ice/facets/Client.py b/py/test/Ice/facets/Client.py index 90ec29f8af2..91623582c73 100644 --- a/py/test/Ice/facets/Client.py +++ b/py/test/Ice/facets/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py index c7bd0a22047..ca9e6dc665c 100644 --- a/py/test/Ice/facets/Collocated.py +++ b/py/test/Ice/facets/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI, AllTests diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py index 1c2b25f1dbe..dbe3b98c7f5 100644 --- a/py/test/Ice/facets/Server.py +++ b/py/test/Ice/facets/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI diff --git a/py/test/Ice/faultTolerance/Client.py b/py/test/Ice/faultTolerance/Client.py index a5d13fe97c2..a0640c58c20 100644 --- a/py/test/Ice/faultTolerance/Client.py +++ b/py/test/Ice/faultTolerance/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice, AllTests def test(b): diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py index 892f6e7f0ec..e753c4fbb6a 100644 --- a/py/test/Ice/faultTolerance/Server.py +++ b/py/test/Ice/faultTolerance/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test diff --git a/py/test/Ice/inheritance/Client.py b/py/test/Ice/inheritance/Client.py index 641864a60a5..1c68ab740a9 100644 --- a/py/test/Ice/inheritance/Client.py +++ b/py/test/Ice/inheritance/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import AllTests diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py index 1e9a2d0661d..202292cf7bc 100644 --- a/py/test/Ice/inheritance/Collocated.py +++ b/py/test/Ice/inheritance/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI, AllTests diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py index f8b762516b4..0ea27904b8c 100644 --- a/py/test/Ice/inheritance/Server.py +++ b/py/test/Ice/inheritance/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI diff --git a/py/test/Ice/location/Client.py b/py/test/Ice/location/Client.py index 1d1b66473a7..a790e448062 100644 --- a/py/test/Ice/location/Client.py +++ b/py/test/Ice/location/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/location/Server.py b/py/test/Ice/location/Server.py index 7a6137fa90a..a1b2213865c 100644 --- a/py/test/Ice/location/Server.py +++ b/py/test/Ice/location/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/objects/Client.py b/py/test/Ice/objects/Client.py index 87c05a37f00..073a47e6c54 100644 --- a/py/test/Ice/objects/Client.py +++ b/py/test/Ice/objects/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') Ice.loadSlice('ClientPrivate.ice') diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py index 29473c4455f..9db84e6d90c 100644 --- a/py/test/Ice/objects/Collocated.py +++ b/py/test/Ice/objects/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') Ice.loadSlice('ClientPrivate.ice') diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py index 330502b1f08..7aee9423d4a 100644 --- a/py/test/Ice/objects/Server.py +++ b/py/test/Ice/objects/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') Ice.loadSlice('ServerPrivate.ice') diff --git a/py/test/Ice/operations/Client.py b/py/test/Ice/operations/Client.py index fc5195e3dc3..fd40440b63d 100644 --- a/py/test/Ice/operations/Client.py +++ b/py/test/Ice/operations/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - # # Find Slice directory. # diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py index b4952252ed7..87156b9717f 100644 --- a/py/test/Ice/operations/Collocated.py +++ b/py/test/Ice/operations/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - # # Find Slice directory. # diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py index 2280dd4f0de..1029e30bf77 100644 --- a/py/test/Ice/operations/Server.py +++ b/py/test/Ice/operations/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py index 9ec866147ae..7f4d375856e 100644 --- a/py/test/Ice/operations/ServerAMD.py +++ b/py/test/Ice/operations/ServerAMD.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/proxy/Client.py b/py/test/Ice/proxy/Client.py index d2e923996f0..433e7496c1f 100644 --- a/py/test/Ice/proxy/Client.py +++ b/py/test/Ice/proxy/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - # # Find Slice directory. # diff --git a/py/test/Ice/proxy/Collocated.py b/py/test/Ice/proxy/Collocated.py index b4952252ed7..87156b9717f 100644 --- a/py/test/Ice/proxy/Collocated.py +++ b/py/test/Ice/proxy/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - # # Find Slice directory. # diff --git a/py/test/Ice/proxy/Server.py b/py/test/Ice/proxy/Server.py index 08963659b61..a95d8cb9b97 100644 --- a/py/test/Ice/proxy/Server.py +++ b/py/test/Ice/proxy/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/proxy/ServerAMD.py b/py/test/Ice/proxy/ServerAMD.py index 7daaff7f2e7..44942cb3d93 100644 --- a/py/test/Ice/proxy/ServerAMD.py +++ b/py/test/Ice/proxy/ServerAMD.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/retry/Client.py b/py/test/Ice/retry/Client.py index 16ccf4dfcdd..5ed7ddf502e 100644 --- a/py/test/Ice/retry/Client.py +++ b/py/test/Ice/retry/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - # # Find Slice directory. # diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py index 4b2810d9f16..5b22ee403cd 100644 --- a/py/test/Ice/retry/Server.py +++ b/py/test/Ice/retry/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Ice/servantLocator/Client.py b/py/test/Ice/servantLocator/Client.py index 93a573c49dd..d89bcd2360f 100644 --- a/py/test/Ice/servantLocator/Client.py +++ b/py/test/Ice/servantLocator/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, AllTests diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py index 69bb9a8efb4..1cd88fe9f5e 100644 --- a/py/test/Ice/servantLocator/Collocated.py +++ b/py/test/Ice/servantLocator/Collocated.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI, AllTests diff --git a/py/test/Ice/servantLocator/Server.py b/py/test/Ice/servantLocator/Server.py index 4ff06e2c8fa..08abc51e980 100644 --- a/py/test/Ice/servantLocator/Server.py +++ b/py/test/Ice/servantLocator/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Test.ice') import Test, TestI diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/py/test/Ice/servantLocator/ServerAMD.py index 1fa0ddb8528..92a3e9155bb 100644 --- a/py/test/Ice/servantLocator/ServerAMD.py +++ b/py/test/Ice/servantLocator/ServerAMD.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('TestAMD.ice') import Test, TestAMDI diff --git a/py/test/Ice/slicing/exceptions/Client.py b/py/test/Ice/slicing/exceptions/Client.py index 4ab94bba819..01c3a6979e7 100644 --- a/py/test/Ice/slicing/exceptions/Client.py +++ b/py/test/Ice/slicing/exceptions/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice, AllTests def run(args, communicator): diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py index 49dbd158540..9e4e6ccc796 100644 --- a/py/test/Ice/slicing/exceptions/Server.py +++ b/py/test/Ice/slicing/exceptions/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('-I. --all ServerPrivate.ice') import Test diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/py/test/Ice/slicing/exceptions/ServerAMD.py index 35167d0afc7..e3ffecca749 100644 --- a/py/test/Ice/slicing/exceptions/ServerAMD.py +++ b/py/test/Ice/slicing/exceptions/ServerAMD.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('-I. --all ServerPrivateAMD.ice') import Test diff --git a/py/test/Ice/slicing/objects/Client.py b/py/test/Ice/slicing/objects/Client.py index 4ab94bba819..01c3a6979e7 100644 --- a/py/test/Ice/slicing/objects/Client.py +++ b/py/test/Ice/slicing/objects/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice, AllTests def run(args, communicator): diff --git a/py/test/Ice/slicing/objects/Server.py b/py/test/Ice/slicing/objects/Server.py index 41add90c8ab..b7d6ee15d47 100644 --- a/py/test/Ice/slicing/objects/Server.py +++ b/py/test/Ice/slicing/objects/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('-I. --all ServerPrivate.ice Forward.ice') import Test diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/py/test/Ice/slicing/objects/ServerAMD.py index 75c41bd3639..54860e7cd1c 100644 --- a/py/test/Ice/slicing/objects/ServerAMD.py +++ b/py/test/Ice/slicing/objects/ServerAMD.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('-I. --all ServerPrivateAMD.ice Forward.ice') import Test diff --git a/py/test/Ice/timeout/Client.py b/py/test/Ice/timeout/Client.py index 368fb00d774..ae6185697b8 100644 --- a/py/test/Ice/timeout/Client.py +++ b/py/test/Ice/timeout/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - # # Find Slice directory. # diff --git a/py/test/Ice/timeout/Server.py b/py/test/Ice/timeout/Server.py index ecccbef1218..5b6aa213522 100644 --- a/py/test/Ice/timeout/Server.py +++ b/py/test/Ice/timeout/Server.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice # diff --git a/py/test/Slice/keyword/Client.py b/py/test/Slice/keyword/Client.py index 94faca977c9..aa8bdc11b46 100644 --- a/py/test/Slice/keyword/Client.py +++ b/py/test/Slice/keyword/Client.py @@ -17,9 +17,6 @@ for toplevel in [".", "..", "../..", "../../..", "../../../.."]: else: raise "can't find toplevel directory!" -sys.path.insert(0, os.path.join(toplevel, "python")) -sys.path.insert(0, os.path.join(toplevel, "lib")) - import Ice Ice.loadSlice('Key.ice') diff --git a/rb/test/Ice/binding/Client.rb b/rb/test/Ice/binding/Client.rb index 13860076a24..80ff9bd4941 100644 --- a/rb/test/Ice/binding/Client.rb +++ b/rb/test/Ice/binding/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Test.ice') diff --git a/rb/test/Ice/checksum/Client.rb b/rb/test/Ice/checksum/Client.rb index 2460ea867f9..7d2b38dc481 100644 --- a/rb/test/Ice/checksum/Client.rb +++ b/rb/test/Ice/checksum/Client.rb @@ -22,15 +22,12 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) # # Find Slice directory. # slice_dir = '' -if ENV.has_key?('ICERB_HOME') and Pathname.new(ENV['ICERB_HOME']).join("slice").directory? - slice_dir = ENV['ICERB_HOME'] + '/slice' -elsif ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? +if ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? slice_dir = ENV['ICE_HOME'] + '/slice' elsif toplevel.join("..", "slice").directory? slice_dir = toplevel.join("..", "slice") diff --git a/rb/test/Ice/exceptions/Client.rb b/rb/test/Ice/exceptions/Client.rb index 1dcf43e2606..ca8ceade740 100644 --- a/rb/test/Ice/exceptions/Client.rb +++ b/rb/test/Ice/exceptions/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Test.ice') diff --git a/rb/test/Ice/facets/Client.rb b/rb/test/Ice/facets/Client.rb index ca169d3d5da..4fa05b709b2 100644 --- a/rb/test/Ice/facets/Client.rb +++ b/rb/test/Ice/facets/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Test.ice') diff --git a/rb/test/Ice/inheritance/Client.rb b/rb/test/Ice/inheritance/Client.rb index a808a928a7e..2d6405e0583 100644 --- a/rb/test/Ice/inheritance/Client.rb +++ b/rb/test/Ice/inheritance/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Test.ice') diff --git a/rb/test/Ice/location/Client.rb b/rb/test/Ice/location/Client.rb index 73a54a8b26d..8875ddd4ff8 100644 --- a/rb/test/Ice/location/Client.rb +++ b/rb/test/Ice/location/Client.rb @@ -21,15 +21,12 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) # # Find Slice directory. # slice_dir = '' -if ENV.has_key?('ICERB_HOME') and Pathname.new(ENV['ICERB_HOME']).join("slice").directory? - slice_dir = ENV['ICERB_HOME'] + '/slice' -elsif ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? +if ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? slice_dir = ENV['ICE_HOME'] + '/slice' elsif Pathname.new(toplevel + '/../slice').directory? slice_dir = toplevel + '/../slice' diff --git a/rb/test/Ice/objects/Client.rb b/rb/test/Ice/objects/Client.rb index d5946743d00..78414aab62d 100644 --- a/rb/test/Ice/objects/Client.rb +++ b/rb/test/Ice/objects/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Test.ice') diff --git a/rb/test/Ice/operations/Client.rb b/rb/test/Ice/operations/Client.rb index 48d313c479f..d66074a8939 100644 --- a/rb/test/Ice/operations/Client.rb +++ b/rb/test/Ice/operations/Client.rb @@ -21,15 +21,12 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) # # Find Slice directory. # slice_dir = '' -if ENV.has_key?('ICERB_HOME') and Pathname.new(ENV['ICERB_HOME']).join("slice").directory? - slice_dir = ENV['ICERB_HOME'] + '/slice' -elsif ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? +if ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? slice_dir = ENV['ICE_HOME'] + '/slice' elsif Pathname.new(toplevel + '/../slice').directory? slice_dir = toplevel + '/../slice' diff --git a/rb/test/Ice/proxy/Client.rb b/rb/test/Ice/proxy/Client.rb index c77214c5123..32e5c8ff367 100644 --- a/rb/test/Ice/proxy/Client.rb +++ b/rb/test/Ice/proxy/Client.rb @@ -21,15 +21,12 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) # # Find Slice directory. # slice_dir = '' -if ENV.has_key?('ICERB_HOME') and Pathname.new(ENV['ICERB_HOME']).join("slice").directory? - slice_dir = ENV['ICERB_HOME'] + '/slice' -elsif ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? +if ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? slice_dir = ENV['ICE_HOME'] + '/slice' elsif Pathname.new(toplevel + '/../slice').directory? slice_dir = toplevel + '/../slice' diff --git a/rb/test/Ice/retry/Client.rb b/rb/test/Ice/retry/Client.rb index cf8b035ef34..b8975f6e8be 100644 --- a/rb/test/Ice/retry/Client.rb +++ b/rb/test/Ice/retry/Client.rb @@ -21,15 +21,12 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) # # Find Slice directory. # slice_dir = '' -if ENV.has_key?('ICERB_HOME') and Pathname.new(ENV['ICERB_HOME']).join("slice").directory? - slice_dir = ENV['ICERB_HOME'] + '/slice' -elsif ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? +if ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? slice_dir = ENV['ICE_HOME'] + '/slice' elsif Pathname.new(toplevel + '/../slice').directory? slice_dir = toplevel + '/../slice' diff --git a/rb/test/Ice/slicing/exceptions/Client.rb b/rb/test/Ice/slicing/exceptions/Client.rb index 6408e3bf377..05c3b2f8d63 100644 --- a/rb/test/Ice/slicing/exceptions/Client.rb +++ b/rb/test/Ice/slicing/exceptions/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Test.ice') diff --git a/rb/test/Ice/slicing/objects/Client.rb b/rb/test/Ice/slicing/objects/Client.rb index ba0c01061c5..9e3015d5121 100644 --- a/rb/test/Ice/slicing/objects/Client.rb +++ b/rb/test/Ice/slicing/objects/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'AllTests' diff --git a/rb/test/Ice/timeout/Client.rb b/rb/test/Ice/timeout/Client.rb index 1534b85cbae..2bf27ff9d4e 100644 --- a/rb/test/Ice/timeout/Client.rb +++ b/rb/test/Ice/timeout/Client.rb @@ -21,15 +21,12 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) # # Find Slice directory. # slice_dir = '' -if ENV.has_key?('ICERB_HOME') and Pathname.new(ENV['ICERB_HOME']).join("slice").directory? - slice_dir = ENV['ICERB_HOME'] + '/slice' -elsif ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? +if ENV.has_key?('ICE_HOME') and Pathname.new(ENV['ICE_HOME']).join("slice").directory? slice_dir = ENV['ICE_HOME'] + '/slice' elsif Pathname.new(toplevel + '/../slice').directory? slice_dir = toplevel + '/../slice' diff --git a/rb/test/Slice/keyword/Client.rb b/rb/test/Slice/keyword/Client.rb index 59425c285dd..268bf653784 100644 --- a/rb/test/Slice/keyword/Client.rb +++ b/rb/test/Slice/keyword/Client.rb @@ -21,7 +21,6 @@ end if not rubyDir fail "can't find toplevel directory!" end -$:.unshift(rubyDir) require 'Ice' Ice::loadSlice('Key.ice') |