diff options
| -rw-r--r-- | TAO/CIAO/CIAO_TAO_DAnCE.mwc | 4 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc | 2 | ||||
| -rw-r--r-- | TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc | 8 |
4 files changed, 20 insertions, 5 deletions
diff --git a/TAO/CIAO/CIAO_TAO_DAnCE.mwc b/TAO/CIAO/CIAO_TAO_DAnCE.mwc index 9702d74f799..49984ee19cb 100644 --- a/TAO/CIAO/CIAO_TAO_DAnCE.mwc +++ b/TAO/CIAO/CIAO_TAO_DAnCE.mwc @@ -8,11 +8,15 @@ workspace { ../tao ../TAO_IDL ../orbsvcs/orbsvcs/CosNaming.mpc + ../orbsvcs/orbsvcs/CosNaming_Serv.mpc + ../orbsvcs/orbsvcs/CosNaming_Skel.mpc + ../orbsvcs/Naming_Service ../orbsvcs/orbsvcs/Svc_Utils.mpc ../orbsvcs/orbsvcs/Security.mpc ../orbsvcs/orbsvcs/IFRService.mpc ciao DAnCE + tools/Config_Handlers exclude { DAnCE/tests/Config_Handlers diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 8e69df34632..9527575153e 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Feb 14 22:02:59 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * CIAO_TAO_DAnCE.mwc + + Added naming service and Config_Handlers. + + * DAnCE/NodeManager/NodeManager.mpc + * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc + + Fixed link time warnings on OS X. + Tue Feb 14 19:57:32 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc index ec5eabcca8a..960e6703f2d 100644 --- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc +++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc @@ -23,7 +23,7 @@ project(NodeManager_svnt): ciao_component_dnc, iortable, ifr_client, dance_exten project(NodeManager): ciao_component_dnc, iortable, ifr_client, dance_extension_stub { after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_svnt - libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub + libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/TargetManager exename = NodeManager diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index ca394206fac..d7202e70781 100644 --- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -1,6 +1,6 @@ //$Id$ -project(TSEC_CheckPoint_stub): ciao_client_dnc { +project(TSEC_CheckPoint_stub): ciao_client_dnc, event { after += ENW_stub libpaths += ../interfaces libs += ENW_stub @@ -17,7 +17,7 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc { } } -project(TSEC_CheckPoint_svnt) : ciao_servant_dnc { +project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event { after += TSEC_CheckPoint_stub after += ENW_svnt ENW_stub sharedname = TSEC_CheckPoint_svnt @@ -44,7 +44,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc { } -project(TSEC_CheckPoint_exec) : ciao_component_dnc { +project(TSEC_CheckPoint_exec) : ciao_component_dnc, event { after += TSEC_CheckPoint_svnt after += ENW_svnt ENW_stub @@ -69,7 +69,7 @@ project(TSEC_CheckPoint_exec) : ciao_component_dnc { } -project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype { +project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype, event { exename = controller after += TSEC_CheckPoint_stub libs += TSEC_CheckPoint_stub ENW_stub |