diff options
| author | msmit <msmit@remedy.nl> | 2011-12-09 15:42:34 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-12-09 15:42:34 +0000 |
| commit | 923ca50e049d50800cb6a7a5d88de54f6b254b6d (patch) | |
| tree | b6537c8172fc67471fbcb41f55a33f41dc983d9d | |
| parent | ba0edb3c1491516e8bdfa7518b853ead662804a5 (diff) | |
| download | ATCD-923ca50e049d50800cb6a7a5d88de54f6b254b6d.tar.gz | |
Fri Dec 9 15:41:59 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl:
* connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
* connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc:
Also generate a Single_Service_Common lem.
4 files changed, 48 insertions, 2 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH index 79822f04b89..03729e15c01 100644 --- a/CIAO/ChangeLog.BRANCH +++ b/CIAO/ChangeLog.BRANCH @@ -1,3 +1,10 @@ +Fri Dec 9 15:41:59 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl: + * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc: + * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: + Also generate a Single_Service_Common lem. + Fri Dec 9 14:28:24 UTC 2011 Marcel Smit <msmit@remedy.nl> * tests/Bug_3834_Regression/Moo.mpc: diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl index a1d53ba40d0..23c282e28a2 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl @@ -3,6 +3,8 @@ #ifndef SINGLE_SERVICE_COMMON_IDL_ #define SINGLE_SERVICE_COMMON_IDL_ +#pragma ciao lem "Single_Service_CommonE.idl" + interface Simple_Service { oneway void ping (); diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc index 0e8af15ad3c..bf307c6ecef 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc @@ -6,13 +6,49 @@ project(Single_Service_Common_idl_gen) : taoidldefaults { -Wb,stub_export_include=Single_Service_Common_stub_export.h \ -Wb,skel_export_macro=SINGLE_SERVICE_COMMON_SKEL_Export \ -Wb,skel_export_include=Single_Service_Common_skel_export.h \ - -Gxhst -Gxhsk -Gsv + -Gxhst -Gxhsk -Gsv -Glem IDL_Files { Single_Service_Common.idl } } +project(Single_Service_Common_idl_lem_gen) : ciaoidldefaults { + after += Single_Service_Common_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SINGLE_SERVICE_COMMON_LEM_STUB_Export \ + -Wb,stub_export_include=Single_Service_Common_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + Single_Service_CommonE.idl + } +} + +project(Single_Service_Common_lem_stub) : ccm_svnt { + after += Single_Service_Common_lem_gen \ + Single_Service_Common_stub + libs += Single_Service_Common_stub + + sharedname = Base_lem_stub + dynamicflags += SINGLE_SERVICE_COMMON_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Single_Service_CommonEC.cpp + } + + Header_Files { + Single_Service_CommonEC.h + Single_Service_Common_lem_stub_export.h + } + + Inline_Files { + Single_Service_CommonEC.inl + } +} project(Single_Service_Common_stub) : ccm_stub { after += Single_Service_Common_idl_gen diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc index 8c6c1ca8d39..7c530c9d2eb 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc @@ -17,7 +17,8 @@ project(Large_DDS_Pub_idl_gen) : componentidldefaults, dds4ccm { } project(Large_DDS_Pub_lem_gen) : ciaoidldefaults, dds4ccm { - after += Large_DDS_Pub_idl_gen Large_Connector_idl_gen + after += Large_DDS_Pub_idl_gen Large_Connector_idl_gen \ + Single_Service_Common_lem_stub custom_only = 1 idlflags += -Wb,stub_export_macro=DDS_PUB_LEM_STUB_Export \ -Wb,stub_export_include=DDS_Pub_lem_stub_export.h \ |