From 064b6b1fd58984b1a5375151a67aadc5d552cbf0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 4 Dec 2006 15:15:25 +0000 Subject: Mon Dec 4 12:14:57 UTC 2006 Johnny Willemsen --- CIAO/ChangeLog | 6 ++++++ CIAO/MPC/config/ciao_client_dnc.mpb | 9 ++++++++ CIAO/MPC/config/ciao_component_dnc.mpb | 7 ++++++ CIAO/MPC/config/ciao_config_handlers.mpb | 25 ++++++++++++++++++++++ CIAO/MPC/config/ciao_config_handlers_base.mpb | 13 +++++++++++ CIAO/MPC/config/ciao_container_dnc.mpb | 7 ++++++ CIAO/MPC/config/ciao_deployment_stub.mpb | 9 ++++++++ CIAO/MPC/config/ciao_deployment_svnt.mpb | 8 +++++++ .../config/ciao_domainapplicationmanager_dnc.mpb | 8 +++++++ CIAO/MPC/config/ciao_events_base_dnc.mpb | 7 ++++++ CIAO/MPC/config/ciao_events_dnc.mpb | 9 ++++++++ CIAO/MPC/config/ciao_executionmanager_stub.mpb | 8 +++++++ CIAO/MPC/config/ciao_nodeapplication.mpb | 7 ++++++ CIAO/MPC/config/ciao_nodeapplicationmanager.mpb | 8 +++++++ CIAO/MPC/config/ciao_nodemanager_stub.mpb | 9 ++++++++ CIAO/MPC/config/ciao_nodemanager_svnt.mpb | 7 ++++++ CIAO/MPC/config/ciao_noop_configurator.mpb | 7 ++++++ CIAO/MPC/config/ciao_plan_generator.mpb | 8 +++++++ CIAO/MPC/config/ciao_race_component.mpb | 8 +++++++ CIAO/MPC/config/ciao_race_default.mpb | 7 ++++++ CIAO/MPC/config/ciao_race_monitor.mpb | 7 ++++++ CIAO/MPC/config/ciao_rtevent_dnc.mpb | 9 ++++++++ CIAO/MPC/config/ciao_servant_dnc.mpb | 7 ++++++ CIAO/MPC/config/ciao_server_dnc.mpb | 7 ++++++ CIAO/MPC/config/ciao_static_dnc_app.mpb | 5 +++++ CIAO/MPC/config/ciao_targetmanager_stub.mpb | 8 +++++++ CIAO/MPC/config/ciao_targetmanager_svnt.mpb | 7 ++++++ CIAO/MPC/config/ciao_xml_utils.mpb | 8 +++++++ CIAO/MPC/config/ciaocidldefaults.mpb | 24 +++++++++++++++++++++ CIAO/MPC/config/cidlc.mpb | 15 +++++++++++++ CIAO/MPC/config/dance_extension_stub.mpb | 6 ++++++ 31 files changed, 280 insertions(+) create mode 100644 CIAO/MPC/config/ciao_client_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_component_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_config_handlers.mpb create mode 100644 CIAO/MPC/config/ciao_config_handlers_base.mpb create mode 100644 CIAO/MPC/config/ciao_container_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_deployment_stub.mpb create mode 100644 CIAO/MPC/config/ciao_deployment_svnt.mpb create mode 100644 CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_events_base_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_events_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_executionmanager_stub.mpb create mode 100644 CIAO/MPC/config/ciao_nodeapplication.mpb create mode 100644 CIAO/MPC/config/ciao_nodeapplicationmanager.mpb create mode 100644 CIAO/MPC/config/ciao_nodemanager_stub.mpb create mode 100644 CIAO/MPC/config/ciao_nodemanager_svnt.mpb create mode 100644 CIAO/MPC/config/ciao_noop_configurator.mpb create mode 100644 CIAO/MPC/config/ciao_plan_generator.mpb create mode 100644 CIAO/MPC/config/ciao_race_component.mpb create mode 100644 CIAO/MPC/config/ciao_race_default.mpb create mode 100644 CIAO/MPC/config/ciao_race_monitor.mpb create mode 100644 CIAO/MPC/config/ciao_rtevent_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_servant_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_server_dnc.mpb create mode 100644 CIAO/MPC/config/ciao_static_dnc_app.mpb create mode 100644 CIAO/MPC/config/ciao_targetmanager_stub.mpb create mode 100644 CIAO/MPC/config/ciao_targetmanager_svnt.mpb create mode 100644 CIAO/MPC/config/ciao_xml_utils.mpb create mode 100644 CIAO/MPC/config/ciaocidldefaults.mpb create mode 100644 CIAO/MPC/config/cidlc.mpb create mode 100644 CIAO/MPC/config/dance_extension_stub.mpb diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 4b12dfe34a1..8afd03641f9 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 4 12:14:57 UTC 2006 Johnny Willemsen + + * MPC/config/*: + All CIAO base projects are moved from + ACE_wrappers/bin/MakeProjectCreator/config to this directory + Mon Dec 4 12:35:57 UTC 2006 Johnny Willemsen * DAnCE/TargetManager/TM_Client.mpc: diff --git a/CIAO/MPC/config/ciao_client_dnc.mpb b/CIAO/MPC/config/ciao_client_dnc.mpb new file mode 100644 index 00000000000..8e12607cf37 --- /dev/null +++ b/CIAO/MPC/config/ciao_client_dnc.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ifr_client, valuetype, pi, codecfactory { + after += CIAO_DnC_Client + includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao + idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao + libs += CIAO_DnC_Client +} diff --git a/CIAO/MPC/config/ciao_component_dnc.mpb b/CIAO/MPC/config/ciao_component_dnc.mpb new file mode 100644 index 00000000000..9cabf46cf83 --- /dev/null +++ b/CIAO/MPC/config/ciao_component_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, ciao_server_dnc, ciao_events_dnc { + after += CIAO_DnC_Container + libs += CIAO_DnC_Container +} diff --git a/CIAO/MPC/config/ciao_config_handlers.mpb b/CIAO/MPC/config/ciao_config_handlers.mpb new file mode 100644 index 00000000000..69412b873f1 --- /dev/null +++ b/CIAO/MPC/config/ciao_config_handlers.mpb @@ -0,0 +1,25 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_config_handlers_base, dynamicany, typecodefactory { + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } + after += CIAO_XML_Utils \ + XSC_DynAny_Handler \ + XSC_Config_Handlers \ + XSC_XML_Handlers \ + RT_CCM_Config_Handlers \ + CIAO_Events_Handlers \ + Package_Config_Handlers \ + XSC_Config_Handlers_Common + + libs += CIAO_XML_Utils \ + XSC_Config_Handlers \ + RT_CCM_Config_Handlers \ + CIAO_Events_Handlers \ + Package_Config_Handlers \ + XSC_XML_Handlers \ + XSC_Config_Handlers_Common \ + XSC_DynAny_Handler +} diff --git a/CIAO/MPC/config/ciao_config_handlers_base.mpb b/CIAO/MPC/config/ciao_config_handlers_base.mpb new file mode 100644 index 00000000000..4b5e001febb --- /dev/null +++ b/CIAO/MPC/config/ciao_config_handlers_base.mpb @@ -0,0 +1,13 @@ +// $Id$ + +project : ciao_xml_utils, dynamicany, typecodefactory, exceptions, ciao_events_dnc { + after += XSC_XML_Handlers + libs += XSC_XML_Handlers + macros += XML_USE_PTHREADS + includes += $(CIAO_ROOT)/tools/Config_Handlers + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } + +} diff --git a/CIAO/MPC/config/ciao_container_dnc.mpb b/CIAO/MPC/config/ciao_container_dnc.mpb new file mode 100644 index 00000000000..7875cd5d088 --- /dev/null +++ b/CIAO/MPC/config/ciao_container_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, ciao_client_dnc { + after += CIAO_DnC_Container + libs += CIAO_DnC_Container +} diff --git a/CIAO/MPC/config/ciao_deployment_stub.mpb b/CIAO/MPC/config/ciao_deployment_stub.mpb new file mode 100644 index 00000000000..45e0fb77341 --- /dev/null +++ b/CIAO/MPC/config/ciao_deployment_stub.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_client_dnc, ciao_events_base_dnc { + after += Deployment_stub + libs += CIAO_Deployment_stub + includes += $(CIAO_ROOT)/DAnCE + idlflags += -I$(CIAO_ROOT)/DAnCE +} diff --git a/CIAO/MPC/config/ciao_deployment_svnt.mpb b/CIAO/MPC/config/ciao_deployment_svnt.mpb new file mode 100644 index 00000000000..644feb7f2b6 --- /dev/null +++ b/CIAO/MPC/config/ciao_deployment_svnt.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub, portableserver, ciao_events_dnc { + after += Deployment_svnt + libs += CIAO_Deployment_svnt + idlflags += -I$(CIAO_ROOT)/DAnCE +} diff --git a/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb b/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb new file mode 100644 index 00000000000..31731a84d5d --- /dev/null +++ b/CIAO/MPC/config/ciao_domainapplicationmanager_dnc.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_svnt { + includes += $(CIAO_ROOT)/DomainApplicationManager + libs += DomainApplicationManager + after += DomainApplicationManager +} diff --git a/CIAO/MPC/config/ciao_events_base_dnc.mpb b/CIAO/MPC/config/ciao_events_base_dnc.mpb new file mode 100644 index 00000000000..de2c8d5a7b9 --- /dev/null +++ b/CIAO/MPC/config/ciao_events_base_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, ciao_container_dnc, ciao_client_dnc { + libs += CIAO_DnC_Events_Base + after += CIAO_DnC_Events_Base +} diff --git a/CIAO/MPC/config/ciao_events_dnc.mpb b/CIAO/MPC/config/ciao_events_dnc.mpb new file mode 100644 index 00000000000..15a92b27332 --- /dev/null +++ b/CIAO/MPC/config/ciao_events_dnc.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc { + includes += $(CIAO_ROOT)/ciaosvcs/Events + idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events + libs += CIAO_DnC_Events + after += CIAO_DnC_Events +} diff --git a/CIAO/MPC/config/ciao_executionmanager_stub.mpb b/CIAO/MPC/config/ciao_executionmanager_stub.mpb new file mode 100644 index 00000000000..bea046abd2d --- /dev/null +++ b/CIAO/MPC/config/ciao_executionmanager_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/ExecutionManager + libs += ExecutionManager_stub + after += ExecutionManager_stub +} diff --git a/CIAO/MPC/config/ciao_nodeapplication.mpb b/CIAO/MPC/config/ciao_nodeapplication.mpb new file mode 100644 index 00000000000..7c47eb723c6 --- /dev/null +++ b/CIAO/MPC/config/ciao_nodeapplication.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub, ciao_noop_configurator { + libs += CIAO_NodeApplication + after += NodeApplicationLib +} diff --git a/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb b/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb new file mode 100644 index 00000000000..e7d313f0617 --- /dev/null +++ b/CIAO/MPC/config/ciao_nodeapplicationmanager.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_targetmanager_stub, ciao_nodeapplication { + includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager + libs += NodeApplicationManager + after += NodeApplicationManager +} diff --git a/CIAO/MPC/config/ciao_nodemanager_stub.mpb b/CIAO/MPC/config/ciao_nodemanager_stub.mpb new file mode 100644 index 00000000000..f69e5881091 --- /dev/null +++ b/CIAO/MPC/config/ciao_nodemanager_stub.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/Interfaces + includes += $(CIAO_ROOT)/DAnCE/NodeManager + libs += NodeManager_stub + after += NodeManager_stub +} diff --git a/CIAO/MPC/config/ciao_nodemanager_svnt.mpb b/CIAO/MPC/config/ciao_nodemanager_svnt.mpb new file mode 100644 index 00000000000..b3740720386 --- /dev/null +++ b/CIAO/MPC/config/ciao_nodemanager_svnt.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_nodemanager_stub { + libs += NodeManager CIAO_NoOp_Configurator + after += NodeManager_svnt +} diff --git a/CIAO/MPC/config/ciao_noop_configurator.mpb b/CIAO/MPC/config/ciao_noop_configurator.mpb new file mode 100644 index 00000000000..67b3508ee38 --- /dev/null +++ b/CIAO/MPC/config/ciao_noop_configurator.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + libs += CIAO_NoOp_Configurator + after += NoOp_Configurator +} diff --git a/CIAO/MPC/config/ciao_plan_generator.mpb b/CIAO/MPC/config/ciao_plan_generator.mpb new file mode 100644 index 00000000000..e234ead3e67 --- /dev/null +++ b/CIAO/MPC/config/ciao_plan_generator.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc { + includes += $(CIAO_ROOT)/DAnCE/Plan_Generator + libs += Plan_Generator + after += Plan_Generator +} diff --git a/CIAO/MPC/config/ciao_race_component.mpb b/CIAO/MPC/config/ciao_race_component.mpb new file mode 100644 index 00000000000..dc78b44764f --- /dev/null +++ b/CIAO/MPC/config/ciao_race_component.mpb @@ -0,0 +1,8 @@ +// $Id$ + +project : ciaocidldefaults { + after += RACE_common_stub + libs += RACE_common_stub CIAO_Deployment_stub + includes += $(CIAO_ROOT)/RACE + idlflags += -I$(CIAO_ROOT)/RACE +} diff --git a/CIAO/MPC/config/ciao_race_default.mpb b/CIAO/MPC/config/ciao_race_default.mpb new file mode 100644 index 00000000000..93b11d6f426 --- /dev/null +++ b/CIAO/MPC/config/ciao_race_default.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciaocidldefaults { + includes += $(CIAO_ROOT)/RACE + idlflags += -I$(CIAO_ROOT)/RACE +} diff --git a/CIAO/MPC/config/ciao_race_monitor.mpb b/CIAO/MPC/config/ciao_race_monitor.mpb new file mode 100644 index 00000000000..d59196c131d --- /dev/null +++ b/CIAO/MPC/config/ciao_race_monitor.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_race_default { + after += Local_Monitor + libs += Local_Monitor +} diff --git a/CIAO/MPC/config/ciao_rtevent_dnc.mpb b/CIAO/MPC/config/ciao_rtevent_dnc.mpb new file mode 100644 index 00000000000..0d370eca8d8 --- /dev/null +++ b/CIAO/MPC/config/ciao_rtevent_dnc.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : rtevent_serv, ciao_events_base_dnc { + includes += $(CIAO_ROOT)/ciaosvcs/Events + idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events + libs += CIAO_RTEvent + after += CIAO_RTEvent +} diff --git a/CIAO/MPC/config/ciao_servant_dnc.mpb b/CIAO/MPC/config/ciao_servant_dnc.mpb new file mode 100644 index 00000000000..6bc5c8d52a0 --- /dev/null +++ b/CIAO/MPC/config/ciao_servant_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming { + after += CIAO_DnC_Server + libs += CIAO_DnC_Server +} diff --git a/CIAO/MPC/config/ciao_server_dnc.mpb b/CIAO/MPC/config/ciao_server_dnc.mpb new file mode 100644 index 00000000000..380c9d22c90 --- /dev/null +++ b/CIAO/MPC/config/ciao_server_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc { + after += CIAO_DnC_Server + libs += CIAO_DnC_Server +} diff --git a/CIAO/MPC/config/ciao_static_dnc_app.mpb b/CIAO/MPC/config/ciao_static_dnc_app.mpb new file mode 100644 index 00000000000..f6792f1f9eb --- /dev/null +++ b/CIAO/MPC/config/ciao_static_dnc_app.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc, iortable, ciao_nodeapplicationmanager, ciao_nodemanager_svnt { +} diff --git a/CIAO/MPC/config/ciao_targetmanager_stub.mpb b/CIAO/MPC/config/ciao_targetmanager_stub.mpb new file mode 100644 index 00000000000..59d2a646212 --- /dev/null +++ b/CIAO/MPC/config/ciao_targetmanager_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_nodemanager_stub { + includes += $(CIAO_ROOT)/DAnCE/TargetManager + libs += TargetManager_stub + after += CIAO_TargetManager_stub +} diff --git a/CIAO/MPC/config/ciao_targetmanager_svnt.mpb b/CIAO/MPC/config/ciao_targetmanager_svnt.mpb new file mode 100644 index 00000000000..6b6ea42cd7e --- /dev/null +++ b/CIAO/MPC/config/ciao_targetmanager_svnt.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_targetmanager_stub { + libs += TargetManager_svnt + after += CIAO_TargetManager_svnt +} diff --git a/CIAO/MPC/config/ciao_xml_utils.mpb b/CIAO/MPC/config/ciao_xml_utils.mpb new file mode 100644 index 00000000000..1167281994f --- /dev/null +++ b/CIAO/MPC/config/ciao_xml_utils.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : xerces, exceptions { + includes += $(CIAO_ROOT)/tools + after += CIAO_XML_Utils + libs += CIAO_XML_Utils +} diff --git a/CIAO/MPC/config/ciaocidldefaults.mpb b/CIAO/MPC/config/ciaocidldefaults.mpb new file mode 100644 index 00000000000..3521ffebf88 --- /dev/null +++ b/CIAO/MPC/config/ciaocidldefaults.mpb @@ -0,0 +1,24 @@ +// -*- MPC -*- +// $Id$ + +project { + // Set the cidl compiler and flags as template values + specific { + cidlc = $(CIAO_ROOT)/bin/cidlc + cidlc_dep = $(CIAO_ROOT)/bin/cidlc + cidlc_flags = -I $(CIAO_ROOT) -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs + } + + Define_Custom(CIDL) { + automatic = 0 + dependent = $(CIDLC_DEP) + command = $(CIDLC) + commandflags = $(CIDLC_FLAGS) + inputext = .cidl + source_outputext = _svnt.cpp + header_outputext = _svnt.h + generic_outputext = E.idl + keyword cidlflags = commandflags + } + +} diff --git a/CIAO/MPC/config/cidlc.mpb b/CIAO/MPC/config/cidlc.mpb new file mode 100644 index 00000000000..38fa6d65e0d --- /dev/null +++ b/CIAO/MPC/config/cidlc.mpb @@ -0,0 +1,15 @@ +// $Id$ + +project: boost_filesystem, boost_regex, exceptions { + requires += cidl + includes += $(CIAO_ROOT) $(CIAO_ROOT)/CCF $(ACE_ROOT)/contrib/utility + libpaths += $(CIAO_ROOT)/CCF/CCF $(ACE_ROOT)/lib + + specific(nmake, vc71, vc8) { + compile_flags += /wd4290 /wd4800 /wd4250 /wd4355 + } + + verbatim(gnuace, top) { + include $(CIAO_ROOT)/CCF/Config.rules + } +} diff --git a/CIAO/MPC/config/dance_extension_stub.mpb b/CIAO/MPC/config/dance_extension_stub.mpb new file mode 100644 index 00000000000..4f5353b87bb --- /dev/null +++ b/CIAO/MPC/config/dance_extension_stub.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/Interfaces +} -- cgit v1.2.1