diff options
Diffstat (limited to 'TAO')
21 files changed, 275 insertions, 39 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 80961a27bff..e669fa52ca8 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,29 @@ +Thu Sep 22 14:45:32 2005 William Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/STD_CID_Handler.cpp + * tools/Config_Handlers/STD_CID_Handler.h + * tools/Config_Handlers/STD_CPD_Handler.cpp + * tools/Config_Handlers/STD_CPD_Handler.h + * tools/Config_Handlers/STD_PCD_Handler.cpp + * tools/Config_Handlers/STD_PCD_Handler.h + * tools/Config_Handlers/STD_PC_Intf.cpp + * tools/Config_Handlers/XML_File_Intf.cpp + * tools/Config_Handlers/RT-CCM/SRD_Handler.h + * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc + + Made these files consistent with the new Utils directory. + + * tools/Config_Handlers/Utils/Utils.mpc + * tools/Config_Handlers/Utils/XML_Error_Handler.cpp + * tools/Config_Handlers/Utils/XML_Error_Handler.h + * tools/Config_Handlers/Utils/XML_Helper.cpp + * tools/Config_Handlers/Utils/XML_Helper.h + * tools/Config_Handlers/Utils/XercesString.cpp + * tools/Config_Handlers/Utils/XercesString.h + + Moved common XML utilities to a separate directory. + Thu Sep 22 13:21:12 2005 Gan Deng <dengg@dre.vanderbilt.edu> * ciao/CCM_Core.mpc diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc index 7dcce369c78..7cfff56ef80 100644 --- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc +++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc @@ -1,13 +1,12 @@ //$Id$ -project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces { - after += RT_CCM_Config_Handlers - sharedname = XSC_Config_Handlers - dynamicflags = CONFIG_HANDLERS_BUILD_DLL - macros += XML_USE_PTHREADS - requires += exceptions +project (XSC_XML_Handlers) : acelib, xerces { + sharedname += XSC_XML_Handlers + dynamicflags = CONFIG_HANDLERS_BUILD_DLL + macros += XML_USE_PTHREADS + requires += exceptions includes += $(CIAO_ROOT)/tools/Config_Handlers - libs += CIAO_DnC_Container RT_CCM_Config_Handlers + Source_Files { ccd.cpp cdd.cpp @@ -19,6 +18,19 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces { pcd.cpp toplevel.cpp Basic_Deployment_Data.cpp + } +} + +project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces { + after += RT_CCM_Config_Handlers + sharedname = XSC_Config_Handlers + dynamicflags = CONFIG_HANDLERS_BUILD_DLL + macros += XML_USE_PTHREADS + requires += exceptions + includes += $(CIAO_ROOT)/tools/Config_Handlers + libs += CIAO_XML_Utils RT_CCM_Config_Handlers XSC_XML_Handlers + + Source_Files { DP_Handler.cpp CCD_Handler.cpp Property_Handler.cpp @@ -43,8 +55,6 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces { ComponentPropertyDescription_Handler.cpp RDD_Handler.cpp ID_Handler.cpp - XML_Error_Handler.cpp - XML_Helper.cpp XML_File_Intf.cpp IDREF_Base.cpp DnC_Dump.cpp @@ -55,7 +65,6 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces { STD_IAD_Handler.cpp STD_PC_Intf.cpp STD_PCD_Handler.cpp - XercesString.cpp PCD_Handler.cpp IRDD_Handler.cpp } @@ -64,16 +73,11 @@ project (XSC_Config_Handlers) : acelib, ciao_deployment_stub, xerces { } } -project (XSC_Config_Handlers_Tests) : ciao_deployment_stub,xerces { - +project (XSC_Config_Handlers_Tests) : ciao_config_handlers, ifr_client { requires += dummy_label exename = test - after += XSC_Config_Handlers dynamicflags = CONFIG_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS - requires += exceptions - libs += CIAO_DnC_Server TAO_IFR_Client XSC_Config_Handlers RT_CCM_Config_Handlers - includes += $(CIAO_ROOT)/tools/Config_Handlers Source_Files { test.cpp diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc index dab07d7e09b..fb154177fad 100644 --- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc +++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc @@ -6,8 +6,9 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces { macros += XML_USE_PTHREADS requires += exceptions includes += $(CIAO_ROOT)/tools/Config_Handlers + after += CIAO_XML_Utils + libs += CIAO_XML_Utils includes += $(CIAO_ROOT)/ciao - libs += XSC_Config_Handlers Source_Files { CIAOServerResources.cpp @@ -27,17 +28,17 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces { } -project (RT-CCM_Config_Handlers_Tests) : ciao_component_dnc, xerces { - requires += dummy_label - exename = rt-ccm-test - after += RT-CCM-Handlers - dynamicflags = CONFIG_HANDLERS_BUILD_DLL - macros += XML_USE_PTHREADS - requires += exceptions - includes += $(CIAO_ROOT)/tools/Config_Handlers - libs += CIAO_DnC_Server TAO_IFR_Client XSC_Config_Handlers RT_CCM_Config_Handlers +//project (RT-CCM_Config_Handlers_Tests) : ciao_component_dnc, xerces { +// requires += dummy_label +// exename = rt-ccm-test +// after += RT-CCM-Handlers +// dynamicflags = CONFIG_HANDLERS_BUILD_DLL +// macros += XML_USE_PTHREADS +// requires += exceptions +// includes += $(CIAO_ROOT)/tools/Config_Handlers +// libs += CIAO_DnC_Server TAO_IFR_Client RT_CCM_Config_Handlers CIAO_XML_Utils - Source_Files { - test.cpp - } -} +// Source_Files { +// test.cpp +// } +//} diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h index f7f86daee44..0b5bf1d2e65 100644 --- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h @@ -17,7 +17,7 @@ #include "ciao/ServerResourcesC.h" #include "CIAOServerResources.hpp" #include "ace/Auto_Ptr.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp index 9ce1d65be3a..4eeb7377b29 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.cpp @@ -4,7 +4,7 @@ #include "STD_IAD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "ciao/Deployment_DataC.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #include "Deployment.hpp" #include "Property_Handler.h" diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h index 1eb5b3952ed..c8fb2954a6f 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/STD_CID_Handler.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #include "IDREF_Base.h" #include "Config_Handlers_Export.h" #include "ciao/DeploymentC.h" diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp index ac925ad3278..d79a4ea5d39 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.cpp @@ -3,7 +3,6 @@ #include "STD_CID_Handler.h" #include "Basic_Deployment_Data.hpp" #include "ciao/Deployment_DataC.h" -#include "XML_Helper.h" #include "Deployment.hpp" namespace CIAO diff --git a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h index 80ea03070ab..66db939ec49 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #include "Config_Handlers_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp index acb349df94d..6bef6636238 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.cpp @@ -3,7 +3,6 @@ #include "STD_CPD_Handler.h" #include "Basic_Deployment_Data.hpp" #include "ciao/Packaging_DataC.h" -#include "XML_Helper.h" #include "Deployment.hpp" diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h index 4c253ca244f..ba53f6736da 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/STD_PCD_Handler.h @@ -12,7 +12,7 @@ #define CIAO_CONFIG_HANDLERS_STD_PCD_HANDLER_H #include /**/ "ace/pre.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #include "Config_Handlers_Export.h" diff --git a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp index d45a94d00ab..f3eb1609c1b 100644 --- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp +++ b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp @@ -7,7 +7,7 @@ #endif #include "STD_PC_Intf.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #include "Deployment.hpp" #include "STD_PCD_Handler.h" #include "ciao/Packaging_DataC.h" diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile b/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile new file mode 100644 index 00000000000..8e0cef2b22d --- /dev/null +++ b/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile @@ -0,0 +1,31 @@ +# -*- makefile -*- +#------------------------------------------------------------------------- +# GNU ACE Workspace +# +# $Id$ +# +# This file was generated by MPC. Any changes made directly to +# this file will be lost the next time it is generated. +# +# MPC Command: +# /project/balartmp/wotte/experimental/ACE_wrappers/bin/mwc.pl -include /project/balartmp/wotte/experimental/ACE_wrappers/MPC/config -include /project/balartmp/wotte/experimental/ACE_wrappers/MPC/templates +# +#------------------------------------------------------------------------- +MAKEFILE = GNUmakefile + +ifeq ($(findstring k,$(MAKEFLAGS)),k) + KEEP_GOING = - +endif + +include $(ACE_ROOT)/include/makeinclude/macros.GNU + +all: CIAO_XML_Utils + +.PHONY: CIAO_XML_Utils +CIAO_XML_Utils: + $(KEEP_GOING)@$(MAKE) -f GNUmakefile.CIAO_XML_Utils + +REMAINING_TARGETS := $(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS) +$(REMAINING_TARGETS): + $(KEEP_GOING)@$(MAKE) -f GNUmakefile.CIAO_XML_Utils $(@) + diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile.CIAO_XML_Utils b/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile.CIAO_XML_Utils new file mode 100644 index 00000000000..2f947584ed0 --- /dev/null +++ b/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile.CIAO_XML_Utils @@ -0,0 +1,161 @@ +# -*- Makefile -*- +#---------------------------------------------------------------------------- +# GNU Makefile +# +# @file GNUmakefile.CIAO_XML_Utils +# +# $Id$ +# +# This file was automatically generated by MPC. Any changes made directly to +# this file will be lost the next time it is generated. +# +#---------------------------------------------------------------------------- +MAKEFILE = GNUmakefile.CIAO_XML_Utils +DEPENDENCY_FILE = .depend.CIAO_XML_Utils + +## LIB may be set to empty later on in this file +LIB_UNCHECKED = libCIAO_XML_Utils.a +LIB = $(LIB_UNCHECKED) + +## SHLIB may be set to empty later on in this file +SHLIB_UNCHECKED = libCIAO_XML_Utils.$(SOEXT) +SHLIB = $(SHLIB_UNCHECKED) + +TAO_ROOT ?= $(ACE_ROOT)/TAO +CIAO_ROOT ?= $(TAO_ROOT)/CIAO + +FILES = \ + XML_Error_Handler.cpp \ + XML_Helper.cpp \ + XercesString.cpp + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +XERCESLIB ?= xerces-c +ACE_SHLIBS = -lACE -l$(XERCESLIB) + +INSLIB ?= ../../../../../lib +ifeq ($(INSLIB),.) + ifeq ($(PWD),) + PWD=$(shell pwd) + endif + INSLIB = $(PWD) +endif +OUTPUT_DIRECTORY = $(INSLIB) + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +## We don't need the ACELIB setting from wrapper_macros.GNU +ACELIB = +include $(CIAO_ROOT)/rules.ciao.GNU + +# To build multiple targets in the same directory on AIX, it works +# best to have a template directory per project. +# The compiler/linker isn't too smart about instantiating templates... +ifdef TEMPINCDIR +TEMPINCDIR := $(TEMPINCDIR)/CIAO_XML_Utils +all: $(TEMPINCDIR) +endif + +ifneq ($(OUTPUT_DIRECTORY),) +all: $(OUTPUT_DIRECTORY) +$(OUTPUT_DIRECTORY): + -@$(MKDIR) "$(OUTPUT_DIRECTORY)" +endif + +# turn off libcheck if doing a dry run +ifeq ($(findstring n, $(MAKEFLAGS)),n) + LIBCHECK = 1 +else + # turn off libcheck if keep going was passed too + ifeq ($(findstring k, $(MAKEFLAGS)),k) + LIBCHECK = 1 + else + LIBCHECK ?= $(filter-out $(foreach lib,ACE,$(findstring $(lib),$(foreach libpath,. ../../../../../lib $(XERCESCROOT)/lib /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),ACE) + ifeq ($(LIBCHECK),) + LIBCHECK = 1 + endif + endif +endif +ifeq ($(exceptions),1) +ifneq ($(LIBCHECK), 1) + LIB = + SHLIB = + all: lib_warning +endif +else + LIB = + SHLIB = + all: require_warning +endif + +ifeq ($(exceptions),1) +else + LIB = + SHLIB = + all: require_warning +endif +LSRC = $(FILES) + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +ifeq ($(VXWORKSLINK),true) +include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) +endif + +ifeq ($(VXWORKSLINK),true) +LDLIBPATH = -L. -L../../../../../lib -L$(XERCESCROOT)/lib +else +LDFLAGS += -L. -L../../../../../lib -L$(XERCESCROOT)/lib +endif +CPPFLAGS += -I../../../../.. -I$(XERCESCROOT)/include -I../../../tools/Config_Handlers +CPPFLAGS += -DXML_USE_PTHREADS +ifeq ($(shared_libs),1) + ifneq ($(SHLIB),) + CPPFLAGS += -DCONFIG_HANDLERS_BUILD_DLL + endif +endif +ifeq ($(static_libs),1) + CPPFLAGS += -DACE_AS_STATIC_LIBS +endif + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- +lib_warning: + @echo This project will not be built due to the following missing library: + @echo $(LIBCHECK) + +require_warning: + @echo This project will not be built due to one of the following missing features: + @echo exceptions + +## Some OS's have /bin/test others only have /usr/bin/test +ifeq ($(wildcard /bin/test), /bin/test) + TEST_EXE = /bin/test +else +ifeq ($(wildcard /usr/bin/test), /usr/bin/test) + TEST_EXE = /usr/bin/test +endif +endif + +ifneq ($(GENERATED_DIRTY),) +.PRECIOUS: $(GENERATED_DIRTY) +## If the generated files are anything but source files, we need to +## ensure that those files are generated before we attempt to build anything +## else. +ifeq ($(OBJS_DEPEND_ON_GENERATED),1) +$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY) +$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY) +endif +endif + + +realclean: clean +ifneq ($(GENERATED_DIRTY),) + -$(RM) -r $(GENERATED_DIRTY) +endif + diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc new file mode 100644 index 00000000000..0c550f24902 --- /dev/null +++ b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc @@ -0,0 +1,15 @@ +// $Id$ + +project (CIAO_XML_Utils) : acelib, xerces { + includes += $(CIAO_ROOT)/tools/Config_Handlers + sharedname += CIAO_XML_Utils + dynamicflags = CONFIG_HANDLERS_BUILD_DLL + macros += XML_USE_PTHREADS + requires += exceptions + + Source_Files { + XML_Error_Handler.cpp + XML_Helper.cpp + XercesString.cpp + } +} diff --git a/TAO/CIAO/tools/Config_Handlers/XML_Error_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp index d87e75dfb93..d87e75dfb93 100644 --- a/TAO/CIAO/tools/Config_Handlers/XML_Error_Handler.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.cpp diff --git a/TAO/CIAO/tools/Config_Handlers/XML_Error_Handler.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h index 5d5dcbdde1e..5d5dcbdde1e 100644 --- a/TAO/CIAO/tools/Config_Handlers/XML_Error_Handler.h +++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Error_Handler.h diff --git a/TAO/CIAO/tools/Config_Handlers/XML_Helper.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp index dc72c984b5a..dc72c984b5a 100644 --- a/TAO/CIAO/tools/Config_Handlers/XML_Helper.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp diff --git a/TAO/CIAO/tools/Config_Handlers/XML_Helper.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h index 024df5264ae..024df5264ae 100644 --- a/TAO/CIAO/tools/Config_Handlers/XML_Helper.h +++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.h diff --git a/TAO/CIAO/tools/Config_Handlers/XercesString.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp index 1d4d5a74a0e..1d4d5a74a0e 100644 --- a/TAO/CIAO/tools/Config_Handlers/XercesString.cpp +++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp diff --git a/TAO/CIAO/tools/Config_Handlers/XercesString.h b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h index 9e8f963f8d1..9e8f963f8d1 100644 --- a/TAO/CIAO/tools/Config_Handlers/XercesString.h +++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp index 64cba9e65d7..8c4caa05475 100644 --- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp +++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp @@ -7,7 +7,7 @@ #endif #include "XML_File_Intf.h" -#include "XML_Helper.h" +#include "Utils/XML_Helper.h" #include "Deployment.hpp" #include "DP_Handler.h" #include "ciao/Deployment_DataC.h" |