diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-21 18:51:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-21 18:51:53 +0000 |
| commit | 68cb5f2ae935ef43209ca5da0a66565b64bae8ba (patch) | |
| tree | 2cf21bb7a435a6bf45a6ceadc14f120b9b984862 | |
| parent | 2c08522dbaddf43630ef53ac271ce07a2c8f5779 (diff) | |
| download | ATCD-68cb5f2ae935ef43209ca5da0a66565b64bae8ba.tar.gz | |
Tue Oct 21 18:51:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | flat/CIAO/ChangeLog | 29 | ||||
| -rw-r--r-- | flat/CIAO/ccm/CCM.mpc | 4 |
2 files changed, 19 insertions, 14 deletions
diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index a656639702a..29837c4af08 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,21 +1,26 @@ +Tue Oct 21 18:51:20 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ccm/CCM.mpc: + Make sure CIAO_ROOT is added to the include dirs + Fri Oct 10 01:02:20 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/Deployment/DAnCE_Core.mpc: * DAnCE/Deployment/DAnCE_Properties.idl: Codify DAnCE configuration property names in IDL. - + * DAnCE/NodeApplication/NodeApplication_Impl.h: * DAnCE/NodeApplication/NodeApplication_Impl.cpp: * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - Implemented passivation, removal, and destruction logic. + Implemented passivation, removal, and destruction logic. * DAnCE/NodeManager/Node_Manager_Module.h: * DAnCE/NodeManager/Node_Manager_Module.cpp: - Added new command line options. - + Added new command line options. + * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl: * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl: * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc: @@ -25,18 +30,18 @@ Fri Oct 10 01:02:20 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h: * DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h: - Component with no ports to test lifecycle operations. - + Component with no ports to test lifecycle operations. + * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleComponentExplicitHome.cdp: * DAnCE/tests/CIAO/NodeManager-Deployments/SimpleHome.cdp: * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: - Fixes for test passing. - + Fixes for test passing. + * ccm/CCM_Object.idl: - Removed CIAO-specific interfaces. - + Removed CIAO-specific interfaces. + * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: * ciao/ComponentServer/CIAO_Container_Impl.h: * ciao/ComponentServer/CIAO_Container_Impl.cpp: @@ -46,8 +51,8 @@ Fri Oct 10 01:02:20 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * ciao/Containers/Session/Session_Container.cpp: * ciao/Servants/Home_Servant_Impl_Base.cpp: - Fixes for proper component/servant lifecycle management. - + Fixes for proper component/servant lifecycle management. + Tue Oct 7 19:20:38 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/tests/CIAO/NodeManager-Deployments/Components: diff --git a/flat/CIAO/ccm/CCM.mpc b/flat/CIAO/ccm/CCM.mpc index ad36c591e14..9b9acf5aa3a 100644 --- a/flat/CIAO/ccm/CCM.mpc +++ b/flat/CIAO/ccm/CCM.mpc @@ -7,7 +7,7 @@ project(CCM_stub) : taolib_with_idl, tao_output, valuetype, ifr_client { idlflags += -Wb,skel_export_macro=CCM_Stub_Export idlflags += -I$(CIAO_ROOT)/ciao // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/ciao + includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT) dynamicflags = CCM_STUB_BUILD_DLL @@ -91,7 +91,7 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \ idlflags += -Wb,export_macro=CCM_Svnt_Export dynamicflags = CCM_SVNT_BUILD_DLL - + IDL_Files { idlflags += -SS -Sci \ -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ |