diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
| commit | ee3b7be185f7d887a33b9c242a7ccd08a09d2614 (patch) | |
| tree | 1974211a0cbd5e3df95b6deed0b2b42f7854aca9 /cpp/src | |
| parent | Rename files for consistency (diff) | |
| download | ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.bz2 ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.xz ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.zip | |
Re-factored gmake build system
Diffstat (limited to 'cpp/src')
81 files changed, 1110 insertions, 2793 deletions
diff --git a/cpp/src/Glacier2/.gitignore b/cpp/src/Glacier2/.gitignore deleted file mode 100644 index 093e464bbf3..00000000000 --- a/cpp/src/Glacier2/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -Instrumentation.cpp -Instrumentation.h diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile deleted file mode 100644 index 461dda303fa..00000000000 --- a/cpp/src/Glacier2/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -ROUTER = $(bindir)/glacier2router -TARGETS = $(ROUTER) - -SLICE_OBJS = Instrumentation.o - -OBJS = Blobject.o \ - ClientBlobject.o \ - FilterI.o \ - FilterManager.o \ - Glacier2Router.o \ - Instance.o \ - InstrumentationI.o \ - ProxyVerifier.o \ - RequestQueue.o \ - RouterI.o \ - RoutingTable.o \ - ServerBlobject.o \ - SessionRouterI.o \ - $(SLICE_OBJS) - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -SLICE2CPPFLAGS := --include-dir Glacier2 $(SLICE2CPPFLAGS) - -$(ROUTER): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) -lGlacier2 $(LIBS) -lIceSSL $(OPENSSL_RPATH_LINK) - -install:: all - $(call installprogram,$(ROUTER),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/glacier2router.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk new file mode 100644 index 00000000000..5b3ef8f7dee --- /dev/null +++ b/cpp/src/Glacier2/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_programs := glacier2router +$(project)_sliceflags := --include-dir Glacier2 +$(project)_generated_includedir := $(project)/generated/Glacier2 +$(project)_dependencies := Glacier2 IceSSL Ice IceUtil + +glacier2router_targetdir := $(bindir) + +projects += $(project) diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore b/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile deleted file mode 100644 index ebd42abf31e..00000000000 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile +++ /dev/null @@ -1,44 +0,0 @@ - -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,Glacier2CryptPermissionsVerifier,$(VERSION)) -SONAME = $(call mksoname,Glacier2CryptPermissionsVerifier,$(SOVERSION)) -LIBNAME = $(call mklibname,Glacier2CryptPermissionsVerifier) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -OBJS = CryptPermissionsVerifierI.o - -SRCS = $(OBJS:.o=.cpp) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS - -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil -lGlacier2 $(CRYPT_OS_LIBS) $(CXXLIBS) - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk new file mode 100644 index 00000000000..203c8322826 --- /dev/null +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries += Glacier2CryptPermissionsVerifier + +Glacier2CryptPermissionsVerifier_targetdir := $(libdir) +Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice IceUtil +Glacier2CryptPermissionsVerifier_system_libs := $(CRYPT_OS_LIBS) +Glacier2CryptPermissionsVerifier_cppflags := -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS + +projects += $(project) diff --git a/cpp/src/Glacier2Lib/.gitignore b/cpp/src/Glacier2Lib/.gitignore deleted file mode 100644 index 95b4c5cf67d..00000000000 --- a/cpp/src/Glacier2Lib/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -Metrics.cpp -PermissionsVerifierF.cpp -PermissionsVerifier.cpp -Router.cpp -RouterF.cpp -Session.cpp -SSLInfo.cpp -Metrics.h -PermissionsVerifierF.h -PermissionsVerifier.h -Router.h -RouterF.h -Session.h -SSLInfo.h diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile deleted file mode 100644 index d9ee3d28461..00000000000 --- a/cpp/src/Glacier2Lib/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,Glacier2,$(VERSION)) -SONAME = $(call mksoname,Glacier2,$(SOVERSION)) -LIBNAME = $(call mklibname,Glacier2) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = Metrics.o \ - PermissionsVerifierF.o \ - PermissionsVerifier.o \ - Router.o \ - RouterF.o \ - Session.o \ - SSLInfo.o - -OBJS = Application.o \ - NullPermissionsVerifier.o \ - SessionHelper.o \ - $(SLICE_OBJS) - -HDIR = $(headerdir)/Glacier2 -SDIR = $(slicedir)/Glacier2 - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) -DGLACIER2_API_EXPORTS -SLICE2CPPFLAGS := --ice --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil - -$(libdir)/$(LIBFILENAME): $(OBJS) $(HDIR)/PermissionsVerifierF.h $(HDIR)/RouterF.h - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk new file mode 100644 index 00000000000..c765292df9d --- /dev/null +++ b/cpp/src/Glacier2Lib/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := Glacier2 + +Glacier2_targetdir := $(libdir) +Glacier2_dependencies := Ice IceUtil +Glacier2_cppflags := -DGLACIER2_API_EXPORTS +Glacier2_sliceflags := --include-dir Glacier2 --dll-export GLACIER2_API + +projects += $(project)
\ No newline at end of file diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore deleted file mode 100644 index 0254d46a775..00000000000 --- a/cpp/src/Ice/.gitignore +++ /dev/null @@ -1,84 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -BuiltinSequences.cpp -Communicator.cpp -CommunicatorF.cpp -Connection.cpp -ConnectionF.cpp -Current.cpp -Endpoint.cpp -EndpointF.cpp -EndpointTypes.cpp -FacetMap.cpp -Identity.cpp -ImplicitContext.cpp -ImplicitContextF.cpp -Instrumentation.cpp -InstrumentationF.cpp -LocalException.cpp -Locator.cpp -LocatorF.cpp -Logger.cpp -LoggerF.cpp -Metrics.cpp -ObjectAdapter.cpp -ObjectAdapterF.cpp -ObjectFactory.cpp -ObjectFactoryF.cpp -Plugin.cpp -PluginF.cpp -Process.cpp -ProcessF.cpp -Properties.cpp -PropertiesAdmin.cpp -PropertiesF.cpp -RemoteLogger.cpp -Router.cpp -RouterF.cpp -ServantLocator.cpp -ServantLocatorF.cpp -SliceChecksumDict.cpp -ValueFactory.cpp -Version.cpp -BuiltinSequences.h -Communicator.h -CommunicatorF.h -Connection.h -ConnectionF.h -Current.h -Endpoint.h -EndpointF.h -EndpointTypes.h -FacetMap.h -Identity.h -ImplicitContext.h -ImplicitContextF.h -Instrumentation.h -InstrumentationF.h -LocalException.h -Locator.h -LocatorF.h -Logger.h -LoggerF.h -Metrics.h -ObjectAdapter.h -ObjectAdapterF.h -ObjectFactory.h -ObjectFactoryF.h -Plugin.h -PluginF.h -Process.h -ProcessF.h -Properties.h -PropertiesAdmin.h -PropertiesF.h -RemoteLogger.h -Router.h -RouterF.h -ServantLocator.h -ServantLocatorF.h -SliceChecksumDict.h -Version.h diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile deleted file mode 100644 index 32a26bcbb2d..00000000000 --- a/cpp/src/Ice/Makefile +++ /dev/null @@ -1,197 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,Ice,$(VERSION)) -SONAME = $(call mksoname,Ice,$(SOVERSION)) -LIBNAME = $(call mklibname,Ice) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = BuiltinSequences.o \ - Communicator.o \ - CommunicatorF.o \ - Connection.o \ - ConnectionF.o \ - Current.o \ - Endpoint.o \ - EndpointF.o \ - EndpointTypes.o \ - FacetMap.o \ - Identity.o \ - ImplicitContext.o \ - ImplicitContextF.o \ - Instrumentation.o \ - InstrumentationF.o \ - LocalException.o \ - Locator.o \ - LocatorF.o \ - Logger.o \ - LoggerF.o \ - Metrics.o \ - ObjectAdapter.o \ - ObjectAdapterF.o \ - ObjectFactory.o \ - Plugin.o \ - PluginF.o \ - Process.o \ - ProcessF.o \ - Properties.o \ - PropertiesAdmin.o \ - PropertiesF.o \ - RemoteLogger.o \ - Router.o \ - RouterF.o \ - ServantLocator.o \ - ServantLocatorF.o \ - SliceChecksumDict.o \ - ValueFactory.o \ - Version.o - -OBJS = Acceptor.o \ - ACM.o \ - Application.o \ - AsyncResult.o \ - Base64.o \ - BatchRequestQueue.o \ - Buffer.o \ - CollocatedRequestHandler.o \ - CommunicatorI.o \ - ConnectionFactory.o \ - ConnectionI.o \ - ConnectionRequestHandler.o \ - Connector.o \ - ConnectRequestHandler.o \ - DefaultsAndOverrides.o \ - DispatchInterceptor.o \ - DynamicLibrary.o \ - EndpointFactory.o \ - EndpointFactoryManager.o \ - EndpointI.o \ - EventHandler.o \ - Exception.o \ - FactoryTable.o \ - FactoryTableInit.o \ - GCObject.o \ - HttpParser.o \ - ImplicitContextI.o \ - Incoming.o \ - IncomingAsync.o \ - Initialize.o \ - InputStream.o \ - Instance.o \ - InstrumentationI.o \ - IPEndpointI.o \ - LocalObject.o \ - LocatorInfo.o \ - LoggerAdminI.o \ - LoggerI.o \ - LoggerUtil.o \ - MetricsAdminI.o \ - MetricsObserverI.o \ - Network.o \ - NetworkProxy.o \ - Object.o \ - ObjectAdapterFactory.o \ - ObjectAdapterI.o \ - ObserverHelper.o \ - OpaqueEndpointI.o \ - Outgoing.o \ - OutgoingAsync.o \ - OutputStream.o \ - PluginManagerI.o \ - PropertiesAdminI.o \ - PropertiesI.o \ - PropertyNames.o \ - Protocol.o \ - ProtocolInstance.o \ - ProtocolPluginFacade.o \ - Proxy.o \ - ProxyFactory.o \ - Reference.o \ - ReferenceFactory.o \ - RegisterPluginsInit.o \ - RequestHandler.o \ - RequestHandlerFactory.o \ - ResponseHandler.o \ - RetryQueue.o \ - RouterInfo.o \ - Selector.o \ - ServantManager.o \ - SliceChecksums.o \ - SlicedData.o \ - StreamSocket.o \ - TcpAcceptor.o \ - TcpConnector.o \ - TcpEndpointI.o \ - TcpTransceiver.o \ - ThreadPool.o \ - TraceLevels.o \ - TraceUtil.o \ - Transceiver.o \ - UdpConnector.o \ - UdpEndpointI.o \ - UdpTransceiver.o \ - Value.o \ - ValueFactoryManagerI.o \ - WSAcceptor.o \ - WSConnector.o \ - WSEndpoint.o \ - WSTransceiver.o \ - $(SLICE_OBJS) - -ifeq ($(findstring MINGW,$(shell uname)),) -OBJS := $(OBJS) \ - Service.o \ - SysLoggerI.o -endif - -HDIR = $(headerdir)/Ice -SDIR = $(slicedir)/Ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_API_EXPORTS $(BZIP2_FLAGS) -ifneq ($(COMPSUFFIX),) -CPPFLAGS := $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\" -endif -SLICE2CPPFLAGS := --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) - -LINKWITH := -lIceUtil $(BZIP2_LIBS) $(ICE_OS_LIBS) $(ICONV_LIBS) - -ifeq ($(UNAME),MINGW) -$(OBJS): $(BZIP2_NUPKG) -endif - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) -ifeq ($(UNAME),MINGW) - $(call installlib,$(DESTDIR)$(install_libdir),$(BZIP2_HOME)/build/native/bin/$(PLATFORM),bzip2_mingw.dll,,) -endif diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk new file mode 100644 index 00000000000..cc3dbc55b5e --- /dev/null +++ b/cpp/src/Ice/Makefile.mk @@ -0,0 +1,20 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries = Ice + +Ice_targetdir := $(libdir) +Ice_dependencies := IceUtil +Ice_cppflags := -DICE_API_EXPORTS +Ice_sliceflags := --include-dir Ice --dll-export ICE_API +Ice_libs := bz2 +Ice_system_libs := $(ICE_OS_LIBS) +Ice_excludes := $(currentdir)/DLLMain.cpp + +projects += $(project) diff --git a/cpp/src/IceBT/.gitignore b/cpp/src/IceBT/.gitignore deleted file mode 100644 index 72e3ccb71f5..00000000000 --- a/cpp/src/IceBT/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -EndpointInfo.cpp -ConnectionInfo.cpp -Types.cpp diff --git a/cpp/src/IceBT/Makefile b/cpp/src/IceBT/Makefile deleted file mode 100644 index c57848d0289..00000000000 --- a/cpp/src/IceBT/Makefile +++ /dev/null @@ -1,67 +0,0 @@ - -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceBT,$(VERSION)) -SONAME = $(call mksoname,IceBT,$(SOVERSION)) -LIBNAME = $(call mklibname,IceBT) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = ConnectionInfo.o \ - EndpointInfo.o \ - Types.o - -OBJS = AcceptorI.o \ - ConnectorI.o \ - DBus.o \ - EndpointI.o \ - Engine.o \ - Instance.o \ - PluginI.o \ - StreamSocket.o \ - TransceiverI.o \ - Util.o \ - $(SLICE_OBJS) - -HDIR = $(headerdir)/IceBT -SDIR = $(slicedir)/IceBT - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_BT_API_EXPORTS `pkg-config --cflags dbus-1` -SLICE2CPPFLAGS := --ice --include-dir IceBT --dll-export ICE_BT_API $(SLICE2CPPFLAGS) - -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceXML -lIceUtil `pkg-config --libs dbus-1` $(CXXLIBS) - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk new file mode 100644 index 00000000000..4f48feff509 --- /dev/null +++ b/cpp/src/IceBT/Makefile.mk @@ -0,0 +1,22 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +ifneq ($(filter debian ubuntu,$(linux_id)),) + +$(project)_libraries := IceBT + +IceBT_targetdir := $(libdir) +IceBT_dependencies := IceXML Ice IceUtil +IceBT_cppflags := -DICEBT_API_EXPORTS `pkg-config --cflags dbus-1` +IceBT_system_libs := $(SSL_OS_LIBS) `pkg-config --libs dbus-1` +IceBT_sliceflags := --include-dir IceBT --dll-export ICESSL_API + +projects += $(project) + +endif diff --git a/cpp/src/IceBox/.gitignore b/cpp/src/IceBox/.gitignore deleted file mode 100644 index c483621af47..00000000000 --- a/cpp/src/IceBox/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -IceBox.cpp -IceBox.h diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile deleted file mode 100644 index acacecfc27a..00000000000 --- a/cpp/src/IceBox/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION)) -SONAME = $(call mksoname,IceBox,$(SOVERSION)) -LIBNAME = $(call mklibname,IceBox) - -SERVER = $(bindir)/icebox$(binsuffix) -ADMIN = $(bindir)/iceboxadmin - -LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) -TARGETS = $(LIBTARGETS) $(SERVER) $(ADMIN) - -SLICE_OBJS = IceBox.o - -LIB_OBJS = Exception.o \ - $(SLICE_OBJS) - -SOBJS = Service.o \ - ServiceManagerI.o - -AOBJS = Admin.o - -OBJS = $(LIB_OBJS) \ - $(SOBJS) \ - $(AOBJS) - -HDIR = $(headerdir)/IceBox -SDIR = $(slicedir)/IceBox - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -SLICE2CPPFLAGS := --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil - -$(libdir)/$(LIBFILENAME): $(LIB_OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(LIB_OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -$(SERVER): $(SOBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lIceBox $(LIBS) - -$(ADMIN): $(AOBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(AOBJS) -lIceBox $(LIBS) - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icebox.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/iceboxadmin.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk new file mode 100644 index 00000000000..f1499a055b0 --- /dev/null +++ b/cpp/src/IceBox/Makefile.mk @@ -0,0 +1,26 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceBox +$(project)_programs := icebox iceboxadmin +$(project)_dependencies := Ice IceUtil +$(project)_sliceflags := --include-dir IceBox --dll-export ICEBOX_API + +IceBox_targetdir := $(libdir) +IceBox_sources := $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp + +icebox_targetdir := $(bindir) +icebox_sources := $(currentdir)/Service.cpp $(currentdir)/ServiceManagerI.cpp +icebox_dependencies := IceBox + +iceboxadmin_targetdir := $(bindir) +iceboxadmin_sources := $(currentdir)/Admin.cpp +iceboxadmin_dependencies:= IceBox + +projects += $(project) diff --git a/cpp/src/IceDB/Makefile b/cpp/src/IceDB/Makefile deleted file mode 100644 index 57331b59756..00000000000 --- a/cpp/src/IceDB/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceDB,$(VERSION)) -SONAME = $(call mksoname,IceDB,$(SOVERSION)) -LIBNAME = $(call mklibname,IceDB) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -OBJS = IceDB.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := $(CPPFLAGS) -DICE_DB_API_EXPORTS -I.. $(LMDB_FLAGS) -LINKWITH := -lIce -lIceUtil $(LMDB_LIBS) - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icestormadmin.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk new file mode 100644 index 00000000000..dc609000c3c --- /dev/null +++ b/cpp/src/IceDB/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries = IceDB + +IceDB_targetdir := $(libdir) +IceDB_dependencies := Ice IceUtil +IceDB_libs := lmdb +IceDB_cppflags := -DICE_DB_API_EXPORTS + +projects += $(project) + diff --git a/cpp/src/IceDiscovery/.gitignore b/cpp/src/IceDiscovery/.gitignore deleted file mode 100644 index 07790f7db33..00000000000 --- a/cpp/src/IceDiscovery/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -IceDiscovery.cpp -IceDiscovery.h diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile deleted file mode 100644 index b9f4f5dd9e3..00000000000 --- a/cpp/src/IceDiscovery/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceDiscovery,$(VERSION)) -SONAME = $(call mksoname,IceDiscovery,$(SOVERSION)) -LIBNAME = $(call mklibname,IceDiscovery) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = IceDiscovery.o - -OBJS = LocatorI.o \ - LookupI.o \ - PluginI.o \ - $(SLICE_OBJS) - -HDIR = $(headerdir)/IceDiscovery -SDIR = $(slicedir)/IceDiscovery - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_DISCOVERY_API_EXPORTS -SLICE2CPPFLAGS := --ice --include-dir IceDiscovery $(SLICE2CPPFLAGS) - -LINKWITH := -lIce -lIceUtil $(CXXLIBS) - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -../IceDiscovery/IceDiscovery.h IceDiscovery.cpp: \ - $(slicedir)/IceDiscovery/IceDiscovery.ice $(SLICE2CPP) $(SLICEPARSERLIB) - rm -f IceDiscovery.h IceDiscovery.cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceDiscovery/IceDiscovery.ice - @touch IceDiscovery.cpp - @mkdir -p .depend - @$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(slicedir)/IceDiscovery/IceDiscovery.ice > .depend/IceDiscovery.ice.d - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk new file mode 100644 index 00000000000..67ee53b1c8f --- /dev/null +++ b/cpp/src/IceDiscovery/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceDiscovery + +IceDiscovery_targetdir := $(libdir) +IceDiscovery_dependencies := Ice IceUtil +IceDiscovery_sliceflags := --include-dir IceDiscovery +IceDiscovery_generated_includedir := $(project)/generated/IceDiscovery +IceDiscovery_cppflags := -DICE_DISCOVERY_API_EXPORTS + +projects += $(project) diff --git a/cpp/src/IceGrid/.gitignore b/cpp/src/IceGrid/.gitignore deleted file mode 100644 index 0115ebcad98..00000000000 --- a/cpp/src/IceGrid/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -Internal.cpp -IceLocatorDiscovery.cpp -DBTypes.cpp -Internal.h -DBTypes.h -DBTypes.cpp diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp index d7aa96978c6..a10ceeee3fc 100644 --- a/cpp/src/IceGrid/Grammar.cpp +++ b/cpp/src/IceGrid/Grammar.cpp @@ -1,23 +1,24 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -28,7 +29,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -46,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -54,21 +55,106 @@ /* Pure parsers. */ #define YYPURE 1 -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - /* Using locations. */ #define YYLSP_NEEDED 0 -/* Copy the first part of user declarations. */ +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + ICE_GRID_HELP = 258, + ICE_GRID_EXIT = 259, + ICE_GRID_APPLICATION = 260, + ICE_GRID_NODE = 261, + ICE_GRID_REGISTRY = 262, + ICE_GRID_SERVER = 263, + ICE_GRID_ADAPTER = 264, + ICE_GRID_PING = 265, + ICE_GRID_LOAD = 266, + ICE_GRID_SOCKETS = 267, + ICE_GRID_ADD = 268, + ICE_GRID_REMOVE = 269, + ICE_GRID_LIST = 270, + ICE_GRID_SHUTDOWN = 271, + ICE_GRID_STRING = 272, + ICE_GRID_START = 273, + ICE_GRID_STOP = 274, + ICE_GRID_PATCH = 275, + ICE_GRID_SIGNAL = 276, + ICE_GRID_STDOUT = 277, + ICE_GRID_STDERR = 278, + ICE_GRID_DESCRIBE = 279, + ICE_GRID_PROPERTIES = 280, + ICE_GRID_PROPERTY = 281, + ICE_GRID_STATE = 282, + ICE_GRID_PID = 283, + ICE_GRID_ENDPOINTS = 284, + ICE_GRID_ACTIVATION = 285, + ICE_GRID_OBJECT = 286, + ICE_GRID_FIND = 287, + ICE_GRID_SHOW = 288, + ICE_GRID_COPYING = 289, + ICE_GRID_WARRANTY = 290, + ICE_GRID_DIFF = 291, + ICE_GRID_UPDATE = 292, + ICE_GRID_INSTANTIATE = 293, + ICE_GRID_TEMPLATE = 294, + ICE_GRID_SERVICE = 295, + ICE_GRID_ENABLE = 296, + ICE_GRID_DISABLE = 297 + }; +#endif +/* Tokens. */ +#define ICE_GRID_HELP 258 +#define ICE_GRID_EXIT 259 +#define ICE_GRID_APPLICATION 260 +#define ICE_GRID_NODE 261 +#define ICE_GRID_REGISTRY 262 +#define ICE_GRID_SERVER 263 +#define ICE_GRID_ADAPTER 264 +#define ICE_GRID_PING 265 +#define ICE_GRID_LOAD 266 +#define ICE_GRID_SOCKETS 267 +#define ICE_GRID_ADD 268 +#define ICE_GRID_REMOVE 269 +#define ICE_GRID_LIST 270 +#define ICE_GRID_SHUTDOWN 271 +#define ICE_GRID_STRING 272 +#define ICE_GRID_START 273 +#define ICE_GRID_STOP 274 +#define ICE_GRID_PATCH 275 +#define ICE_GRID_SIGNAL 276 +#define ICE_GRID_STDOUT 277 +#define ICE_GRID_STDERR 278 +#define ICE_GRID_DESCRIBE 279 +#define ICE_GRID_PROPERTIES 280 +#define ICE_GRID_PROPERTY 281 +#define ICE_GRID_STATE 282 +#define ICE_GRID_PID 283 +#define ICE_GRID_ENDPOINTS 284 +#define ICE_GRID_ACTIVATION 285 +#define ICE_GRID_OBJECT 286 +#define ICE_GRID_FIND 287 +#define ICE_GRID_SHOW 288 +#define ICE_GRID_COPYING 289 +#define ICE_GRID_WARRANTY 290 +#define ICE_GRID_DIFF 291 +#define ICE_GRID_UPDATE 292 +#define ICE_GRID_INSTANTIATE 293 +#define ICE_GRID_TEMPLATE 294 +#define ICE_GRID_SERVICE 295 +#define ICE_GRID_ENABLE 296 +#define ICE_GRID_DISABLE 297 -/* Line 189 of yacc.c */ -#line 1 "Grammar.y" + + + +/* Copy the first part of user declarations. */ +#line 1 "src/IceGrid/Grammar.y" // ********************************************************************** @@ -110,9 +196,6 @@ yyerror(const char* s) -/* Line 189 of yacc.c */ -#line 115 "Grammar.tab.c" - /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -131,71 +214,20 @@ yyerror(const char* s) # define YYTOKEN_TABLE 0 #endif - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - ICE_GRID_HELP = 258, - ICE_GRID_EXIT = 259, - ICE_GRID_APPLICATION = 260, - ICE_GRID_NODE = 261, - ICE_GRID_REGISTRY = 262, - ICE_GRID_SERVER = 263, - ICE_GRID_ADAPTER = 264, - ICE_GRID_PING = 265, - ICE_GRID_LOAD = 266, - ICE_GRID_SOCKETS = 267, - ICE_GRID_ADD = 268, - ICE_GRID_REMOVE = 269, - ICE_GRID_LIST = 270, - ICE_GRID_SHUTDOWN = 271, - ICE_GRID_STRING = 272, - ICE_GRID_START = 273, - ICE_GRID_STOP = 274, - ICE_GRID_PATCH = 275, - ICE_GRID_SIGNAL = 276, - ICE_GRID_STDOUT = 277, - ICE_GRID_STDERR = 278, - ICE_GRID_DESCRIBE = 279, - ICE_GRID_PROPERTIES = 280, - ICE_GRID_PROPERTY = 281, - ICE_GRID_STATE = 282, - ICE_GRID_PID = 283, - ICE_GRID_ENDPOINTS = 284, - ICE_GRID_ACTIVATION = 285, - ICE_GRID_OBJECT = 286, - ICE_GRID_FIND = 287, - ICE_GRID_SHOW = 288, - ICE_GRID_COPYING = 289, - ICE_GRID_WARRANTY = 290, - ICE_GRID_DIFF = 291, - ICE_GRID_UPDATE = 292, - ICE_GRID_INSTANTIATE = 293, - ICE_GRID_TEMPLATE = 294, - ICE_GRID_SERVICE = 295, - ICE_GRID_ENABLE = 296, - ICE_GRID_DISABLE = 297 - }; -#endif - - - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif + /* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ -#line 199 "Grammar.tab.c" +/* Line 216 of yacc.c. */ +#line 231 "src/IceGrid/Grammar.cpp" #ifdef short # undef short @@ -245,7 +277,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -270,14 +302,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int yyi) +YYID (int i) #else static int -YYID (yyi) - int yyi; +YYID (i) + int i; #endif { - return yyi; + return i; } #endif @@ -358,9 +390,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; -}; + yytype_int16 yyss; + YYSTYPE yyvs; + }; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -394,12 +426,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ +# define YYSTACK_RELOCATE(Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -1421,7 +1453,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1532,20 +1564,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -1579,11 +1608,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - YYFPRINTF (stderr, " $%d = ", yyi + 1); + fprintf (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - YYFPRINTF (stderr, "\n"); + fprintf (stderr, "\n"); } } @@ -1863,8 +1892,10 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } + /* Prevent warnings from -Wmissing-prototypes. */ + #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1883,9 +1914,10 @@ int yyparse (); -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ + +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1909,46 +1941,22 @@ yyparse () #endif #endif { -/* The lookahead symbol. */ + /* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ - int yynerrs; - - int yystate; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; - - YYSIZE_T yystacksize; +/* Number of syntax errors so far. */ +int yynerrs; + int yystate; int yyn; int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; #if YYERROR_VERBOSE /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; @@ -1956,28 +1964,51 @@ YYSTYPE yylval; YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + + #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yystacksize = YYINITDEPTH; - YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ + yyssp = yyss; yyvsp = yyvs; @@ -2007,6 +2038,7 @@ YYSTYPE yylval; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; + /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -2014,6 +2046,7 @@ YYSTYPE yylval; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); yyss = yyss1; @@ -2036,8 +2069,9 @@ YYSTYPE yylval; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2048,6 +2082,7 @@ YYSTYPE yylval; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; + YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -2057,9 +2092,6 @@ YYSTYPE yylval; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - if (yystate == YYFINAL) - YYACCEPT; - goto yybackup; /*-----------. @@ -2068,16 +2100,16 @@ YYSTYPE yylval; yybackup: /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ + look-ahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2109,16 +2141,20 @@ yybackup: goto yyreduce; } + if (yyn == YYFINAL) + YYACCEPT; + /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the lookahead token. */ + /* Shift the look-ahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token. */ - yychar = YYEMPTY; + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -2158,1049 +2194,815 @@ yyreduce: switch (yyn) { case 2: - -/* Line 1455 of yacc.c */ -#line 96 "Grammar.y" +#line 96 "src/IceGrid/Grammar.y" { ;} break; case 3: - -/* Line 1455 of yacc.c */ -#line 99 "Grammar.y" +#line 99 "src/IceGrid/Grammar.y" { ;} break; case 4: - -/* Line 1455 of yacc.c */ -#line 107 "Grammar.y" +#line 107 "src/IceGrid/Grammar.y" { ;} break; case 5: - -/* Line 1455 of yacc.c */ -#line 110 "Grammar.y" +#line 110 "src/IceGrid/Grammar.y" { ;} break; case 6: - -/* Line 1455 of yacc.c */ -#line 116 "Grammar.y" +#line 116 "src/IceGrid/Grammar.y" { parser->checkInterrupted(); ;} break; case 7: - -/* Line 1455 of yacc.c */ -#line 125 "Grammar.y" +#line 125 "src/IceGrid/Grammar.y" { parser->usage(); ;} break; case 8: - -/* Line 1455 of yacc.c */ -#line 129 "Grammar.y" +#line 129 "src/IceGrid/Grammar.y" { return 0; ;} break; case 9: - -/* Line 1455 of yacc.c */ -#line 133 "Grammar.y" +#line 133 "src/IceGrid/Grammar.y" { parser->addApplication((yyvsp[(3) - (4)])); ;} break; case 10: - -/* Line 1455 of yacc.c */ -#line 137 "Grammar.y" +#line 137 "src/IceGrid/Grammar.y" { parser->usage("application", "add"); ;} break; case 11: - -/* Line 1455 of yacc.c */ -#line 141 "Grammar.y" +#line 141 "src/IceGrid/Grammar.y" { parser->removeApplication((yyvsp[(3) - (4)])); ;} break; case 12: - -/* Line 1455 of yacc.c */ -#line 145 "Grammar.y" +#line 145 "src/IceGrid/Grammar.y" { parser->usage("application", "remove"); ;} break; case 13: - -/* Line 1455 of yacc.c */ -#line 149 "Grammar.y" +#line 149 "src/IceGrid/Grammar.y" { parser->diffApplication((yyvsp[(3) - (4)])); ;} break; case 14: - -/* Line 1455 of yacc.c */ -#line 153 "Grammar.y" +#line 153 "src/IceGrid/Grammar.y" { parser->usage("application", "diff"); ;} break; case 15: - -/* Line 1455 of yacc.c */ -#line 157 "Grammar.y" +#line 157 "src/IceGrid/Grammar.y" { parser->updateApplication((yyvsp[(3) - (4)])); ;} break; case 16: - -/* Line 1455 of yacc.c */ -#line 161 "Grammar.y" +#line 161 "src/IceGrid/Grammar.y" { parser->usage("application", "update"); ;} break; case 17: - -/* Line 1455 of yacc.c */ -#line 165 "Grammar.y" +#line 165 "src/IceGrid/Grammar.y" { parser->describeApplication((yyvsp[(3) - (4)])); ;} break; case 18: - -/* Line 1455 of yacc.c */ -#line 169 "Grammar.y" +#line 169 "src/IceGrid/Grammar.y" { parser->usage("application", "describe"); ;} break; case 19: - -/* Line 1455 of yacc.c */ -#line 173 "Grammar.y" +#line 173 "src/IceGrid/Grammar.y" { parser->patchApplication((yyvsp[(3) - (4)])); ;} break; case 20: - -/* Line 1455 of yacc.c */ -#line 177 "Grammar.y" +#line 177 "src/IceGrid/Grammar.y" { parser->usage("application", "patch"); ;} break; case 21: - -/* Line 1455 of yacc.c */ -#line 181 "Grammar.y" +#line 181 "src/IceGrid/Grammar.y" { parser->listAllApplications((yyvsp[(3) - (4)])); ;} break; case 22: - -/* Line 1455 of yacc.c */ -#line 185 "Grammar.y" +#line 185 "src/IceGrid/Grammar.y" { parser->usage("application", "list"); ;} break; case 23: - -/* Line 1455 of yacc.c */ -#line 189 "Grammar.y" +#line 189 "src/IceGrid/Grammar.y" { parser->describeServerTemplate((yyvsp[(4) - (5)])); ;} break; case 24: - -/* Line 1455 of yacc.c */ -#line 193 "Grammar.y" +#line 193 "src/IceGrid/Grammar.y" { parser->usage("server template", "describe"); ;} break; case 25: - -/* Line 1455 of yacc.c */ -#line 197 "Grammar.y" +#line 197 "src/IceGrid/Grammar.y" { parser->instantiateServerTemplate((yyvsp[(4) - (5)])); ;} break; case 26: - -/* Line 1455 of yacc.c */ -#line 201 "Grammar.y" +#line 201 "src/IceGrid/Grammar.y" { parser->usage("server template", "instantiate"); ;} break; case 27: - -/* Line 1455 of yacc.c */ -#line 205 "Grammar.y" +#line 205 "src/IceGrid/Grammar.y" { parser->usage("server template"); ;} break; case 28: - -/* Line 1455 of yacc.c */ -#line 209 "Grammar.y" +#line 209 "src/IceGrid/Grammar.y" { parser->describeServiceTemplate((yyvsp[(4) - (5)])); ;} break; case 29: - -/* Line 1455 of yacc.c */ -#line 213 "Grammar.y" +#line 213 "src/IceGrid/Grammar.y" { parser->usage("service template", "describe"); ;} break; case 30: - -/* Line 1455 of yacc.c */ -#line 217 "Grammar.y" +#line 217 "src/IceGrid/Grammar.y" { parser->usage("service template"); ;} break; case 31: - -/* Line 1455 of yacc.c */ -#line 221 "Grammar.y" +#line 221 "src/IceGrid/Grammar.y" { parser->describeNode((yyvsp[(3) - (4)])); ;} break; case 32: - -/* Line 1455 of yacc.c */ -#line 225 "Grammar.y" +#line 225 "src/IceGrid/Grammar.y" { parser->usage("node", "describe"); ;} break; case 33: - -/* Line 1455 of yacc.c */ -#line 229 "Grammar.y" +#line 229 "src/IceGrid/Grammar.y" { parser->pingNode((yyvsp[(3) - (4)])); ;} break; case 34: - -/* Line 1455 of yacc.c */ -#line 233 "Grammar.y" +#line 233 "src/IceGrid/Grammar.y" { parser->usage("node", "ping"); ;} break; case 35: - -/* Line 1455 of yacc.c */ -#line 237 "Grammar.y" +#line 237 "src/IceGrid/Grammar.y" { parser->printLoadNode((yyvsp[(3) - (4)])); ;} break; case 36: - -/* Line 1455 of yacc.c */ -#line 241 "Grammar.y" +#line 241 "src/IceGrid/Grammar.y" { parser->usage("node", "load"); ;} break; case 37: - -/* Line 1455 of yacc.c */ -#line 245 "Grammar.y" +#line 245 "src/IceGrid/Grammar.y" { parser->printNodeProcessorSockets((yyvsp[(3) - (4)])); ;} break; case 38: - -/* Line 1455 of yacc.c */ -#line 249 "Grammar.y" +#line 249 "src/IceGrid/Grammar.y" { parser->usage("node", "sockets"); ;} break; case 39: - -/* Line 1455 of yacc.c */ -#line 253 "Grammar.y" +#line 253 "src/IceGrid/Grammar.y" { parser->shutdownNode((yyvsp[(3) - (4)])); ;} break; case 40: - -/* Line 1455 of yacc.c */ -#line 257 "Grammar.y" +#line 257 "src/IceGrid/Grammar.y" { parser->usage("node", "shutdown"); ;} break; case 41: - -/* Line 1455 of yacc.c */ -#line 261 "Grammar.y" +#line 261 "src/IceGrid/Grammar.y" { parser->listAllNodes((yyvsp[(3) - (4)])); ;} break; case 42: - -/* Line 1455 of yacc.c */ -#line 265 "Grammar.y" +#line 265 "src/IceGrid/Grammar.y" { parser->usage("node", "list"); ;} break; case 43: - -/* Line 1455 of yacc.c */ -#line 269 "Grammar.y" +#line 269 "src/IceGrid/Grammar.y" { parser->show("node", (yyvsp[(3) - (4)])); ;} break; case 44: - -/* Line 1455 of yacc.c */ -#line 273 "Grammar.y" +#line 273 "src/IceGrid/Grammar.y" { parser->usage("node", "show"); ;} break; case 45: - -/* Line 1455 of yacc.c */ -#line 277 "Grammar.y" +#line 277 "src/IceGrid/Grammar.y" { parser->describeRegistry((yyvsp[(3) - (4)])); ;} break; case 46: - -/* Line 1455 of yacc.c */ -#line 281 "Grammar.y" +#line 281 "src/IceGrid/Grammar.y" { parser->usage("registry", "describe"); ;} break; case 47: - -/* Line 1455 of yacc.c */ -#line 285 "Grammar.y" +#line 285 "src/IceGrid/Grammar.y" { parser->pingRegistry((yyvsp[(3) - (4)])); ;} break; case 48: - -/* Line 1455 of yacc.c */ -#line 289 "Grammar.y" +#line 289 "src/IceGrid/Grammar.y" { parser->usage("registry", "ping"); ;} break; case 49: - -/* Line 1455 of yacc.c */ -#line 293 "Grammar.y" +#line 293 "src/IceGrid/Grammar.y" { parser->shutdownRegistry((yyvsp[(3) - (4)])); ;} break; case 50: - -/* Line 1455 of yacc.c */ -#line 297 "Grammar.y" +#line 297 "src/IceGrid/Grammar.y" { parser->usage("registry", "shutdown"); ;} break; case 51: - -/* Line 1455 of yacc.c */ -#line 301 "Grammar.y" +#line 301 "src/IceGrid/Grammar.y" { parser->listAllRegistries((yyvsp[(3) - (4)])); ;} break; case 52: - -/* Line 1455 of yacc.c */ -#line 305 "Grammar.y" +#line 305 "src/IceGrid/Grammar.y" { parser->usage("registry", "list"); ;} break; case 53: - -/* Line 1455 of yacc.c */ -#line 309 "Grammar.y" +#line 309 "src/IceGrid/Grammar.y" { parser->show("registry", (yyvsp[(3) - (4)])); ;} break; case 54: - -/* Line 1455 of yacc.c */ -#line 313 "Grammar.y" +#line 313 "src/IceGrid/Grammar.y" { parser->usage("registry", "show"); ;} break; case 55: - -/* Line 1455 of yacc.c */ -#line 317 "Grammar.y" +#line 317 "src/IceGrid/Grammar.y" { parser->removeServer((yyvsp[(3) - (4)])); ;} break; case 56: - -/* Line 1455 of yacc.c */ -#line 321 "Grammar.y" +#line 321 "src/IceGrid/Grammar.y" { parser->usage("server", "remove"); ;} break; case 57: - -/* Line 1455 of yacc.c */ -#line 325 "Grammar.y" +#line 325 "src/IceGrid/Grammar.y" { parser->describeServer((yyvsp[(3) - (4)])); ;} break; case 58: - -/* Line 1455 of yacc.c */ -#line 329 "Grammar.y" +#line 329 "src/IceGrid/Grammar.y" { parser->usage("server", "describe"); ;} break; case 59: - -/* Line 1455 of yacc.c */ -#line 333 "Grammar.y" +#line 333 "src/IceGrid/Grammar.y" { parser->startServer((yyvsp[(3) - (4)])); ;} break; case 60: - -/* Line 1455 of yacc.c */ -#line 337 "Grammar.y" +#line 337 "src/IceGrid/Grammar.y" { parser->usage("server", "start"); ;} break; case 61: - -/* Line 1455 of yacc.c */ -#line 341 "Grammar.y" +#line 341 "src/IceGrid/Grammar.y" { parser->stopServer((yyvsp[(3) - (4)])); ;} break; case 62: - -/* Line 1455 of yacc.c */ -#line 345 "Grammar.y" +#line 345 "src/IceGrid/Grammar.y" { parser->usage("server", "stop"); ;} break; case 63: - -/* Line 1455 of yacc.c */ -#line 349 "Grammar.y" +#line 349 "src/IceGrid/Grammar.y" { parser->patchServer((yyvsp[(3) - (4)])); ;} break; case 64: - -/* Line 1455 of yacc.c */ -#line 353 "Grammar.y" +#line 353 "src/IceGrid/Grammar.y" { parser->usage("server", "patch"); ;} break; case 65: - -/* Line 1455 of yacc.c */ -#line 357 "Grammar.y" +#line 357 "src/IceGrid/Grammar.y" { parser->signalServer((yyvsp[(3) - (4)])); ;} break; case 66: - -/* Line 1455 of yacc.c */ -#line 361 "Grammar.y" +#line 361 "src/IceGrid/Grammar.y" { parser->usage("server", "signal"); ;} break; case 67: - -/* Line 1455 of yacc.c */ -#line 365 "Grammar.y" +#line 365 "src/IceGrid/Grammar.y" { parser->writeMessage((yyvsp[(3) - (4)]), 1); ;} break; case 68: - -/* Line 1455 of yacc.c */ -#line 369 "Grammar.y" +#line 369 "src/IceGrid/Grammar.y" { parser->usage("server", "stdout"); ;} break; case 69: - -/* Line 1455 of yacc.c */ -#line 373 "Grammar.y" +#line 373 "src/IceGrid/Grammar.y" { parser->writeMessage((yyvsp[(3) - (4)]), 2); ;} break; case 70: - -/* Line 1455 of yacc.c */ -#line 377 "Grammar.y" +#line 377 "src/IceGrid/Grammar.y" { parser->usage("server", "stderr"); ;} break; case 71: - -/* Line 1455 of yacc.c */ -#line 381 "Grammar.y" +#line 381 "src/IceGrid/Grammar.y" { parser->stateServer((yyvsp[(3) - (4)])); ;} break; case 72: - -/* Line 1455 of yacc.c */ -#line 385 "Grammar.y" +#line 385 "src/IceGrid/Grammar.y" { parser->usage("server", "start"); ;} break; case 73: - -/* Line 1455 of yacc.c */ -#line 389 "Grammar.y" +#line 389 "src/IceGrid/Grammar.y" { parser->pidServer((yyvsp[(3) - (4)])); ;} break; case 74: - -/* Line 1455 of yacc.c */ -#line 393 "Grammar.y" +#line 393 "src/IceGrid/Grammar.y" { parser->usage("server", "pid"); ;} break; case 75: - -/* Line 1455 of yacc.c */ -#line 397 "Grammar.y" +#line 397 "src/IceGrid/Grammar.y" { parser->propertiesServer((yyvsp[(3) - (4)]), false); ;} break; case 76: - -/* Line 1455 of yacc.c */ -#line 401 "Grammar.y" +#line 401 "src/IceGrid/Grammar.y" { parser->usage("server", "properties"); ;} break; case 77: - -/* Line 1455 of yacc.c */ -#line 405 "Grammar.y" +#line 405 "src/IceGrid/Grammar.y" { parser->propertiesServer((yyvsp[(3) - (4)]), true); ;} break; case 78: - -/* Line 1455 of yacc.c */ -#line 409 "Grammar.y" +#line 409 "src/IceGrid/Grammar.y" { parser->usage("server", "property"); ;} break; case 79: - -/* Line 1455 of yacc.c */ -#line 413 "Grammar.y" +#line 413 "src/IceGrid/Grammar.y" { parser->enableServer((yyvsp[(3) - (4)]), true); ;} break; case 80: - -/* Line 1455 of yacc.c */ -#line 417 "Grammar.y" +#line 417 "src/IceGrid/Grammar.y" { parser->usage("server", "enable"); ;} break; case 81: - -/* Line 1455 of yacc.c */ -#line 421 "Grammar.y" +#line 421 "src/IceGrid/Grammar.y" { parser->enableServer((yyvsp[(3) - (4)]), false); ;} break; case 82: - -/* Line 1455 of yacc.c */ -#line 425 "Grammar.y" +#line 425 "src/IceGrid/Grammar.y" { parser->usage("server", "disable"); ;} break; case 83: - -/* Line 1455 of yacc.c */ -#line 429 "Grammar.y" +#line 429 "src/IceGrid/Grammar.y" { parser->listAllServers((yyvsp[(3) - (4)])); ;} break; case 84: - -/* Line 1455 of yacc.c */ -#line 433 "Grammar.y" +#line 433 "src/IceGrid/Grammar.y" { parser->usage("server", "list"); ;} break; case 85: - -/* Line 1455 of yacc.c */ -#line 437 "Grammar.y" +#line 437 "src/IceGrid/Grammar.y" { parser->show("server", (yyvsp[(3) - (4)])); ;} break; case 86: - -/* Line 1455 of yacc.c */ -#line 441 "Grammar.y" +#line 441 "src/IceGrid/Grammar.y" { parser->usage("server", "show"); ;} break; case 87: - -/* Line 1455 of yacc.c */ -#line 445 "Grammar.y" +#line 445 "src/IceGrid/Grammar.y" { parser->startService((yyvsp[(3) - (4)])); ;} break; case 88: - -/* Line 1455 of yacc.c */ -#line 449 "Grammar.y" +#line 449 "src/IceGrid/Grammar.y" { parser->usage("service", "start"); ;} break; case 89: - -/* Line 1455 of yacc.c */ -#line 453 "Grammar.y" +#line 453 "src/IceGrid/Grammar.y" { parser->stopService((yyvsp[(3) - (4)])); ;} break; case 90: - -/* Line 1455 of yacc.c */ -#line 457 "Grammar.y" +#line 457 "src/IceGrid/Grammar.y" { parser->usage("service", "stop"); ;} break; case 91: - -/* Line 1455 of yacc.c */ -#line 461 "Grammar.y" +#line 461 "src/IceGrid/Grammar.y" { parser->describeService((yyvsp[(3) - (4)])); ;} break; case 92: - -/* Line 1455 of yacc.c */ -#line 465 "Grammar.y" +#line 465 "src/IceGrid/Grammar.y" { parser->usage("service", "describe"); ;} break; case 93: - -/* Line 1455 of yacc.c */ -#line 469 "Grammar.y" +#line 469 "src/IceGrid/Grammar.y" { parser->propertiesService((yyvsp[(3) - (4)]), false); ;} break; case 94: - -/* Line 1455 of yacc.c */ -#line 473 "Grammar.y" +#line 473 "src/IceGrid/Grammar.y" { parser->usage("service", "properties"); ;} break; case 95: - -/* Line 1455 of yacc.c */ -#line 477 "Grammar.y" +#line 477 "src/IceGrid/Grammar.y" { parser->propertiesService((yyvsp[(3) - (4)]), true); ;} break; case 96: - -/* Line 1455 of yacc.c */ -#line 481 "Grammar.y" +#line 481 "src/IceGrid/Grammar.y" { parser->usage("service", "property"); ;} break; case 97: - -/* Line 1455 of yacc.c */ -#line 485 "Grammar.y" +#line 485 "src/IceGrid/Grammar.y" { parser->listServices((yyvsp[(3) - (4)])); ;} break; case 98: - -/* Line 1455 of yacc.c */ -#line 489 "Grammar.y" +#line 489 "src/IceGrid/Grammar.y" { parser->usage("service", "list"); ;} break; case 99: - -/* Line 1455 of yacc.c */ -#line 493 "Grammar.y" +#line 493 "src/IceGrid/Grammar.y" { parser->endpointsAdapter((yyvsp[(3) - (4)])); ;} break; case 100: - -/* Line 1455 of yacc.c */ -#line 497 "Grammar.y" +#line 497 "src/IceGrid/Grammar.y" { parser->usage("adapter", "endpoints"); ;} break; case 101: - -/* Line 1455 of yacc.c */ -#line 501 "Grammar.y" +#line 501 "src/IceGrid/Grammar.y" { parser->removeAdapter((yyvsp[(3) - (4)])); ;} break; case 102: - -/* Line 1455 of yacc.c */ -#line 505 "Grammar.y" +#line 505 "src/IceGrid/Grammar.y" { parser->usage("adapter", "remove"); ;} break; case 103: - -/* Line 1455 of yacc.c */ -#line 509 "Grammar.y" +#line 509 "src/IceGrid/Grammar.y" { parser->listAllAdapters((yyvsp[(3) - (4)])); ;} break; case 104: - -/* Line 1455 of yacc.c */ -#line 513 "Grammar.y" +#line 513 "src/IceGrid/Grammar.y" { parser->usage("adapter", "list"); ;} break; case 105: - -/* Line 1455 of yacc.c */ -#line 517 "Grammar.y" +#line 517 "src/IceGrid/Grammar.y" { parser->addObject((yyvsp[(3) - (4)])); ;} break; case 106: - -/* Line 1455 of yacc.c */ -#line 521 "Grammar.y" +#line 521 "src/IceGrid/Grammar.y" { parser->usage("object", "add"); ;} break; case 107: - -/* Line 1455 of yacc.c */ -#line 525 "Grammar.y" +#line 525 "src/IceGrid/Grammar.y" { parser->removeObject((yyvsp[(3) - (4)])); ;} break; case 108: - -/* Line 1455 of yacc.c */ -#line 529 "Grammar.y" +#line 529 "src/IceGrid/Grammar.y" { parser->usage("object", "remove"); ;} break; case 109: - -/* Line 1455 of yacc.c */ -#line 533 "Grammar.y" +#line 533 "src/IceGrid/Grammar.y" { parser->findObject((yyvsp[(3) - (4)])); ;} break; case 110: - -/* Line 1455 of yacc.c */ -#line 537 "Grammar.y" +#line 537 "src/IceGrid/Grammar.y" { parser->usage("object", "find"); ;} break; case 111: - -/* Line 1455 of yacc.c */ -#line 541 "Grammar.y" +#line 541 "src/IceGrid/Grammar.y" { parser->listObject((yyvsp[(3) - (4)])); ;} break; case 112: - -/* Line 1455 of yacc.c */ -#line 545 "Grammar.y" +#line 545 "src/IceGrid/Grammar.y" { parser->usage("object", "list"); ;} break; case 113: - -/* Line 1455 of yacc.c */ -#line 549 "Grammar.y" +#line 549 "src/IceGrid/Grammar.y" { parser->describeObject((yyvsp[(3) - (4)])); ;} break; case 114: - -/* Line 1455 of yacc.c */ -#line 553 "Grammar.y" +#line 553 "src/IceGrid/Grammar.y" { parser->usage("object", "describe"); ;} break; case 115: - -/* Line 1455 of yacc.c */ -#line 557 "Grammar.y" +#line 557 "src/IceGrid/Grammar.y" { parser->showCopying(); ;} break; case 116: - -/* Line 1455 of yacc.c */ -#line 561 "Grammar.y" +#line 561 "src/IceGrid/Grammar.y" { parser->showWarranty(); ;} break; case 117: - -/* Line 1455 of yacc.c */ -#line 565 "Grammar.y" +#line 565 "src/IceGrid/Grammar.y" { parser->usage((yyvsp[(2) - (3)]).front()); ;} break; case 118: - -/* Line 1455 of yacc.c */ -#line 569 "Grammar.y" +#line 569 "src/IceGrid/Grammar.y" { if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template") { @@ -3214,18 +3016,14 @@ yyreduce: break; case 119: - -/* Line 1455 of yacc.c */ -#line 580 "Grammar.y" +#line 580 "src/IceGrid/Grammar.y" { parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front()); ;} break; case 120: - -/* Line 1455 of yacc.c */ -#line 584 "Grammar.y" +#line 584 "src/IceGrid/Grammar.y" { if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template") { @@ -3239,9 +3037,7 @@ yyreduce: break; case 121: - -/* Line 1455 of yacc.c */ -#line 595 "Grammar.y" +#line 595 "src/IceGrid/Grammar.y" { if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template") { @@ -3255,36 +3051,28 @@ yyreduce: break; case 122: - -/* Line 1455 of yacc.c */ -#line 606 "Grammar.y" +#line 606 "src/IceGrid/Grammar.y" { parser->usage((yyvsp[(2) - (4)]).front()); ;} break; case 123: - -/* Line 1455 of yacc.c */ -#line 610 "Grammar.y" +#line 610 "src/IceGrid/Grammar.y" { parser->usage(); ;} break; case 124: - -/* Line 1455 of yacc.c */ -#line 614 "Grammar.y" +#line 614 "src/IceGrid/Grammar.y" { parser->usage((yyvsp[(1) - (3)]).front()); ;} break; case 125: - -/* Line 1455 of yacc.c */ -#line 618 "Grammar.y" +#line 618 "src/IceGrid/Grammar.y" { (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front()); parser->invalidCommand((yyvsp[(1) - (4)])); @@ -3293,9 +3081,7 @@ yyreduce: break; case 126: - -/* Line 1455 of yacc.c */ -#line 624 "Grammar.y" +#line 624 "src/IceGrid/Grammar.y" { parser->invalidCommand((yyvsp[(1) - (3)])); yyerrok; @@ -3303,9 +3089,7 @@ yyreduce: break; case 127: - -/* Line 1455 of yacc.c */ -#line 629 "Grammar.y" +#line 629 "src/IceGrid/Grammar.y" { parser->invalidCommand((yyvsp[(1) - (3)])); yyerrok; @@ -3313,26 +3097,20 @@ yyreduce: break; case 128: - -/* Line 1455 of yacc.c */ -#line 634 "Grammar.y" +#line 634 "src/IceGrid/Grammar.y" { yyerrok; ;} break; case 129: - -/* Line 1455 of yacc.c */ -#line 638 "Grammar.y" +#line 638 "src/IceGrid/Grammar.y" { ;} break; case 130: - -/* Line 1455 of yacc.c */ -#line 647 "Grammar.y" +#line 647 "src/IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (2)]); (yyval).push_front((yyvsp[(1) - (2)]).front()); @@ -3340,9 +3118,7 @@ yyreduce: break; case 131: - -/* Line 1455 of yacc.c */ -#line 652 "Grammar.y" +#line 652 "src/IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (2)]); (yyval).push_front((yyvsp[(1) - (2)]).front()); @@ -3350,9 +3126,7 @@ yyreduce: break; case 132: - -/* Line 1455 of yacc.c */ -#line 657 "Grammar.y" +#line 657 "src/IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (3)]); (yyval).push_front("help"); @@ -3361,9 +3135,7 @@ yyreduce: break; case 133: - -/* Line 1455 of yacc.c */ -#line 663 "Grammar.y" +#line 663 "src/IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (3)]); (yyval).push_front("help"); @@ -3372,322 +3144,243 @@ yyreduce: break; case 134: - -/* Line 1455 of yacc.c */ -#line 669 "Grammar.y" +#line 669 "src/IceGrid/Grammar.y" { (yyval) = YYSTYPE(); ;} break; case 135: - -/* Line 1455 of yacc.c */ -#line 678 "Grammar.y" +#line 678 "src/IceGrid/Grammar.y" { ;} break; case 136: - -/* Line 1455 of yacc.c */ -#line 681 "Grammar.y" +#line 681 "src/IceGrid/Grammar.y" { ;} break; case 137: - -/* Line 1455 of yacc.c */ -#line 684 "Grammar.y" +#line 684 "src/IceGrid/Grammar.y" { ;} break; case 138: - -/* Line 1455 of yacc.c */ -#line 687 "Grammar.y" +#line 687 "src/IceGrid/Grammar.y" { ;} break; case 139: - -/* Line 1455 of yacc.c */ -#line 690 "Grammar.y" +#line 690 "src/IceGrid/Grammar.y" { ;} break; case 140: - -/* Line 1455 of yacc.c */ -#line 693 "Grammar.y" +#line 693 "src/IceGrid/Grammar.y" { ;} break; case 141: - -/* Line 1455 of yacc.c */ -#line 696 "Grammar.y" +#line 696 "src/IceGrid/Grammar.y" { ;} break; case 142: - -/* Line 1455 of yacc.c */ -#line 699 "Grammar.y" +#line 699 "src/IceGrid/Grammar.y" { ;} break; case 143: - -/* Line 1455 of yacc.c */ -#line 702 "Grammar.y" +#line 702 "src/IceGrid/Grammar.y" { ;} break; case 144: - -/* Line 1455 of yacc.c */ -#line 705 "Grammar.y" +#line 705 "src/IceGrid/Grammar.y" { ;} break; case 145: - -/* Line 1455 of yacc.c */ -#line 708 "Grammar.y" +#line 708 "src/IceGrid/Grammar.y" { ;} break; case 146: - -/* Line 1455 of yacc.c */ -#line 711 "Grammar.y" +#line 711 "src/IceGrid/Grammar.y" { ;} break; case 147: - -/* Line 1455 of yacc.c */ -#line 714 "Grammar.y" +#line 714 "src/IceGrid/Grammar.y" { ;} break; case 148: - -/* Line 1455 of yacc.c */ -#line 717 "Grammar.y" +#line 717 "src/IceGrid/Grammar.y" { ;} break; case 149: - -/* Line 1455 of yacc.c */ -#line 720 "Grammar.y" +#line 720 "src/IceGrid/Grammar.y" { ;} break; case 150: - -/* Line 1455 of yacc.c */ -#line 723 "Grammar.y" +#line 723 "src/IceGrid/Grammar.y" { ;} break; case 151: - -/* Line 1455 of yacc.c */ -#line 726 "Grammar.y" +#line 726 "src/IceGrid/Grammar.y" { ;} break; case 152: - -/* Line 1455 of yacc.c */ -#line 729 "Grammar.y" +#line 729 "src/IceGrid/Grammar.y" { ;} break; case 153: - -/* Line 1455 of yacc.c */ -#line 732 "Grammar.y" +#line 732 "src/IceGrid/Grammar.y" { ;} break; case 154: - -/* Line 1455 of yacc.c */ -#line 735 "Grammar.y" +#line 735 "src/IceGrid/Grammar.y" { ;} break; case 155: - -/* Line 1455 of yacc.c */ -#line 738 "Grammar.y" +#line 738 "src/IceGrid/Grammar.y" { ;} break; case 156: - -/* Line 1455 of yacc.c */ -#line 741 "Grammar.y" +#line 741 "src/IceGrid/Grammar.y" { ;} break; case 157: - -/* Line 1455 of yacc.c */ -#line 744 "Grammar.y" +#line 744 "src/IceGrid/Grammar.y" { ;} break; case 158: - -/* Line 1455 of yacc.c */ -#line 747 "Grammar.y" +#line 747 "src/IceGrid/Grammar.y" { ;} break; case 159: - -/* Line 1455 of yacc.c */ -#line 750 "Grammar.y" +#line 750 "src/IceGrid/Grammar.y" { ;} break; case 160: - -/* Line 1455 of yacc.c */ -#line 753 "Grammar.y" +#line 753 "src/IceGrid/Grammar.y" { ;} break; case 161: - -/* Line 1455 of yacc.c */ -#line 756 "Grammar.y" +#line 756 "src/IceGrid/Grammar.y" { ;} break; case 162: - -/* Line 1455 of yacc.c */ -#line 759 "Grammar.y" +#line 759 "src/IceGrid/Grammar.y" { ;} break; case 163: - -/* Line 1455 of yacc.c */ -#line 762 "Grammar.y" +#line 762 "src/IceGrid/Grammar.y" { ;} break; case 164: - -/* Line 1455 of yacc.c */ -#line 765 "Grammar.y" +#line 765 "src/IceGrid/Grammar.y" { ;} break; case 165: - -/* Line 1455 of yacc.c */ -#line 768 "Grammar.y" +#line 768 "src/IceGrid/Grammar.y" { ;} break; case 166: - -/* Line 1455 of yacc.c */ -#line 771 "Grammar.y" +#line 771 "src/IceGrid/Grammar.y" { ;} break; case 167: - -/* Line 1455 of yacc.c */ -#line 774 "Grammar.y" +#line 774 "src/IceGrid/Grammar.y" { ;} break; case 168: - -/* Line 1455 of yacc.c */ -#line 777 "Grammar.y" +#line 777 "src/IceGrid/Grammar.y" { ;} break; case 169: - -/* Line 1455 of yacc.c */ -#line 780 "Grammar.y" +#line 780 "src/IceGrid/Grammar.y" { ;} break; case 170: - -/* Line 1455 of yacc.c */ -#line 783 "Grammar.y" +#line 783 "src/IceGrid/Grammar.y" { ;} break; case 171: - -/* Line 1455 of yacc.c */ -#line 786 "Grammar.y" +#line 786 "src/IceGrid/Grammar.y" { ;} break; case 172: - -/* Line 1455 of yacc.c */ -#line 789 "Grammar.y" +#line 789 "src/IceGrid/Grammar.y" { ;} break; - -/* Line 1455 of yacc.c */ -#line 3691 "Grammar.tab.c" +/* Line 1267 of yacc.c. */ +#line 3384 "src/IceGrid/Grammar.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3698,6 +3391,7 @@ yyreduce: *++yyvsp = yyval; + /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3762,7 +3456,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -3779,7 +3473,7 @@ yyerrlab: } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -3836,6 +3530,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + if (yyn == YYFINAL) + YYACCEPT; + *++yyvsp = yylval; @@ -3860,7 +3557,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#ifndef yyoverflow /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3871,7 +3568,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEMPTY) + if (yychar != YYEOF && yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h index e39828c6ae7..8739da3d8b5 100644 --- a/cpp/src/IceGrid/Grammar.h +++ b/cpp/src/IceGrid/Grammar.h @@ -1,23 +1,24 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -28,11 +29,10 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -81,16 +81,57 @@ ICE_GRID_DISABLE = 297 }; #endif +/* Tokens. */ +#define ICE_GRID_HELP 258 +#define ICE_GRID_EXIT 259 +#define ICE_GRID_APPLICATION 260 +#define ICE_GRID_NODE 261 +#define ICE_GRID_REGISTRY 262 +#define ICE_GRID_SERVER 263 +#define ICE_GRID_ADAPTER 264 +#define ICE_GRID_PING 265 +#define ICE_GRID_LOAD 266 +#define ICE_GRID_SOCKETS 267 +#define ICE_GRID_ADD 268 +#define ICE_GRID_REMOVE 269 +#define ICE_GRID_LIST 270 +#define ICE_GRID_SHUTDOWN 271 +#define ICE_GRID_STRING 272 +#define ICE_GRID_START 273 +#define ICE_GRID_STOP 274 +#define ICE_GRID_PATCH 275 +#define ICE_GRID_SIGNAL 276 +#define ICE_GRID_STDOUT 277 +#define ICE_GRID_STDERR 278 +#define ICE_GRID_DESCRIBE 279 +#define ICE_GRID_PROPERTIES 280 +#define ICE_GRID_PROPERTY 281 +#define ICE_GRID_STATE 282 +#define ICE_GRID_PID 283 +#define ICE_GRID_ENDPOINTS 284 +#define ICE_GRID_ACTIVATION 285 +#define ICE_GRID_OBJECT 286 +#define ICE_GRID_FIND 287 +#define ICE_GRID_SHOW 288 +#define ICE_GRID_COPYING 289 +#define ICE_GRID_WARRANTY 290 +#define ICE_GRID_DIFF 291 +#define ICE_GRID_UPDATE 292 +#define ICE_GRID_INSTANTIATE 293 +#define ICE_GRID_TEMPLATE 294 +#define ICE_GRID_SERVICE 295 +#define ICE_GRID_ENABLE 296 +#define ICE_GRID_DISABLE 297 + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif - diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile deleted file mode 100644 index 11284fcd8fe..00000000000 --- a/cpp/src/IceGrid/Makefile +++ /dev/null @@ -1,149 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -ADMIN = $(bindir)/icegridadmin -DB = $(bindir)/icegriddb -NODE_SERVER = $(bindir)/icegridnode -REGISTRY_SERVER = $(bindir)/icegridregistry - -TARGETS = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) $(DB) - -CSLICE_OBJS = Internal.o \ - IceLocatorDiscovery.o - -ADMIN_OBJS = Client.o \ - DescriptorBuilder.o \ - DescriptorHelper.o \ - DescriptorParser.o \ - FileParserI.o \ - Grammar.o \ - Parser.o \ - Scanner.o \ - Util.o \ - $(CSLICE_OBJS) - -COMMON_OBJS = AdminRouter.o \ - DescriptorBuilder.o \ - DescriptorParser.o \ - FileCache.o \ - PlatformInfo.o \ - SessionManager.o \ - TraceLevels.o \ - $(CSLICE_OBJS) - -NODE_OBJS = Activator.o \ - NodeAdminRouter.o \ - NodeI.o \ - NodeSessionManager.o \ - ServerAdapterI.o \ - ServerI.o - -REGISTRY_OBJS = AdminCallbackRouter.o \ - AdapterCache.o \ - AdminI.o \ - AdminSessionI.o \ - Allocatable.o \ - AllocatableObjectCache.o \ - Database.o \ - DescriptorHelper.o \ - FileUserAccountMapperI.o \ - InternalRegistryI.o \ - LocatorI.o \ - LocatorRegistryI.o \ - NodeCache.o \ - NodeSessionI.o \ - ObjectCache.o \ - PluginFacadeI.o \ - QueryI.o \ - ReapThread.o \ - RegistryAdminRouter.o \ - RegistryI.o \ - ReplicaCache.o \ - ReplicaSessionI.o \ - ReplicaSessionManager.o \ - ServerCache.o \ - SessionI.o \ - SessionServantManager.o \ - Topics.o \ - Util.o \ - WellKnownObjectsManager.o - -NODE_SVR_OBJS = $(COMMON_OBJS) \ - $(NODE_OBJS) \ - $(REGISTRY_OBJS) \ - IceGridNode.o - -REGISTRY_SVR_OBJS = \ - $(COMMON_OBJS) \ - $(REGISTRY_OBJS) \ - IceGridRegistry.o - -DSLICE_OBJS = DBTypes.o - -DB_OBJS = IceGridDB.o \ - $(DSLICE_OBJS) - -OBJS = $(ADMIN_OBJS) \ - $(COMMON_OBJS) \ - $(NODE_OBJS) \ - $(NODE_SVR_OBJS) \ - $(REGISTRY_SVR_OBJS) \ - $(DB_OBJS) - -SLICE_OBJS = $(CSLICE_OBJS) \ - $(DSLICE_OBJS) - -SDIR = $(slicedir)/IceGrid - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) $(LMDB_FLAGS) -ICECPPFLAGS := $(ICECPPFLAGS) -I.. -SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) -SLICE2FREEZECMD := $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS) - -$(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid -lIcePatch2 -lIceBox \ - $(LIBS) $(READLINE_LIBS) $(OPENSSL_RPATH_LINK) - -$(DB): $(DB_OBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DB_OBJS) -lIceGrid -lGlacier2 -lIcePatch2 $(LMDB_RPATH_LINK) -lIceDB $(LIBS) - -$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lGlacier2 -lIcePatch2 \ - $(LMDB_RPATH_LINK) -lIceDB -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) - -$(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lIceBox -lGlacier2 \ - $(LMDB_RPATH_LINK) -lIceDB -lIcePatch2 $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) - -../IceLocatorDiscovery/%.h %.cpp: $(slicedir)/IceLocatorDiscovery/%.ice $(SLICE2CPP) $(SLICEPARSERLIB) - rm -f $(*F).h $(*F).cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceLocatorDiscovery/$(*F).ice - @touch $(*F).cpp - @mkdir -p .depend - @$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(slicedir)/IceLocatorDiscovery/$(*F).ice > .depend/$(*F).ice.d - -install:: all - $(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icegridadmin.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(DB),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icegriddb.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(NODE_SERVER),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icegridnode.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(REGISTRY_SERVER),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icegridregistry.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk new file mode 100644 index 00000000000..4d196a69ac8 --- /dev/null +++ b/cpp/src/IceGrid/Makefile.mk @@ -0,0 +1,86 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +local_node_srcs = Activator.cpp \ + NodeAdminRouter.cpp \ + NodeI.cpp \ + NodeSessionManager.cpp \ + ServerAdapterI.cpp \ + ServerI.cpp + +local_registry_srcs = Internal.ice \ + AdminRouter.cpp \ + DescriptorBuilder.cpp \ + DescriptorParser.cpp \ + FileCache.cpp \ + PlatformInfo.cpp \ + SessionManager.cpp \ + TraceLevels.cpp \ + IceLocatorDiscovery.cpp \ + AdminCallbackRouter.cpp \ + AdapterCache.cpp \ + AdminI.cpp \ + AdminSessionI.cpp \ + Allocatable.cpp \ + AllocatableObjectCache.cpp \ + Database.cpp \ + DescriptorHelper.cpp \ + FileUserAccountMapperI.cpp \ + InternalRegistryI.cpp \ + LocatorI.cpp \ + LocatorRegistryI.cpp \ + NodeCache.cpp \ + NodeSessionI.cpp \ + ObjectCache.cpp \ + PluginFacadeI.cpp \ + QueryI.cpp \ + ReapThread.cpp \ + RegistryAdminRouter.cpp \ + RegistryI.cpp \ + ReplicaCache.cpp \ + ReplicaSessionI.cpp \ + ReplicaSessionManager.cpp \ + ServerCache.cpp \ + SessionI.cpp \ + SessionServantManager.cpp \ + Topics.cpp \ + Util.cpp \ + WellKnownObjectsManager.cpp + +local_admin_srcs = Internal.ice \ + Client.cpp \ + DescriptorBuilder.cpp \ + DescriptorHelper.cpp \ + DescriptorParser.cpp \ + FileParserI.cpp \ + Grammar.cpp \ + Parser.cpp \ + Scanner.cpp \ + Util.cpp + +$(project)_programs = icegridnode icegridregistry icegridadmin icegriddb +$(project)_sliceflags := -Isrc --include-dir IceGrid +$(project)_generated_includedir := $(project)/generated/IceGrid +$(project)_dependencies := IceGrid Glacier2 Ice IceUtil +$(project)_targetdir := $(bindir) + +icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) +icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB + +icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) +icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) + +icegridadmin_dependencies := IcePatch2 IceBox IceXML +icegridadmin_sources := $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice \ + $(addprefix $(currentdir)/,$(local_admin_srcs)) + +icegriddb_dependencies := IcePatch2 IceDB +icegriddb_sources := $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice) + +projects += $(project) diff --git a/cpp/src/IceGridLib/.gitignore b/cpp/src/IceGridLib/.gitignore deleted file mode 100644 index 9d7a58ce79a..00000000000 --- a/cpp/src/IceGridLib/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -Admin.cpp -Descriptor.cpp -Exception.cpp -FileParser.cpp -Locator.cpp -Observer.cpp -PluginFacade.cpp -Query.cpp -Registry.cpp -Session.cpp -UserAccountMapper.cpp -Admin.h -Descriptor.h -Exception.h -FileParser.h -Locator.h -Observer.h -PluginFacade.h -Query.h -Registry.h -Session.h -UserAccountMapper.h diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile deleted file mode 100644 index 1b0e78354f9..00000000000 --- a/cpp/src/IceGridLib/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceGrid,$(VERSION)) -SONAME = $(call mksoname,IceGrid,$(SOVERSION)) -LIBNAME = $(call mklibname,IceGrid) - -LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) -TARGETS = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) - -SLICE_OBJS = Admin.o \ - Descriptor.o \ - Exception.o \ - FileParser.o \ - PluginFacade.o \ - Registry.o \ - Session.o \ - UserAccountMapper.o - -OBJS = PluginFacadeI.o \ - $(SLICE_OBJS) - - -HDIR = $(headerdir)/IceGrid -SDIR = $(slicedir)/IceGrid - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := $(CPPFLAGS) -I.. $(OPENSSL_FLAGS) $(READLINE_FLAGS) -ICECPPFLAGS := $(ICECPPFLAGS) -I.. -SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS) -LINKWITH := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk new file mode 100644 index 00000000000..26f2111a5fb --- /dev/null +++ b/cpp/src/IceGridLib/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceGrid + +IceGrid_targetdir := $(libdir) +IceGrid_dependencies := Glacier2 Ice IceUtil +IceGrid_sliceflags := --include-dir IceGrid --dll-export ICE_GRID_API + +projects += $(project) diff --git a/cpp/src/IceLocatorDiscovery/.gitignore b/cpp/src/IceLocatorDiscovery/.gitignore deleted file mode 100644 index 45e29d8dd2d..00000000000 --- a/cpp/src/IceLocatorDiscovery/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -IceLocatorDiscovery.cpp -IceLocatorDiscovery.h diff --git a/cpp/src/IceLocatorDiscovery/Makefile b/cpp/src/IceLocatorDiscovery/Makefile deleted file mode 100644 index 86c96002ceb..00000000000 --- a/cpp/src/IceLocatorDiscovery/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceLocatorDiscovery,$(VERSION)) -SONAME = $(call mksoname,IceLocatorDiscovery,$(SOVERSION)) -LIBNAME = $(call mklibname,IceLocatorDiscovery) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = IceLocatorDiscovery.o - -OBJS = PluginI.o \ - $(SLICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_LOCATOR_DISCOVERY_API_EXPORTS -SLICE2CPPFLAGS := --ice --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) - -LINKWITH := -lIce -lIceUtil $(CXXLIBS) - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -../IceLocatorDiscovery/%.h %.cpp: $(slicedir)/IceLocatorDiscovery/%.ice $(SLICE2CPP) $(SLICEPARSERLIB) - rm -f $(*F).h $(*F).cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceLocatorDiscovery/$(*F).ice - @touch $(*F).cpp - @mkdir -p .depend - @$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(slicedir)/IceLocatorDiscovery/$(*F).ice > .depend/$(*F).ice.d - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk new file mode 100644 index 00000000000..5acb7ad9706 --- /dev/null +++ b/cpp/src/IceLocatorDiscovery/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceLocatorDiscovery + +IceLocatorDiscovery_targetdir := $(libdir) +IceLocatorDiscovery_dependencies := Ice IceUtil +IceLocatorDiscovery_sliceflags := --include-dir IceLocatorDiscovery +IceLocatorDiscovery_generated_includedir := $(project)/generated/IceLocatorDiscovery +IceLocatorDiscovery_cppflags := -DICE_LOCATOR_DISCOVERY_API_EXPORTS + +projects += $(project) diff --git a/cpp/src/IcePatch2/.gitignore b/cpp/src/IcePatch2/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/IcePatch2/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile deleted file mode 100644 index bdceb01ea7a..00000000000 --- a/cpp/src/IcePatch2/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -SERVER = $(bindir)/icepatch2server -CLIENT = $(bindir)/icepatch2client -CALC = $(bindir)/icepatch2calc - -TARGETS = $(SERVER) $(CLIENT) $(CALC) - -SOBJS = FileServerI.o \ - Server.o - -COBJS = Client.o - -CALCOBJS = Calc.o - -OBJS = $(SOBJS) \ - $(COBJS) \ - $(CALCOBJS) - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) $(BZIP2_FLAGS) - -$(SERVER): $(SOBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) - -$(CLIENT): $(COBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) - -$(CALC): $(CALCOBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CALCOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) - -install:: all - $(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icepatch2server.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(CLIENT),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icepatch2client.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(CALC),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icepatch2calc.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk new file mode 100644 index 00000000000..eb1cc23045b --- /dev/null +++ b/cpp/src/IcePatch2/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_programs := icepatch2server icepatch2client icepatch2calc +$(project)_dependencies := IcePatch2 Ice IceUtil +$(project)_targetdir := $(bindir) + +icepatch2server_sources := $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp) +icepatch2client_sources := $(addprefix $(currentdir)/,Client.cpp) +icepatch2calc_sources := $(addprefix $(currentdir)/,Calc.cpp) + +projects += $(project) diff --git a/cpp/src/IcePatch2Lib/.gitignore b/cpp/src/IcePatch2Lib/.gitignore deleted file mode 100644 index a6ba57e6121..00000000000 --- a/cpp/src/IcePatch2Lib/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -FileInfo.cpp -FileServer.cpp -FileInfo.h -FileServer.h diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile deleted file mode 100644 index e8b6d4e5565..00000000000 --- a/cpp/src/IcePatch2Lib/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IcePatch2,$(VERSION)) -SONAME = $(call mksoname,IcePatch2,$(SOVERSION)) -LIBNAME = $(call mklibname,IcePatch2) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = FileInfo.o \ - FileServer.o - -OBJS = ClientUtil.o \ - Util.o \ - $(SLICE_OBJS) - -HDIR = $(headerdir)/IcePatch2 -SDIR = $(slicedir)/IcePatch2 - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) $(BZIP2_FLAGS) -Wno-deprecated-declarations -SLICE2CPPFLAGS := --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(BZIP2_LIBS) - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk new file mode 100644 index 00000000000..e63a56ab3c8 --- /dev/null +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IcePatch2 + +IcePatch2_targetdir := $(libdir) +IcePatch2_dependencies := Ice IceUtil +IcePatch2_libs := bz2 +IcePatch2_sliceflags := --include-dir IcePatch2 --dll-export ICE_PATCH2_API +IcePatch2_cppflags := -Wno-deprecated-declarations + +projects += $(project) diff --git a/cpp/src/IceSSL/.gitignore b/cpp/src/IceSSL/.gitignore deleted file mode 100644 index 981999c07ba..00000000000 --- a/cpp/src/IceSSL/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -ConnectionInfo.cpp -EndpointInfo.cpp -ConnectionInfo.h -EndpointInfo.h diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile deleted file mode 100644 index 5e551f3e363..00000000000 --- a/cpp/src/IceSSL/Makefile +++ /dev/null @@ -1,82 +0,0 @@ - -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) -SONAME = $(call mksoname,IceSSL,$(SOVERSION)) -LIBNAME = $(call mklibname,IceSSL) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = ConnectionInfo.o \ - EndpointInfo.o - -OBJS = AcceptorI.o \ - Certificate.o \ - ConnectorI.o \ - EndpointI.o \ - Instance.o \ - PluginI.o \ - RFC2253.o \ - SSLEngine.o \ - TrustManager.o \ - Util.o \ - $(SLICE_OBJS) - -ifneq ($(findstring MINGW,$(shell uname)),) -OBJS := $(OBJS) \ - SChannelEngine.o \ - SChannelTransceiverI.o -else -ifeq ($(shell uname),Darwin) -OBJS := $(OBJS) \ - SecureTransportEngine.o \ - SecureTransportTransceiverI.o -else -OBJS := $(OBJS) \ - OpenSSLEngine.o \ - OpenSSLTransceiverI.o -endif -endif - -HDIR = $(headerdir)/IceSSL -SDIR = $(slicedir)/IceSSL - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) -SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) - -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS) - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk new file mode 100644 index 00000000000..1b5771877ac --- /dev/null +++ b/cpp/src/IceSSL/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceSSL + +IceSSL_targetdir := $(libdir) +IceSSL_dependencies := Ice IceUtil +IceSSL_cppflags := -DICESSL_API_EXPORTS +IceSSL_system_libs := $(SSL_OS_LIBS) +IceSSL_sliceflags := --include-dir IceSSL --dll-export ICESSL_API + +projects += $(project) diff --git a/cpp/src/IceStorm/.gitignore b/cpp/src/IceStorm/.gitignore deleted file mode 100644 index 9acac8d9ebe..00000000000 --- a/cpp/src/IceStorm/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -Election.cpp -IceStormInternal.cpp -Instrumentation.cpp -LinkRecord.cpp -LLURecord.cpp -SubscriberRecord.cpp -LinkRecord.cpp -Instrumentation.h -Election.h -IceStormInternal.h -Instrumentation.h -LinkRecord.h -LLURecord.h -SubscriberRecord.h -LinkRecord.h -LinkRecord.h -LinkRecord.cpp -DBTypes.h -DBTypes.cpp diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile deleted file mode 100644 index b2a554c1fc2..00000000000 --- a/cpp/src/IceStorm/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION)) -SONAME = $(call mksoname,IceStormService,$(SOVERSION)) -LIBNAME = $(call mklibname,IceStormService) - -ADMIN = $(bindir)/icestormadmin -DB = $(bindir)/icestormdb -LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) -TARGETS = $(LIBTARGETS) $(ADMIN) $(DB) - -LSLICE_OBJS = Election.o \ - IceStormInternal.o \ - Instrumentation.o \ - LinkRecord.o \ - LLURecord.o \ - SubscriberRecord.o - -LIB_OBJS = Instance.o \ - InstrumentationI.o \ - NodeI.o \ - Observers.o \ - Service.o \ - Subscriber.o \ - TopicI.o \ - TopicManagerI.o \ - TraceLevels.o \ - TransientTopicI.o \ - TransientTopicManagerI.o \ - Util.o \ - $(SLICE_OBJS) - -AOBJS = Admin.o \ - Grammar.o \ - Parser.o \ - Scanner.o \ - $(SLICE_OBJS) - -DBSLICE_OBJS = DBTypes.o - -DBOBJS = IceStormDB.o \ - $(DBSLICE_OBJS) - -SLICE_OBJS = $(LSLICE_OBJS) \ - $(DBSLICE_OBJS) - -OBJS = $(LIB_OBJS) \ - $(AOBJS) \ - $(DBOBJS) - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) $(LMDB_FLAGS) -ICECPPFLAGS := $(ICECPPFLAGS) -I.. -SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIceStorm -lIceGrid -lGlacier2 -lIceBox -lIce -lIceUtil $(LMDB_RPATH_LINK) -lIceDB - -$(libdir)/$(LIBFILENAME): $(LIB_OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(LIB_OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -$(ADMIN): $(AOBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(AOBJS) -lIceStorm $(READLINE_LIBS) $(LIBS) - -$(DB): $(DBOBJS) $(LIBTARGETS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DBOBJS) -lIceStorm $(LMDB_RPATH_LINK) -lIceDB -lIcePatch2 $(LIBS) - -# Needed for make -jn to work. -../IceStorm/Grammar.y: Grammar.h - -clean:: - -rm -f LinkRecord.h LinkRecord.cpp - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icestormadmin.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(DB),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/icestormdb.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk new file mode 100644 index 00000000000..0b1d90505e5 --- /dev/null +++ b/cpp/src/IceStorm/Makefile.mk @@ -0,0 +1,52 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceStormService +$(project)_programs := icestormadmin icestormdb +$(project)_sliceflags := -Isrc --include-dir IceStorm +$(project)_generated_includedir := $(project)/generated/IceStorm +$(project)_dependencies := IceStorm Ice IceUtil + +IceStormService_targetdir := $(libdir) +IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB +IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ + InstrumentationI.cpp \ + NodeI.cpp \ + Observers.cpp \ + Service.cpp \ + Subscriber.cpp \ + TopicI.cpp \ + TopicManagerI.cpp \ + TraceLevels.cpp \ + TransientTopicI.cpp \ + TransientTopicManagerI.cpp \ + Util.cpp \ + Election.ice \ + IceStormInternal.ice \ + Instrumentation.ice \ + LinkRecord.ice \ + LLURecord.ice \ + SubscriberRecord.ice \ + DBTypes.ice) + +icestormadmin_targetdir := $(bindir) +icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ + Grammar.y \ + Parser.cpp \ + Scanner.l \ + LLURecord.ice \ + SubscriberRecord.ice \ + Election.ice \ + IceStormInternal.ice) + +icestormdb_targetdir := $(bindir) +icestormdb_dependencies := IcePatch2 IceDB +icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) + +projects += $(project) diff --git a/cpp/src/IceStormLib/.gitignore b/cpp/src/IceStormLib/.gitignore deleted file mode 100644 index 798077a2149..00000000000 --- a/cpp/src/IceStormLib/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend -IceStorm.cpp -Metrics.cpp -IceStorm.h -Metrics.h diff --git a/cpp/src/IceStormLib/Makefile b/cpp/src/IceStormLib/Makefile deleted file mode 100644 index 32e63d9e28f..00000000000 --- a/cpp/src/IceStormLib/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceStorm,$(VERSION)) -SONAME = $(call mksoname,IceStorm,$(SOVERSION)) -LIBNAME = $(call mklibname,IceStorm) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = IceStorm.o \ - Metrics.o - -OBJS = $(SLICE_OBJS) - -HDIR = $(headerdir)/IceStorm -SDIR = $(slicedir)/IceStorm - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := $(CPPFLAGS) -I.. -ICECPPFLAGS := $(ICECPPFLAGS) -I.. -SLICE2CPPFLAGS := --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk new file mode 100644 index 00000000000..0a04d593b0f --- /dev/null +++ b/cpp/src/IceStormLib/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceStorm + +IceStorm_targetdir := $(libdir) +IceStorm_dependencies := Ice IceUtil +IceStorm_sliceflags := --include-dir IceStorm --dll-export ICE_STORM_LIB_API + +projects += $(project) diff --git a/cpp/src/IceUtil/.gitignore b/cpp/src/IceUtil/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/IceUtil/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile deleted file mode 100644 index 934522baa08..00000000000 --- a/cpp/src/IceUtil/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) -SONAME = $(call mksoname,IceUtil,$(SOVERSION)) -LIBNAME = $(call mklibname,IceUtil) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -OBJS = ArgVector.o \ - Cond.o \ - ConvertUTF.o \ - CountDownLatch.o \ - CtrlCHandler.o \ - Exception.o \ - FileUtil.o \ - InputUtil.o \ - MutexProtocol.o \ - Options.o \ - OutputUtil.o \ - Random.o \ - RecMutex.o \ - SHA1.o \ - Shared.o \ - StringConverter.o \ - StringUtil.o \ - Thread.o \ - ThreadException.o \ - Time.o \ - Timer.o \ - Unicode.o \ - UUID.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. -LINKWITH := $(ICEUTIL_OS_LIBS) - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk new file mode 100644 index 00000000000..530681d3f22 --- /dev/null +++ b/cpp/src/IceUtil/Makefile.mk @@ -0,0 +1,23 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries = IceUtil + +IceUtil_targetdir := $(libdir) +IceUtil_cppflags := -DICE_UTIL_API_EXPORTS +IceUtil_system_libs := $(ICEUTIL_OS_LIBS) + +# Always enable the static configuration for the IceUtil library +IceUtil_always_enable_configs := static + +ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) + IceUtil_cppflags += -DICE_PRIO_INHERIT +endif + +projects += $(project) diff --git a/cpp/src/IceXML/.gitignore b/cpp/src/IceXML/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/IceXML/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile deleted file mode 100644 index 6378e47c360..00000000000 --- a/cpp/src/IceXML/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,IceXML,$(VERSION)) -SONAME = $(call mksoname,IceXML,$(SOVERSION)) -LIBNAME = $(call mklibname,IceXML) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -OBJS = Parser.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_XML_API_EXPORTS $(EXPAT_FLAGS) - -LINKWITH := -lIceUtil $(EXPAT_LIBS) - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk new file mode 100644 index 00000000000..00ecc121121 --- /dev/null +++ b/cpp/src/IceXML/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := IceXML + +IceXML_targetdir := $(libdir) +IceXML_dependencies := IceUtil +IceXML_cppflags := -DICE_XML_API_EXPORTS +IceXML_libs := expat + +projects += $(project) diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h new file mode 100644 index 00000000000..dd391156cf4 --- /dev/null +++ b/cpp/src/IceXML/Parser.h @@ -0,0 +1,187 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2016 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. +// +// ********************************************************************** + +#ifndef ICE_XML_PARSER_H +#define ICE_XML_PARSER_H + +#include <IceUtil/Shared.h> +#include <IceUtil/Handle.h> +#include <IceUtil/Exception.h> + +#include <vector> +#include <map> + +#ifndef ICE_XML_API +# ifdef ICE_XML_API_EXPORTS +# define ICE_XML_API ICE_DECLSPEC_EXPORT +# elif defined(ICE_STATIC_LIBS) +# define ICE_XML_API /**/ +# else +# define ICE_XML_API ICE_DECLSPEC_IMPORT +# endif +#endif + +// +// Automatically link IceXML[D|++11|++11D].lib with Visual C++ +// + +#if !defined(ICE_BUILDING_ICE_XML) && defined(ICE_XML_API_EXPORTS) +# define ICE_BUILDING_ICE_XML +#endif + +#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_XML) +# pragma comment(lib, ICE_LIBNAME("IceXML")) +#endif + +namespace IceXML +{ + +class ICE_XML_API ParserException : public IceUtil::Exception +{ +public: + + ParserException(const std::string&); + ParserException(const char*, int, const std::string&); + virtual ~ParserException() ICE_NOEXCEPT; + + virtual std::string ice_id() const; + virtual void ice_print(std::ostream&) const; +#ifndef ICE_CPP11_MAPPING + virtual ParserException* ice_clone() const; +#endif + virtual void ice_throw() const; + + std::string reason() const; + +private: + + std::string _reason; + static const char* _name; +}; + +class Node; +typedef IceUtil::Handle< Node > NodePtr; + +typedef std::vector<NodePtr> NodeList; + +class Element; +typedef IceUtil::Handle< Element > ElementPtr; + +class Text; +typedef IceUtil::Handle< Text > TextPtr; + +class Document; +typedef IceUtil::Handle< Document > DocumentPtr; + +typedef std::map<std::string, std::string> Attributes; + +class ICE_XML_API Node : public IceUtil::Shared +{ +public: + + virtual ~Node(); + + virtual NodePtr getParent() const; + virtual std::string getName() const; + virtual std::string getValue() const; + virtual NodeList getChildren() const; + virtual Attributes getAttributes() const; + virtual std::string getAttribute(const std::string&) const; + + virtual bool addChild(const NodePtr&); + + virtual void destroy(); + + int getLine() const; + int getColumn() const; + +protected: + + Node(const NodePtr&, const std::string&, const std::string&, int, int); + + NodePtr _parent; + std::string _name; + std::string _value; + int _line; + int _column; +}; + +class ICE_XML_API Element : public Node +{ +public: + + Element(const NodePtr&, const std::string&, const Attributes&, int, int); + virtual ~Element(); + + virtual NodeList getChildren() const; + virtual Attributes getAttributes() const; + virtual std::string getAttribute(const std::string&) const; + + virtual bool addChild(const NodePtr&); + + virtual void destroy(); + +private: + + NodeList _children; + Attributes _attributes; +}; + +class ICE_XML_API Text : public Node +{ +public: + + Text(const NodePtr&, const std::string&, int, int); + virtual ~Text(); +}; + +class ICE_XML_API Document : public Node +{ +public: + + Document(); + virtual ~Document(); + + virtual NodeList getChildren() const; + + virtual bool addChild(const NodePtr&); + + virtual void destroy(); + +private: + + NodeList _children; +}; + +class ICE_XML_API Handler +{ +public: + + virtual ~Handler(); + + virtual void startElement(const std::string&, const Attributes&, int, int) = 0; + virtual void endElement(const std::string&, int, int) = 0; + virtual void characters(const std::string&, int, int) = 0; + virtual void error(const std::string&, int, int); +}; + +class ICE_XML_API Parser +{ +public: + + static DocumentPtr parse(const std::string&); // The given filename must be UTF-8 encoded + static DocumentPtr parse(std::istream&); + + static void parse(const std::string&, Handler&); + static void parse(std::istream&, Handler&); +}; + +} + +#endif diff --git a/cpp/src/Makefile b/cpp/src/Makefile deleted file mode 100644 index c0bfd0cfdb1..00000000000 --- a/cpp/src/Makefile +++ /dev/null @@ -1,122 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 - -ifeq ($(CPP11_MAPPING),yes) - SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - Ice \ - IceSSL \ - IceDiscovery \ - Glacier2Lib \ - IceStormLib \ - IceGridLib \ - IceBox \ - IceLocatorDiscovery - -ifeq ($(BUILD_ICE_BT),yes) - SUBDIRS := $(SUBDIRS) IceXML IceBT -endif - -else - -ifneq ($(findstring MINGW,$(UNAME)),) - SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - Ice \ - IceSSL \ - IceDiscovery \ - IceLocatorDiscovery -else - SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - slice2cs \ - slice2java \ - slice2php \ - slice2html \ - slice2js - -ifeq ($(UNAME),Darwin) - SUBDIRS := $(SUBDIRS) slice2objc -endif - - SUBDIRS := $(SUBDIRS) \ - Ice \ - IceXML \ - IceSSL \ - IceDiscovery \ - IceLocatorDiscovery \ - IceBox \ - Glacier2Lib \ - Glacier2CryptPermissionsVerifier \ - Glacier2 \ - IcePatch2Lib \ - IcePatch2 \ - IceStormLib \ - IceGridLib \ - IceDB \ - IceStorm \ - IceGrid - -ifeq ($(BUILD_ICE_BT),yes) - SUBDIRS := $(SUBDIRS) IceBT -endif - -endif -endif - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -# -# Dependencies for 'all' target when using -jx -# - -Slice: IceUtil - -slice2cpp slice2cs slice2java slice2js slice2php slice2html slice2objc: Slice - -Ice: slice2cpp - -IceXML IceSSL IceBox Glacier2Lib IcePatch2Lib IceStormLib IceGridLib IceBT: Ice - -IceBT: IceXML - -Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib - -IcePatch2: IcePatch2Lib - -IceStorm: IceBox IceStormLib IceGridLib Glacier2Lib IceDB - -IceGrid: IceGridLib IceStorm IcePatch2Lib IceDB IceSSL IceBox IceXML - -IceDiscovery IceLocatorDiscovery: Ice - -IceDB: Ice - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - if test -d $$subdir ; \ - then \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - fi; \ - done diff --git a/cpp/src/Slice/.gitignore b/cpp/src/Slice/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/Slice/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile deleted file mode 100644 index 0d8441a08e3..00000000000 --- a/cpp/src/Slice/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -LIBFILENAME = $(call mklibfilename,Slice,$(VERSION)) -SONAME = $(call mksoname,Slice,$(SOVERSION)) -LIBNAME = $(call mklibname,Slice) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -OBJS = Checksum.o \ - CPlusPlusUtil.o \ - CsUtil.o \ - DotNetNames.o \ - FileTracker.o \ - JavaUtil.o \ - MD5.o \ - MD5I.o \ - ObjCUtil.o \ - Parser.o \ - PHPUtil.o \ - Preprocessor.o \ - PythonUtil.o \ - Python.o \ - RubyUtil.o \ - Ruby.o \ - Scanner.o \ - Util.o \ - ../Slice/Grammar.o - -include $(top_srcdir)/config/Make.rules - - -CPPFLAGS := -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS -BISONFLAGS := --name-prefix "slice_" $(BISONFLAGS) - -LINKWITH := $(BASELIBS) $(MCPP_LIBS) -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) $(MCPP_NUPKG) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) -endif - diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk new file mode 100644 index 00000000000..4fb2b306662 --- /dev/null +++ b/cpp/src/Slice/Makefile.mk @@ -0,0 +1,20 @@ +# ********************************************************************** +# +# 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. +# +# ********************************************************************** + +$(project)_libraries := Slice + +Slice_targetdir := $(libdir) +Slice_dependencies := IceUtil +Slice_cppflags := -DSLICE_API_EXPORTS +Slice_libs := mcpp + +# Always enable the static configuration for the Slice library +Slice_always_enable_configs := static + +projects += $(project) diff --git a/cpp/src/slice2confluence/.gitignore b/cpp/src/slice2confluence/.gitignore deleted file mode 100644 index 3a412ca89c7..00000000000 --- a/cpp/src/slice2confluence/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index 32786fed6fe..a1176f7cc37 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -51,7 +51,7 @@ Confluence::ConfluenceOutput::ConfluenceOutput(const char* s) : } void -Confluence::ConfluenceOutput::print(const char* s) +Confluence::ConfluenceOutput::print(const string& s) { if(_se) { @@ -62,7 +62,7 @@ Confluence::ConfluenceOutput::print(const char* s) if(_escape) { string escaped = escape(s); - OutputBase::print(escaped.c_str()); + OutputBase::print(escaped); } else { diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h index 90d02809368..a97577c39c5 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.h +++ b/cpp/src/slice2confluence/ConfluenceOutput.h @@ -15,59 +15,59 @@ namespace Confluence class ConfluenceOutput : public IceUtilInternal::OutputBase { public: - + ConfluenceOutput(); ConfluenceOutput(std::ostream&); ConfluenceOutput(const char*); - + virtual ~ConfluenceOutput(){}; - - virtual void print(const char*); // Print a string. - + + virtual void print(const std::string&); // Print a string. + virtual void newline(); // Print newline. - + void startElement(const std::string&); // Start an element. void endElement(); // End an element. void attr(const std::string&, const std::string&); // Add an attribute to an element. - + std::string convertCommentHTML(std::string comment); std::string escapeComment(std::string comment); - + std::string getAnchorMarkup(const std::string&, const std::string& = ""); std::string getLinkMarkup(const std::string&, const std::string& = "", const std::string& = "", const std::string& = ""); std::string getImageMarkup(const std::string&, const std::string& = ""); std::string getNavMarkup(const std::string&, const std::string&); - + void startEscapes(); void endEscapes(); - + std::string currentElement() const; - + /** * Wrap sections in these markers to prevent them from being confluence-escaped. * The regular confluence-escaping process will remove these markers. */ const static std::string TEMP_ESCAPER_START; // wrap sections const static std::string TEMP_ESCAPER_END; // wrap sections - + /** * Gets the start and end positions of all TEMP_ESCAPED sections of the given string. */ std::list<std::pair<unsigned int,unsigned int> > getMarkerLimits(const std::string&); - + std::string removeMarkers(std::string); - + private: - + std::string escape(const ::std::string&) const; - + std::stack<std::string> _elementStack; - + bool _se; bool _text; - + bool _escape; - + std::string _listMarkers; std::string _commentListMarkers; }; @@ -114,13 +114,13 @@ operator<<(ConfluenceOutput& o, const EndElement&) class StartElement { public: - + StartElement(const std::string&); - + const std::string& getName() const; - + private: - + const std::string _name; }; @@ -137,14 +137,14 @@ operator<<(ConfluenceOutput& o, const StartElement& e) class Attribute { public: - + Attribute(const ::std::string&, const ::std::string&); - + const ::std::string& getName() const; const ::std::string& getValue() const; - + private: - + const ::std::string _name; const ::std::string _value; }; diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp index 2d7b4d9219d..b812be5cd7a 100644 --- a/cpp/src/slice2confluence/Main.cpp +++ b/cpp/src/slice2confluence/Main.cpp @@ -24,7 +24,7 @@ using namespace IceUtil; namespace { -IceUtil::Mutex* mutex = 0; +IceUtil::Mutex* globalMutex = 0; bool interrupted = false; class Init @@ -33,13 +33,13 @@ public: Init() { - mutex = new IceUtil::Mutex; + globalMutex = new IceUtil::Mutex; } ~Init() { - delete mutex; - mutex = 0; + delete globalMutex; + globalMutex = 0; } }; @@ -72,7 +72,7 @@ splitCommas(string& str) void interruptedCallback(int signal) { - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); + IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); interrupted = true; } @@ -310,7 +310,7 @@ compile(int argc, char* argv[]) } { - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); + IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); if(interrupted) { @@ -352,7 +352,7 @@ compile(int argc, char* argv[]) p->destroy(); { - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex); + IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); if(interrupted) { diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile deleted file mode 100644 index 2bef9175f5d..00000000000 --- a/cpp/src/slice2confluence/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2confluence - -TARGETS = $(NAME) - -OBJS = ConfluenceOutput.o \ - Gen.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2cpp/.gitignore b/cpp/src/slice2cpp/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/slice2cpp/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile deleted file mode 100644 index 3af754207f8..00000000000 --- a/cpp/src/slice2cpp/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2cpp$(EXE_EXT) - -TARGETS = $(NAME) - -OBJS = Gen.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2cpp.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2cs/.gitignore b/cpp/src/slice2cs/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/slice2cs/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile deleted file mode 100644 index e46c1005dd6..00000000000 --- a/cpp/src/slice2cs/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2cs - -TARGETS = $(NAME) - -OBJS = Gen.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2cs.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2html/.gitignore b/cpp/src/slice2html/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/slice2html/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile deleted file mode 100644 index 8b8b40307a5..00000000000 --- a/cpp/src/slice2html/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2html - -TARGETS = $(NAME) - -OBJS = Gen.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2html.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2java/.gitignore b/cpp/src/slice2java/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/slice2java/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile deleted file mode 100644 index e2a882bfb6f..00000000000 --- a/cpp/src/slice2java/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2java - -TARGETS = $(NAME) - -OBJS = Gen.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2java.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2js/.gitignore b/cpp/src/slice2js/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/slice2js/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/slice2js/Makefile b/cpp/src/slice2js/Makefile deleted file mode 100644 index 0aaf14a7a0d..00000000000 --- a/cpp/src/slice2js/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2js - -TARGETS = $(NAME) - -OBJS = Gen.o \ - JsUtil.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2js.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2objc/.gitignore b/cpp/src/slice2objc/.gitignore deleted file mode 100644 index 3a412ca89c7..00000000000 --- a/cpp/src/slice2objc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend diff --git a/cpp/src/slice2objc/Makefile b/cpp/src/slice2objc/Makefile deleted file mode 100644 index 6abe0150f36..00000000000 --- a/cpp/src/slice2objc/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2objc$(EXE_EXT) - -TARGETS = $(NAME) - -OBJS = Gen.o \ - Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2objc.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2php/.gitignore b/cpp/src/slice2php/.gitignore deleted file mode 100644 index 720f44c7047..00000000000 --- a/cpp/src/slice2php/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -.depend diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile deleted file mode 100644 index 62f82531201..00000000000 --- a/cpp/src/slice2php/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2php - -TARGETS = $(NAME) - -OBJS = Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I.. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2php.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2py/.gitignore b/cpp/src/slice2py/.gitignore deleted file mode 100644 index 3a412ca89c7..00000000000 --- a/cpp/src/slice2py/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile deleted file mode 100644 index 17c038be6f1..00000000000 --- a/cpp/src/slice2py/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 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 = ../.. - -NAME = $(bindir)/slice2py - -TARGETS = $(NAME) - -OBJS = Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2py.1,$(DESTDIR)$(install_mandir)) |