diff options
| author | Jose <jose@zeroc.com> | 2015-01-14 09:22:33 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-14 09:22:33 +0100 |
| commit | 195454df0895051579cd83d6e64d2308a8f42c16 (patch) | |
| tree | 6527548e026a929f410aef51ad467b26c4e8bf2c /js/test | |
| parent | Fix another bug with hello demos. (diff) | |
| download | ice-195454df0895051579cd83d6e64d2308a8f42c16.tar.bz2 ice-195454df0895051579cd83d6e64d2308a8f42c16.tar.xz ice-195454df0895051579cd83d6e64d2308a8f42c16.zip | |
JavaScript updates to use gulp and add npm and bower packages
Diffstat (limited to 'js/test')
125 files changed, 47 insertions, 1533 deletions
diff --git a/js/test/Common/Common.js b/js/test/Common/Common.js index 1367ad7cbe8..7029a61d846 100644 --- a/js/test/Common/Common.js +++ b/js/test/Common/Common.js @@ -8,7 +8,7 @@ // ********************************************************************** (function(module, require, exports){ - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var write = function(msg) { diff --git a/js/test/Common/Makefile b/js/test/Common/Makefile deleted file mode 100644 index 99e39a23c5a..00000000000 --- a/js/test/Common/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -TARGETS = Controller.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/test/Common/Makefile.mak b/js/test/Common/Makefile.mak deleted file mode 100644 index c50fc6647f9..00000000000 --- a/js/test/Common/Makefile.mak +++ /dev/null @@ -1,16 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -TARGETS = Controller.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Common/run.py b/js/test/Common/run.py index 24a16f8054c..686edf1f669 100755 --- a/js/test/Common/run.py +++ b/js/test/Common/run.py @@ -123,7 +123,6 @@ class ControllerI(Test.Controller): self.currentServer = None def runServer(self, lang, name, protocol, host, options, current): - # If server is still running, terminate it if self.currentServer: try: @@ -177,57 +176,26 @@ class Reader(threading.Thread): class Server(Ice.Application): def run(self, args): - jsDir = os.path.join(TestUtil.toplevel, "js") - nodeCmd = TestUtil.getNodeCommand() - httpServer = subprocess.Popen(nodeCmd + " \"" + os.path.join(jsDir, "bin", "HttpServer.js") + "\"", - shell = True, - stdin = subprocess.PIPE, - stdout = subprocess.PIPE, - stderr = None, - bufsize = 0) - # - # Wait for the HttpServer to start - # - while True: - line = httpServer.stdout.readline() - if httpServer.poll() is not None and not line: - #process terminated - return httpServer.poll() - - if type(line) != str: - line = line.decode() - line = line.strip("\n") - if len(line) > 0: - print(line) - if line.find("listening on ports 8080 (http) and 9090 (https)...") != -1: - break - - reader = Reader(httpServer) - reader.start() - adapter = self.communicator().createObjectAdapter("ControllerAdapter") adapter.add(ControllerI(), self.communicator().stringToIdentity("controller")) adapter.activate() self.communicator().waitForShutdown() - - if httpServer.poll() is None: - httpServer.terminate() - - reader.join() return 0 app = Server() initData = Ice.InitializationData() initData.properties = Ice.createProperties(); initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL") -initData.properties.setProperty("IceSSL.DefaultDir", os.path.join(TestUtil.toplevel, "certs")); -initData.properties.setProperty("IceSSL.CertAuthFile", "cacert.pem"); -initData.properties.setProperty("IceSSL.CertFile", "s_rsa1024_pub.pem"); -initData.properties.setProperty("IceSSL.KeyFile", "s_rsa1024_priv.pem"); -initData.properties.setProperty("IceSSL.Keychain", "test.keychain"); -initData.properties.setProperty("IceSSL.KeychainPassword", "password"); +initData.properties.setProperty("IceSSL.DefaultDir", os.path.join(TestUtil.toplevel, "certs")) +initData.properties.setProperty("IceSSL.CertAuthFile", "cacert.pem") +initData.properties.setProperty("IceSSL.CertFile", "s_rsa1024_pub.pem") +initData.properties.setProperty("IceSSL.KeyFile", "s_rsa1024_priv.pem") +initData.properties.setProperty("IceSSL.Keychain", "test.keychain") +initData.properties.setProperty("IceSSL.KeychainPassword", "password") initData.properties.setProperty("IceSSL.VerifyPeer", "0"); initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10") +#initData.properties.setProperty("Ice.Trace.Network", "3") +#initData.properties.setProperty("Ice.Trace.Protocol", "1") initData.properties.setProperty("ControllerAdapter.Endpoints", "ws -p 12009:wss -p 12008") if TestUtil.isDarwin(): diff --git a/js/test/Glacier2/Makefile b/js/test/Glacier2/Makefile deleted file mode 100644 index c8f9aa29337..00000000000 --- a/js/test/Glacier2/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules.js - -SUBDIRS = router - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/test/Glacier2/Makefile.mak b/js/test/Glacier2/Makefile.mak deleted file mode 100644 index 908a498e910..00000000000 --- a/js/test/Glacier2/Makefile.mak +++ /dev/null @@ -1,19 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak.js - -SUBDIRS = router - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/js/test/Glacier2/router/.depend.mak b/js/test/Glacier2/router/.depend.mak deleted file mode 100644 index 306ac70bfa3..00000000000 --- a/js/test/Glacier2/router/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Callback.js: \ - .\Callback.ice diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index f51745dbcba..73e80dc58a2 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -9,8 +9,8 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; - var Glacier2 = require("icejs").Glacier2; + var Ice = require("zeroc-icejs").Ice; + var Glacier2 = require("zeroc-icejs").Glacier2; var Test = require("Callback").Test; var Promise = Ice.Promise; diff --git a/js/test/Glacier2/router/Makefile b/js/test/Glacier2/router/Makefile deleted file mode 100644 index 5cd05aac710..00000000000 --- a/js/test/Glacier2/router/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Callback.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Glacier2/router/Makefile.mak b/js/test/Glacier2/router/Makefile.mak deleted file mode 100644 index 1792fd7ae83..00000000000 --- a/js/test/Glacier2/router/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Callback.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/Makefile b/js/test/Ice/Makefile deleted file mode 100644 index 5e3708c9f4d..00000000000 --- a/js/test/Ice/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules.js - -SUBDIRS = \ - acm \ - ami \ - binding \ - defaultValue \ - enums \ - exceptions \ - exceptionsBidir \ - facets \ - facetsBidir \ - hold \ - inheritance \ - inheritanceBidir \ - location \ - objects \ - operations \ - operationsBidir \ - optional \ - optionalBidir \ - promise \ - properties \ - proxy \ - retry \ - slicing \ - timeout - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/test/Ice/Makefile.mak b/js/test/Ice/Makefile.mak deleted file mode 100644 index 27eef01fb38..00000000000 --- a/js/test/Ice/Makefile.mak +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak.js - -SUBDIRS = \ - acm \ - ami \ - binding \ - defaultValue \ - enums \ - exceptions \ - exceptionsBidir \ - facets \ - facetsBidir \ - hold \ - inheritance \ - inheritanceBidir \ - location \ - objects \ - operations \ - operationsBidir \ - optional \ - optionalBidir \ - promise \ - properties \ - proxy \ - retry \ - slicing \ - timeout - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/js/test/Ice/acm/.depend.mak b/js/test/Ice/acm/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/acm/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js index c15d38fb264..4e4bf5a7621 100644 --- a/js/test/Ice/acm/Client.js +++ b/js/test/Ice/acm/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/acm/Makefile b/js/test/Ice/acm/Makefile deleted file mode 100644 index 2aeb1a933f4..00000000000 --- a/js/test/Ice/acm/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/acm/Makefile.mak b/js/test/Ice/acm/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/acm/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/ami/.depend.mak b/js/test/Ice/ami/.depend.mak deleted file mode 100755 index ad3e6accfb2..00000000000 --- a/js/test/Ice/ami/.depend.mak +++ /dev/null @@ -1,7 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/Endpoint.ice" \ - "$(slicedir)/Ice/Version.ice" \ - "$(slicedir)/Ice/EndpointF.ice" diff --git a/js/test/Ice/ami/Client.js b/js/test/Ice/ami/Client.js index 05fee5d1aeb..05bd9647a92 100644 --- a/js/test/Ice/ami/Client.js +++ b/js/test/Ice/ami/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/ami/Makefile b/js/test/Ice/ami/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/ami/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/ami/Makefile.mak b/js/test/Ice/ami/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/ami/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/binding/.depend.mak b/js/test/Ice/binding/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/binding/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/binding/Client.js b/js/test/Ice/binding/Client.js index 73956b28eee..19078264f30 100644 --- a/js/test/Ice/binding/Client.js +++ b/js/test/Ice/binding/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/binding/Makefile b/js/test/Ice/binding/Makefile deleted file mode 100644 index 2aeb1a933f4..00000000000 --- a/js/test/Ice/binding/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/binding/Makefile.mak b/js/test/Ice/binding/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/binding/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/defaultValue/.depend.mak b/js/test/Ice/defaultValue/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/defaultValue/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/defaultValue/Client.js b/js/test/Ice/defaultValue/Client.js index 400a5bc3b43..02c43fd827e 100644 --- a/js/test/Ice/defaultValue/Client.js +++ b/js/test/Ice/defaultValue/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/defaultValue/Makefile b/js/test/Ice/defaultValue/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/defaultValue/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/defaultValue/Makefile.mak b/js/test/Ice/defaultValue/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/defaultValue/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/enums/.depend.mak b/js/test/Ice/enums/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/enums/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/enums/Client.js b/js/test/Ice/enums/Client.js index 31fe2f2148e..8bca02c43e4 100644 --- a/js/test/Ice/enums/Client.js +++ b/js/test/Ice/enums/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/enums/Makefile b/js/test/Ice/enums/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/enums/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/enums/Makefile.mak b/js/test/Ice/enums/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/enums/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/exceptions/.depend.mak b/js/test/Ice/exceptions/.depend.mak deleted file mode 100644 index ebeb9d9c79c..00000000000 --- a/js/test/Ice/exceptions/.depend.mak +++ /dev/null @@ -1,4 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" diff --git a/js/test/Ice/exceptions/Client.js b/js/test/Ice/exceptions/Client.js index 31a636d0bd3..e8432ac1ef8 100644 --- a/js/test/Ice/exceptions/Client.js +++ b/js/test/Ice/exceptions/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/exceptions/Makefile b/js/test/Ice/exceptions/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/exceptions/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/exceptions/Makefile.mak b/js/test/Ice/exceptions/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/exceptions/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/exceptionsBidir/.depend.mak b/js/test/Ice/exceptionsBidir/.depend.mak deleted file mode 100644 index 87ec85e96de..00000000000 --- a/js/test/Ice/exceptionsBidir/.depend.mak +++ /dev/null @@ -1,8 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -TestAMD.js: \ - .\TestAMD.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" diff --git a/js/test/Ice/exceptionsBidir/AMDThrowerI.js b/js/test/Ice/exceptionsBidir/AMDThrowerI.js index 022b20d9ea4..101eaf5a64e 100644 --- a/js/test/Ice/exceptionsBidir/AMDThrowerI.js +++ b/js/test/Ice/exceptionsBidir/AMDThrowerI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var TestAMD = require("TestAMD").TestAMD; var Class = Ice.Class; diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptionsBidir/Client.js index b92ce1f9554..cce9746bc73 100644 --- a/js/test/Ice/exceptionsBidir/Client.js +++ b/js/test/Ice/exceptionsBidir/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var TestAMD = require("TestAMD").TestAMD; diff --git a/js/test/Ice/exceptionsBidir/Makefile b/js/test/Ice/exceptionsBidir/Makefile deleted file mode 100644 index c45c5fe888c..00000000000 --- a/js/test/Ice/exceptionsBidir/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice \ - TestAMD.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/exceptionsBidir/Makefile.mak b/js/test/Ice/exceptionsBidir/Makefile.mak deleted file mode 100644 index db6af2e3924..00000000000 --- a/js/test/Ice/exceptionsBidir/Makefile.mak +++ /dev/null @@ -1,21 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js \ - TestAMD.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/exceptionsBidir/ThrowerI.js b/js/test/Ice/exceptionsBidir/ThrowerI.js index e2b40a18ecc..3b8ac414fa4 100644 --- a/js/test/Ice/exceptionsBidir/ThrowerI.js +++ b/js/test/Ice/exceptionsBidir/ThrowerI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Class = Ice.Class; diff --git a/js/test/Ice/facets/.depend.mak b/js/test/Ice/facets/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/facets/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/facets/Client.js b/js/test/Ice/facets/Client.js index efdf73390d5..a9b93f194f4 100644 --- a/js/test/Ice/facets/Client.js +++ b/js/test/Ice/facets/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/facets/Makefile b/js/test/Ice/facets/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/facets/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/facets/Makefile.mak b/js/test/Ice/facets/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/facets/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/facetsBidir/.depend.mak b/js/test/Ice/facetsBidir/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/facetsBidir/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/facetsBidir/Client.js b/js/test/Ice/facetsBidir/Client.js index e1a8dda3d5a..aa495cb7ccd 100644 --- a/js/test/Ice/facetsBidir/Client.js +++ b/js/test/Ice/facetsBidir/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Client = require("../facets/Client"); diff --git a/js/test/Ice/facetsBidir/Makefile b/js/test/Ice/facetsBidir/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/facetsBidir/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/facetsBidir/Makefile.mak b/js/test/Ice/facetsBidir/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/facetsBidir/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/facetsBidir/TestI.js b/js/test/Ice/facetsBidir/TestI.js index 9c90eb5486a..288b22be71f 100644 --- a/js/test/Ice/facetsBidir/TestI.js +++ b/js/test/Ice/facetsBidir/TestI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Class = Ice.Class; diff --git a/js/test/Ice/hold/.depend.mak b/js/test/Ice/hold/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/hold/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/hold/Client.js b/js/test/Ice/hold/Client.js index e4b4bbfb64b..200af051c82 100644 --- a/js/test/Ice/hold/Client.js +++ b/js/test/Ice/hold/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/hold/Makefile b/js/test/Ice/hold/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/hold/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/hold/Makefile.mak b/js/test/Ice/hold/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/hold/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/inheritance/.depend.mak b/js/test/Ice/inheritance/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/inheritance/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/inheritance/Client.js b/js/test/Ice/inheritance/Client.js index 913045311c4..5fea1a02b9a 100644 --- a/js/test/Ice/inheritance/Client.js +++ b/js/test/Ice/inheritance/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/inheritance/Makefile b/js/test/Ice/inheritance/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/inheritance/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/inheritance/Makefile.mak b/js/test/Ice/inheritance/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/inheritance/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/inheritanceBidir/.depend.mak b/js/test/Ice/inheritanceBidir/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/inheritanceBidir/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/inheritanceBidir/Client.js b/js/test/Ice/inheritanceBidir/Client.js index bfcb9bf6ff9..f8969d36ac6 100644 --- a/js/test/Ice/inheritanceBidir/Client.js +++ b/js/test/Ice/inheritanceBidir/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var InitialI = require("InitialI").InitialI; var Client = require("../inheritance/Client"); diff --git a/js/test/Ice/inheritanceBidir/InitialI.js b/js/test/Ice/inheritanceBidir/InitialI.js index 58181d5b265..3b8ad20f0b4 100644 --- a/js/test/Ice/inheritanceBidir/InitialI.js +++ b/js/test/Ice/inheritanceBidir/InitialI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Class = Ice.Class; diff --git a/js/test/Ice/inheritanceBidir/Makefile b/js/test/Ice/inheritanceBidir/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/inheritanceBidir/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/inheritanceBidir/Makefile.mak b/js/test/Ice/inheritanceBidir/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/inheritanceBidir/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/location/.depend.mak b/js/test/Ice/location/.depend.mak deleted file mode 100644 index b0d5b5eb0d9..00000000000 --- a/js/test/Ice/location/.depend.mak +++ /dev/null @@ -1,6 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/Locator.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" diff --git a/js/test/Ice/location/Client.js b/js/test/Ice/location/Client.js index 55d0f1d9029..ce68cf3a878 100644 --- a/js/test/Ice/location/Client.js +++ b/js/test/Ice/location/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/location/Makefile b/js/test/Ice/location/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/location/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/location/Makefile.mak b/js/test/Ice/location/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/location/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/objects/.depend.mak b/js/test/Ice/objects/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/objects/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js index 954542bb8d9..1291013fcdf 100644 --- a/js/test/Ice/objects/Client.js +++ b/js/test/Ice/objects/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/objects/Makefile b/js/test/Ice/objects/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/objects/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/objects/Makefile.mak b/js/test/Ice/objects/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/objects/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/operations/.depend.mak b/js/test/Ice/operations/.depend.mak deleted file mode 100644 index 70e0f8f3eb7..00000000000 --- a/js/test/Ice/operations/.depend.mak +++ /dev/null @@ -1,8 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" diff --git a/js/test/Ice/operations/BatchOneways.js b/js/test/Ice/operations/BatchOneways.js index 69fa2ad03fe..f75abca9d75 100644 --- a/js/test/Ice/operations/BatchOneways.js +++ b/js/test/Ice/operations/BatchOneways.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var run = function(communicator, prx, Test, bidir) diff --git a/js/test/Ice/operations/Client.js b/js/test/Ice/operations/Client.js index d3a130d8680..05a5ddbb9be 100644 --- a/js/test/Ice/operations/Client.js +++ b/js/test/Ice/operations/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Twoways = require("Twoways").Twoways; diff --git a/js/test/Ice/operations/Makefile b/js/test/Ice/operations/Makefile deleted file mode 100644 index 8323e9eaf0e..00000000000 --- a/js/test/Ice/operations/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/test/Ice/operations/Makefile.mak b/js/test/Ice/operations/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/operations/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/operations/Oneways.js b/js/test/Ice/operations/Oneways.js index 8d2362e504f..995258ece48 100644 --- a/js/test/Ice/operations/Oneways.js +++ b/js/test/Ice/operations/Oneways.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var run = function(communicator, prx, Test, bidir) diff --git a/js/test/Ice/operations/Twoways.js b/js/test/Ice/operations/Twoways.js index 7234b707991..e677afbe678 100644 --- a/js/test/Ice/operations/Twoways.js +++ b/js/test/Ice/operations/Twoways.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var run = function(communicator, prx, Test, bidir) diff --git a/js/test/Ice/operationsBidir/.depend.mak b/js/test/Ice/operationsBidir/.depend.mak deleted file mode 100644 index 821f06d2c9b..00000000000 --- a/js/test/Ice/operationsBidir/.depend.mak +++ /dev/null @@ -1,16 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" - -TestAMD.js: \ - .\TestAMD.ice \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" diff --git a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js b/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js index 2ca5cf43f01..22dee9d4206 100644 --- a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js +++ b/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var TestAMD = require("TestAMD").TestAMD; var Class = Ice.Class; diff --git a/js/test/Ice/operationsBidir/Client.js b/js/test/Ice/operationsBidir/Client.js index 3cd31bd3cd3..e0cad33d049 100644 --- a/js/test/Ice/operationsBidir/Client.js +++ b/js/test/Ice/operationsBidir/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var TestAMD = require("TestAMD").TestAMD; var MyDerivedClassI = require("MyDerivedClassI").MyDerivedClassI; diff --git a/js/test/Ice/operationsBidir/Makefile b/js/test/Ice/operationsBidir/Makefile deleted file mode 100644 index c45c5fe888c..00000000000 --- a/js/test/Ice/operationsBidir/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice \ - TestAMD.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/operationsBidir/Makefile.mak b/js/test/Ice/operationsBidir/Makefile.mak deleted file mode 100644 index 1e146fada63..00000000000 --- a/js/test/Ice/operationsBidir/Makefile.mak +++ /dev/null @@ -1,21 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js \ - TestAMD.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/operationsBidir/MyDerivedClassI.js b/js/test/Ice/operationsBidir/MyDerivedClassI.js index 122d24b6354..7e0b56f3b95 100644 --- a/js/test/Ice/operationsBidir/MyDerivedClassI.js +++ b/js/test/Ice/operationsBidir/MyDerivedClassI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Class = Ice.Class; diff --git a/js/test/Ice/optional/.depend.mak b/js/test/Ice/optional/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/optional/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js index 2a9f822549d..0c7151c0d69 100644 --- a/js/test/Ice/optional/Client.js +++ b/js/test/Ice/optional/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/optional/Makefile b/js/test/Ice/optional/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/optional/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/optional/Makefile.mak b/js/test/Ice/optional/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/optional/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/optionalBidir/.depend.mak b/js/test/Ice/optionalBidir/.depend.mak deleted file mode 100644 index 676031cb4d4..00000000000 --- a/js/test/Ice/optionalBidir/.depend.mak +++ /dev/null @@ -1,6 +0,0 @@ - -Test.js: \ - .\Test.ice - -TestAMD.js: \ - .\TestAMD.ice diff --git a/js/test/Ice/optionalBidir/AMDInitialI.js b/js/test/Ice/optionalBidir/AMDInitialI.js index 927fe3dfc1f..c27ae34607c 100644 --- a/js/test/Ice/optionalBidir/AMDInitialI.js +++ b/js/test/Ice/optionalBidir/AMDInitialI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var TestAMD = require("TestAMD").TestAMD; var Class = Ice.Class; diff --git a/js/test/Ice/optionalBidir/Client.js b/js/test/Ice/optionalBidir/Client.js index aa5adac9539..c07abc9e2c7 100644 --- a/js/test/Ice/optionalBidir/Client.js +++ b/js/test/Ice/optionalBidir/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var TestAMD = require("TestAMD").TestAMD; var InitialI = require("InitialI").InitialI; diff --git a/js/test/Ice/optionalBidir/InitialI.js b/js/test/Ice/optionalBidir/InitialI.js index aeea628a4c5..d741f523b6d 100644 --- a/js/test/Ice/optionalBidir/InitialI.js +++ b/js/test/Ice/optionalBidir/InitialI.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Class = Ice.Class; diff --git a/js/test/Ice/optionalBidir/Makefile b/js/test/Ice/optionalBidir/Makefile deleted file mode 100644 index c45c5fe888c..00000000000 --- a/js/test/Ice/optionalBidir/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice \ - TestAMD.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/optionalBidir/Makefile.mak b/js/test/Ice/optionalBidir/Makefile.mak deleted file mode 100644 index db6af2e3924..00000000000 --- a/js/test/Ice/optionalBidir/Makefile.mak +++ /dev/null @@ -1,21 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js \ - TestAMD.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/promise/Client.js b/js/test/Ice/promise/Client.js index 696b0f7c360..d978a1f21f7 100644 --- a/js/test/Ice/promise/Client.js +++ b/js/test/Ice/promise/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Promise = Ice.Promise; var test = function(b) diff --git a/js/test/Ice/promise/Makefile b/js/test/Ice/promise/Makefile deleted file mode 100644 index ea93adcd2bc..00000000000 --- a/js/test/Ice/promise/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -include $(top_srcdir)/config/Make.rules.js - diff --git a/js/test/Ice/promise/Makefile.mak b/js/test/Ice/promise/Makefile.mak deleted file mode 100644 index 9b7beb524dc..00000000000 --- a/js/test/Ice/promise/Makefile.mak +++ /dev/null @@ -1,16 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js index 9127b93e806..39cc93e81c5 100644 --- a/js/test/Ice/properties/Client.js +++ b/js/test/Ice/properties/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Promise = Ice.Promise; var test = function(b) diff --git a/js/test/Ice/properties/Makefile b/js/test/Ice/properties/Makefile deleted file mode 100644 index ea93adcd2bc..00000000000 --- a/js/test/Ice/properties/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -include $(top_srcdir)/config/Make.rules.js - diff --git a/js/test/Ice/properties/Makefile.mak b/js/test/Ice/properties/Makefile.mak deleted file mode 100644 index 9b7beb524dc..00000000000 --- a/js/test/Ice/properties/Makefile.mak +++ /dev/null @@ -1,16 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js diff --git a/js/test/Ice/proxy/.depend.mak b/js/test/Ice/proxy/.depend.mak deleted file mode 100644 index 70e0f8f3eb7..00000000000 --- a/js/test/Ice/proxy/.depend.mak +++ /dev/null @@ -1,8 +0,0 @@ - -Test.js: \ - .\Test.ice \ - "$(slicedir)/Ice/Current.ice" \ - "$(slicedir)/Ice/ObjectAdapterF.ice" \ - "$(slicedir)/Ice/ConnectionF.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/Version.ice" diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js index d38e9723aec..9cda7c15187 100644 --- a/js/test/Ice/proxy/Client.js +++ b/js/test/Ice/proxy/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/proxy/Makefile b/js/test/Ice/proxy/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/proxy/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/proxy/Makefile.mak b/js/test/Ice/proxy/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/proxy/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/retry/.depend.mak b/js/test/Ice/retry/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/retry/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/retry/Client.js b/js/test/Ice/retry/Client.js index 1d92136ed21..a7d9ec81e58 100644 --- a/js/test/Ice/retry/Client.js +++ b/js/test/Ice/retry/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/retry/Makefile b/js/test/Ice/retry/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/retry/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/retry/Makefile.mak b/js/test/Ice/retry/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/retry/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/slicing/Makefile b/js/test/Ice/slicing/Makefile deleted file mode 100644 index 1a1691744b5..00000000000 --- a/js/test/Ice/slicing/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules.js - -SUBDIRS = exceptions objects - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/test/Ice/slicing/Makefile.mak b/js/test/Ice/slicing/Makefile.mak deleted file mode 100644 index dc0ce4a754d..00000000000 --- a/js/test/Ice/slicing/Makefile.mak +++ /dev/null @@ -1,19 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -!include $(top_srcdir)\config\Make.rules.mak.js - -SUBDIRS = exceptions objects - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/js/test/Ice/slicing/exceptions/.depend.mak b/js/test/Ice/slicing/exceptions/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/slicing/exceptions/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/slicing/exceptions/Client.js b/js/test/Ice/slicing/exceptions/Client.js index 4a9c84d474b..e1c9d4c54ce 100644 --- a/js/test/Ice/slicing/exceptions/Client.js +++ b/js/test/Ice/slicing/exceptions/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; var ArrayUtil = Ice.ArrayUtil; diff --git a/js/test/Ice/slicing/exceptions/Makefile b/js/test/Ice/slicing/exceptions/Makefile deleted file mode 100644 index 547307f9567..00000000000 --- a/js/test/Ice/slicing/exceptions/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/slicing/exceptions/Makefile.mak b/js/test/Ice/slicing/exceptions/Makefile.mak deleted file mode 100644 index f2bd748862e..00000000000 --- a/js/test/Ice/slicing/exceptions/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/slicing/objects/.depend.mak b/js/test/Ice/slicing/objects/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/slicing/objects/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/slicing/objects/Client.js b/js/test/Ice/slicing/objects/Client.js index 89d075d0fd4..feafe51ebbf 100644 --- a/js/test/Ice/slicing/objects/Client.js +++ b/js/test/Ice/slicing/objects/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; var ArrayUtil = Ice.ArrayUtil; diff --git a/js/test/Ice/slicing/objects/Makefile b/js/test/Ice/slicing/objects/Makefile deleted file mode 100644 index 547307f9567..00000000000 --- a/js/test/Ice/slicing/objects/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/slicing/objects/Makefile.mak b/js/test/Ice/slicing/objects/Makefile.mak deleted file mode 100644 index f2bd748862e..00000000000 --- a/js/test/Ice/slicing/objects/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Ice/timeout/.depend.mak b/js/test/Ice/timeout/.depend.mak deleted file mode 100644 index a3b320ad9c2..00000000000 --- a/js/test/Ice/timeout/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Test.js: \ - .\Test.ice diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js index 5fb7db3494f..d663234adc2 100644 --- a/js/test/Ice/timeout/Client.js +++ b/js/test/Ice/timeout/Client.js @@ -9,7 +9,7 @@ (function(module, require, exports) { - var Ice = require("icejs").Ice; + var Ice = require("zeroc-icejs").Ice; var Test = require("Test").Test; var Promise = Ice.Promise; diff --git a/js/test/Ice/timeout/Makefile b/js/test/Ice/timeout/Makefile deleted file mode 100644 index 581f67ca507..00000000000 --- a/js/test/Ice/timeout/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = index.html - -SLICES = Test.ice - -GEN_SRCS = $(patsubst %.ice, %.js, $(SLICES)) - -SRCS = Client.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - diff --git a/js/test/Ice/timeout/Makefile.mak b/js/test/Ice/timeout/Makefile.mak deleted file mode 100644 index 25dea50aabd..00000000000 --- a/js/test/Ice/timeout/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -TARGETS = index.html - -GEN_SRCS = Test.js - -SRCS = Client.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/test/Makefile b/js/test/Makefile deleted file mode 100644 index 4c91b87fe75..00000000000 --- a/js/test/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/config/Make.rules.js - -SUBDIRS = Common Ice Glacier2 - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/test/Makefile.mak b/js/test/Makefile.mak deleted file mode 100644 index 67313273b2c..00000000000 --- a/js/test/Makefile.mak +++ /dev/null @@ -1,19 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)\config\Make.rules.mak.js - -SUBDIRS = Common Ice Glacier2 - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 |