diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 15:17:39 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 15:17:39 +0000 |
commit | 7ac121632bfdec981fe1dbb652c04326101eccb7 (patch) | |
tree | 6c087a6ccf73d7767293db7da564f5025fb561a5 | |
parent | 064b6b1fd58984b1a5375151a67aadc5d552cbf0 (diff) | |
download | ATCD-7ac121632bfdec981fe1dbb652c04326101eccb7.tar.gz |
Mon Dec 4 13:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
32 files changed, 40 insertions, 274 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fd8ceda912a..d481b7f50a2 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,41 @@ +Mon Dec 4 13:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/MPC.cfg: + Set includes so that TAO and CIAO base projects could be + under TAO_ROOT and CIAO_ROOT + + * bin/MakeProjectCreator/config/ciao_client_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_component_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_config_handlers.mpb: + * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb: + * bin/MakeProjectCreator/config/ciao_container_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb: + * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb: + * bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_events_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb: + * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb: + * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb: + * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb: + * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb: + * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb: + * bin/MakeProjectCreator/config/ciao_plan_generator.mpb: + * bin/MakeProjectCreator/config/ciao_race_component.mpb: + * bin/MakeProjectCreator/config/ciao_race_default.mpb: + * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: + * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_server_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb: + * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb: + * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb: + * bin/MakeProjectCreator/config/ciao_xml_utils.mpb: + * bin/MakeProjectCreator/config/ciaocidldefaults.mpb: + * bin/MakeProjectCreator/config/cidlc.mpb: + * bin/MakeProjectCreator/config/dance_extension_stub.mpb: + Moved to CIAO_ROOT/MPC/config + Mon Dec 4 13:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_orb_tests.lst: diff --git a/ACE/bin/MakeProjectCreator/config/MPC.cfg b/ACE/bin/MakeProjectCreator/config/MPC.cfg new file mode 100644 index 00000000000..2be64005d7e --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/MPC.cfg @@ -0,0 +1,2 @@ +includes = $TAO_ROOT/MPC/config, $CIAO_ROOT/MPC/config + diff --git a/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb deleted file mode 100644 index 8e12607cf37..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb deleted file mode 100644 index 9cabf46cf83..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver, ciao_server_dnc, ciao_events_dnc { - after += CIAO_DnC_Container - libs += CIAO_DnC_Container -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb deleted file mode 100644 index 69412b873f1..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb +++ /dev/null @@ -1,25 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb deleted file mode 100644 index 4b5e001febb..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb +++ /dev/null @@ -1,13 +0,0 @@ -// $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/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb deleted file mode 100644 index 7875cd5d088..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver, ciao_client_dnc { - after += CIAO_DnC_Container - libs += CIAO_DnC_Container -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb deleted file mode 100644 index 45e0fb77341..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb deleted file mode 100644 index 644feb7f2b6..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb deleted file mode 100644 index 31731a84d5d..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_svnt { - includes += $(CIAO_ROOT)/DomainApplicationManager - libs += DomainApplicationManager - after += DomainApplicationManager -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb deleted file mode 100644 index de2c8d5a7b9..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : orbsvcslib, ciao_container_dnc, ciao_client_dnc { - libs += CIAO_DnC_Events_Base - after += CIAO_DnC_Events_Base -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb deleted file mode 100644 index 15a92b27332..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb deleted file mode 100644 index bea046abd2d..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - includes += $(CIAO_ROOT)/DAnCE/ExecutionManager - libs += ExecutionManager_stub - after += ExecutionManager_stub -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodeapplication.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodeapplication.mpb deleted file mode 100644 index 7c47eb723c6..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_nodeapplication.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub, ciao_noop_configurator { - libs += CIAO_NodeApplication - after += NodeApplicationLib -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb deleted file mode 100644 index e7d313f0617..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_targetmanager_stub, ciao_nodeapplication { - includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager - libs += NodeApplicationManager - after += NodeApplicationManager -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb deleted file mode 100644 index f69e5881091..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb deleted file mode 100644 index b3740720386..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_nodemanager_stub { - libs += NodeManager CIAO_NoOp_Configurator - after += NodeManager_svnt -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_noop_configurator.mpb b/ACE/bin/MakeProjectCreator/config/ciao_noop_configurator.mpb deleted file mode 100644 index 67b3508ee38..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_noop_configurator.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - libs += CIAO_NoOp_Configurator - after += NoOp_Configurator -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb deleted file mode 100644 index e234ead3e67..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_component_dnc { - includes += $(CIAO_ROOT)/DAnCE/Plan_Generator - libs += Plan_Generator - after += Plan_Generator -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb deleted file mode 100644 index dc78b44764f..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// $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/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb deleted file mode 100644 index 93b11d6f426..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciaocidldefaults { - includes += $(CIAO_ROOT)/RACE - idlflags += -I$(CIAO_ROOT)/RACE -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb deleted file mode 100644 index d59196c131d..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_race_default { - after += Local_Monitor - libs += Local_Monitor -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb deleted file mode 100644 index 0d370eca8d8..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb +++ /dev/null @@ -1,9 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb deleted file mode 100644 index 6bc5c8d52a0..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb deleted file mode 100644 index 380c9d22c90..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb b/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb deleted file mode 100644 index f6792f1f9eb..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_component_dnc, iortable, ciao_nodeapplicationmanager, ciao_nodemanager_svnt { -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb deleted file mode 100644 index 59d2a646212..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_nodemanager_stub { - includes += $(CIAO_ROOT)/DAnCE/TargetManager - libs += TargetManager_stub - after += CIAO_TargetManager_stub -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb deleted file mode 100644 index 6b6ea42cd7e..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_targetmanager_stub { - libs += TargetManager_svnt - after += CIAO_TargetManager_svnt -} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb b/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb deleted file mode 100644 index 1167281994f..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb +++ /dev/null @@ -1,8 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : xerces, exceptions { - includes += $(CIAO_ROOT)/tools - after += CIAO_XML_Utils - libs += CIAO_XML_Utils -} diff --git a/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb b/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb deleted file mode 100644 index 3521ffebf88..00000000000 --- a/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb +++ /dev/null @@ -1,24 +0,0 @@ -// -*- 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/ACE/bin/MakeProjectCreator/config/cidlc.mpb b/ACE/bin/MakeProjectCreator/config/cidlc.mpb deleted file mode 100644 index 38fa6d65e0d..00000000000 --- a/ACE/bin/MakeProjectCreator/config/cidlc.mpb +++ /dev/null @@ -1,15 +0,0 @@ -// $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/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb b/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb deleted file mode 100644 index 4f5353b87bb..00000000000 --- a/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_deployment_stub { - includes += $(CIAO_ROOT)/DAnCE/Interfaces -} |