diff options
199 files changed, 1700 insertions, 1442 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 5ffb444169a..e00958e7c27 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,393 @@ +Thu Aug 26 09:54:53 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/etc/DAnCE.doxygen: + + * MPC/config/dds4ccm_impl.mpb: + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc: + + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc: + + * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc: + + * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc: + + * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc: + + * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc: + + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: + + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc: + + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc: + + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc: + + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc: + + * connectors/dds4ccm/idl/dds4ccm_skel.mpc: + + * connectors/dds4ccm/impl/DataReader.h: + * connectors/dds4ccm/impl/DataReader.cpp: + * connectors/dds4ccm/impl/DataReader_T.h: + * connectors/dds4ccm/impl/DataReader_T.cpp: + * connectors/dds4ccm/impl/DataWriter.h: + * connectors/dds4ccm/impl/DataWriter_T.h: + * connectors/dds4ccm/impl/dds4ccm_impl.mpc: + + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: + + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc: + + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc: + + * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc: + + * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc: + + * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc: + + * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc: + + * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc: + + * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc: + + * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc: + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: + + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: + + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc: + + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc: + + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc: + + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc: + + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc: + + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc: + + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc: + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: + + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: + + * connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc: + + * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc: + + * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc: + + * connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc: + + * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc: + + * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc: + + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc: + + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc: + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: + + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: + + * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc: + + * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc: + + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc: + + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc: + + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc: + + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc: + + * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc: + + * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc: + + * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc: + + * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc: + + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc: + + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc: + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc: + + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc: + + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: + + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc: + + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc: + + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc: + + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc: + + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc: + + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc: + + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc: + + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc: + + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc: + + * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc: + + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc: + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc: + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc: + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc: + + * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: + + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc: + + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc: + + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc: + + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc: + + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: + + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: + + * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc: + + * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc: + + * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc: + + * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc: + + * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc: + + * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc: + + * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc: + + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc: + + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc: + + * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc: + + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc: + + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc: + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc: + + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc: + + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc: + + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc: + + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc: + + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc: + + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc: + + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc: + + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc: + + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc: + + * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc: + + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc: + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc: + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc: + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc: + + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc: + + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc: + + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc: + + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: + + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc: + + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc: + + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc: + + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: + + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc: + + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc: + + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc: + + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc: + + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc: + + * connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc: + + * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc: + + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc: + + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc: + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: + Thu Aug 26 09:01:31 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: diff --git a/CIAO/DAnCE/etc/DAnCE.doxygen b/CIAO/DAnCE/etc/DAnCE.doxygen index 99fe7883513..b6fad679ba8 100644 --- a/CIAO/DAnCE/etc/DAnCE.doxygen +++ b/CIAO/DAnCE/etc/DAnCE.doxygen @@ -132,18 +132,18 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../../../ace \ - html/tao/TAO.tag=../.. \ - html/ace/ssl/ACE_SSL.tag=../../../ace/ssl \ - html/tao/portableserver/TAO_PortableServer.tag=../../portableserver \ - html/tao/iortable/TAO_IORTable.tag=../../iortable \ - html/tao/rtcorba/TAO_RTCORBA.tag=../../rtcorba \ - html/tao/security/TAO_Security.tag=../../security \ - html/acexml/ACEXML.tag=../../../acexml \ - html/tao/rtportableserver/TAO_RTPortableServer.tag=../../rtportableserver \ - html/tao/cosnaming/TAO_CosNaming.tag=../../cosnaming \ - html/tao/ifr/TAO_IFR.tag=../../ifr \ - html/ace/inet/ACE_INet.tag=../../../protocols/INet +TAGFILES = html/ace/ACE.tag=../ace \ + html/tao/TAO.tag=../tao \ + html/ace/ssl/ACE_SSL.tag=../ace/ssl \ + html/tao/portableserver/TAO_PortableServer.tag=../tao/portableserver \ + html/tao/iortable/TAO_IORTable.tag=../tao/iortable \ + html/tao/rtcorba/TAO_RTCORBA.tag=../tao/rtcorba \ + html/tao/security/TAO_Security.tag=../tao/security \ + html/acexml/ACEXML.tag=../acexml \ + html/tao/rtportableserver/TAO_RTPortableServer.tag=../tao/rtportableserver \ + html/tao/cosnaming/TAO_CosNaming.tag=../tao/cosnaming \ + html/tao/ifr/TAO_IFR.tag=../tao/ifr \ + html/ace/inet/ACE_INet.tag=../protocols/INet GENERATE_TAGFILE = html/dance/DAnCE.tag ALLEXTERNALS = NO PERL_PATH = /usr/bin/perl diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb index 94b3bef39cc..5585f0fe721 100644 --- a/CIAO/MPC/config/dds4ccm_impl.mpb +++ b/CIAO/MPC/config/dds4ccm_impl.mpb @@ -1,17 +1,17 @@ // -*- MPC -*- // $Id$ -feature(dds4ccm_opendds) : dds4ccm_skel, ciao_logger, dcps { +feature(dds4ccm_opendds) : dds4ccm_skel, dds4ccm_lem_stub, ciao_logger, dcps { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl } -feature(dds4ccm_splice) : dds4ccm_skel, ciao_logger { +feature(dds4ccm_splice) : dds4ccm_skel, dds4ccm_lem_stub, ciao_logger { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl } -feature(dds4ccm_ndds) : dds4ccm_skel, ciao_logger, nddslib { +feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_lem_stub, ciao_logger, nddslib { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl } diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc index 0e341c274d9..ff8767c0197 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc @@ -31,14 +31,12 @@ project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += DDS_Hello_Connector_lem_gen \ DDS_Hello_Connector_stub \ - DDS_Hello_Base_stub \ - DDS4CCM_lem_stub + DDS_Hello_Base_stub libs += DDS_Hello_Base_stub \ - DDS_Hello_Connector_stub \ - DDS4CCM_lem_stub + DDS_Hello_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -91,13 +89,11 @@ project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base { project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl { after += DDS_Hello_Connector_lem_stub \ DDS_Hello_Connector_stub \ - DDS4CCM_lem_stub \ DDS_Hello_Base_stub sharedname = DDS_Hello_Connector_exec libs += DDS_Hello_Connector_stub \ DDS_Hello_Connector_lem_stub \ - DDS_Hello_Base_stub \ - DDS4CCM_lem_stub + DDS_Hello_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -121,17 +117,14 @@ project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl { - avoids += ace_for_tao after += DDS_Hello_Connector_lem_stub \ DDS_Hello_Connector_exec \ - DDS_Hello_Connector_stub \ - DDS4CCM_lem_stub + DDS_Hello_Connector_stub sharedname = DDS_Hello_Connector_svnt libs += DDS_Hello_Connector_stub \ DDS_Hello_Connector_lem_stub \ DDS_Hello_Base_stub \ - DDS_Hello_Connector_exec \ - DDS4CCM_lem_stub + DDS_Hello_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc index 83ca3ac513f..344faaad8fc 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc @@ -85,11 +85,11 @@ project(DDS_Hello_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { avoids += ace_for_tao - after += DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub + after += DDS_Hello_Receiver_lem_stub DDS_Hello_Receiver_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -112,11 +112,11 @@ project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { avoids += ace_for_tao - after += DDS_Hello_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Receiver_exec DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + after += DDS_Hello_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Receiver_exec DDS_Hello_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt Receiver_exec DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt Receiver_exec DDS_Hello_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc index aa348d1bf84..71cca140c3b 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc @@ -86,11 +86,10 @@ project(DDS_Hello_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_base { - avoids += ace_for_tao - after += DDS_Hello_Sender_lem_stub DDS_Hello_Sender_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub DDS4CCM_lem_stub +project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Hello_Sender_lem_stub DDS_Hello_Sender_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -113,12 +112,12 @@ project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { avoids += ace_for_tao - after += DDS_Hello_Base_stub DDS_Hello_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub + after += DDS_Hello_Base_stub DDS_Hello_Sender_lem_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_Hello_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub + DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc index 2af6a80f134..5e7c554a3e3 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc @@ -31,9 +31,9 @@ project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base { } } -project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += Large_Connector_lem_gen Large_Connector_stub Large_Deployment_stub - libs += Large_Connector_stub Large_Deployment_stub DDS4CCM_lem_stub + libs += Large_Connector_stub Large_Deployment_stub libpaths += ../lib libout = ../lib includes += .. @@ -83,10 +83,10 @@ project(Large_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(Large_Connector_exec) : ciao_executor, dds4ccm_impl { +project(Large_Connector_exec) : ciao_executor, dds4ccm_impl { after += Large_Connector_lem_stub Large_Connector_stub sharedname = Large_Connector_exec - libs += Large_Connector_stub Large_Connector_lem_stub DDS4CCM_lem_stub Large_Deployment_stub + libs += Large_Connector_stub Large_Connector_lem_stub Large_Deployment_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,9 +110,9 @@ project(Large_Connector_exec) : ciao_executor, dds4ccm_impl { project(Large_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += Large_Connector_lem_stub DDS4CCM_lem_stub Large_Connector_exec Large_Connector_stub + after += Large_Connector_lem_stub Large_Connector_exec Large_Connector_stub sharedname = Large_Connector_svnt - libs += Large_Connector_stub Large_Connector_lem_stub DDS4CCM_lem_stub Large_Connector_exec Large_Deployment_stub + libs += Large_Connector_stub Large_Connector_lem_stub Large_Connector_exec Large_Deployment_stub libpaths += ../lib libout = ../lib includes += .. 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 6ca0ecbe9c6..d40435dd38f 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 @@ -80,10 +80,10 @@ project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base { } } -project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_base { - after += Large_DDS_Pub_lem_stub Large_DDS_Pub_stub Large_Connector_stub DDS4CCM_lem_stub Large_Connector_lem_stub +project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_lem_stub { + after += Large_DDS_Pub_lem_stub Large_DDS_Pub_stub Large_Connector_stub Large_Connector_lem_stub sharedname = DDS_Pub_exec - libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub DDS4CCM_lem_stub Large_Connector_lem_stub + libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub Large_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc index 73376f521d7..efa62b6549d 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc @@ -80,10 +80,10 @@ project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base { } } -project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_base { - after += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub DDS4CCM_lem_stub Large_Connector_lem_stub +project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_lem_stub { + after += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub Large_Connector_lem_stub sharedname = DDS_Sub_exec - libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub DDS4CCM_lem_stub Large_Connector_lem_stub + libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub Large_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc index 8f8fddbd013..b6ace1bb6f4 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc @@ -82,10 +82,10 @@ project(DDS_Broker_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Broker_exec) : ciao_executor, dds4ccm_base { - after += DDS_Broker_lem_stub DDS_Broker_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_Broker_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Broker_lem_stub DDS_Broker_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub sharedname = Broker_exec - libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub + libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -108,10 +108,10 @@ project(DDS_Broker_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Broker_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Broker_exec DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Broker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Broker_exec DDS_Quoter_Connector_lem_stub sharedname = Broker_svnt - libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt Broker_exec DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt Broker_exec DDS_Quoter_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc index 32bf6e7081c..a4f9b2ae675 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Quoter_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Quoter_Connector_lem_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub DDS4CCM_lem_stub - libs += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub +project(DDS_Quoter_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_Quoter_Connector_lem_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub + libs += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub + after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub sharedname = DDS_Quoter_Connector_exec - libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub DDS4CCM_lem_stub + libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_exec DDS_Quoter_Connector_stub DDS4CCM_lem_stub + after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_exec DDS_Quoter_Connector_stub sharedname = DDS_Quoter_Connector_svnt libs += DDS_Quoter_Connector_stub \ DDS_Quoter_Connector_lem_stub \ DDS_Quoter_Base_stub \ - DDS_Quoter_Connector_exec \ - DDS4CCM_lem_stub + DDS_Quoter_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc index cdd7dd1bdd6..b7ff4f4a57a 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc @@ -83,10 +83,10 @@ project(DDS_Distributor_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Distributor_exec) : ciao_executor, dds4ccm_base { - after += DDS_Distributor_lem_stub DDS_Distributor_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub +project(DDS_Distributor_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Distributor_lem_stub DDS_Distributor_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub sharedname = Distributor_exec - libs += Distributor_stub Distributor_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub + libs += Distributor_stub Distributor_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_Distributor_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Quoter_Base_stub DDS_Distributor_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub +project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Quoter_Base_stub DDS_Distributor_lem_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub sharedname = Distributor_svnt libs += Distributor_stub Distributor_lem_stub \ - DDS_Quoter_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub + DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Quoter_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc index 94bf8035a53..4efb3d76089 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Shapes_Connector_lem_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub DDS4CCM_lem_stub - libs += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS4CCM_lem_stub +project(DDS_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_Shapes_Connector_lem_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub + libs += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Shapes_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub DDS4CCM_lem_stub + after += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub sharedname = DDS_Shapes_Connector_exec - libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub DDS4CCM_lem_stub + libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Shapes_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_exec DDS_Shapes_Connector_stub DDS4CCM_lem_stub + after += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_exec DDS_Shapes_Connector_stub sharedname = DDS_Shapes_Connector_svnt libs += DDS_Shapes_Connector_stub \ DDS_Shapes_Connector_lem_stub \ DDS_Shapes_Base_stub \ - DDS_Shapes_Connector_exec \ - DDS4CCM_lem_stub + DDS_Shapes_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc index b51f14d7761..426e7b34e5f 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc @@ -82,10 +82,10 @@ project(DDS_Shapes_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -108,10 +108,10 @@ project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc index 3ad49652542..4623d3ddb8d 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc @@ -109,11 +109,11 @@ project(DDS_Shapes_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Shapes_Base_stub DDS_Shapes_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub +project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Shapes_Base_stub DDS_Shapes_Sender_lem_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_Shapes_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub + DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index 82c33e5c4de..6f3c29a7991 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -1,8 +1,6 @@ // $Id$ -project (DDS4CCM_skel) : install, dds4ccm, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { - after += DDS4CCM_lem_stub - libs += DDS4CCM_lem_stub DDS4CCM_stub +project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { includes += $(CIAO_ROOT)/connectors dynamicflags += DDS4CCM_SKEL_BUILD_DLL diff --git a/CIAO/connectors/dds4ccm/impl/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/DataReader.cpp new file mode 100644 index 00000000000..3362c8822e5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/DataReader.cpp @@ -0,0 +1,13 @@ +// $Id$ + +#include "DataReader.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DataReader_Base::~CCM_DDS_DataReader_Base (void) + { + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/DataReader.h b/CIAO/connectors/dds4ccm/impl/DataReader.h new file mode 100644 index 00000000000..70e19f8be22 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/DataReader.h @@ -0,0 +1,40 @@ +/** + * @author Johnny Willemsen <jwillemsen@remedy.nl> + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAREADER_H +#define DDS4CCM_DATAREADER_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/impl/dds4ccm_dds_impl_export.h" +#include "dds4ccm/impl/dds4ccm_conf.h" + +#include "tao/LocalObject.h" + +#if (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_DDS_IMPL_Export CCM_DDS_DataReader_Base + : public virtual ::DDS::CCM_DataReader, + public virtual ::CORBA::LocalObject + { + public: + virtual ~CCM_DDS_DataReader_Base (void); + + virtual DDSDataReader * get_impl_base (void) = 0; + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp index 6676bc9e4aa..a6c07078f27 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp @@ -811,3 +811,10 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_impl ( throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } } + +template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE> +DDSDataReader * +CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_impl_base (void) +{ + return this->impl_; +}
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/impl/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/DataReader_T.h index 1277958055f..e0dabf683ca 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReader_T.h +++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.h @@ -13,6 +13,7 @@ #include "dds4ccm/impl/dds4ccm_conf.h" #include "dds4ccm/impl/Utils.h" +#include "dds4ccm/impl/DataReader.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" #include "dds4ccm/impl/ndds/InstanceHandle_t.h" @@ -38,9 +39,7 @@ namespace CIAO class CCM_DDS_DataReaderListener_T; template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE> - class DataReader_T - : public virtual ::DDS::CCM_DataReader, - public virtual ::CORBA::LocalObject + class DataReader_T : public virtual CCM_DDS_DataReader_Base { typedef ::CIAO::DDS4CCM::CCM_DDS_DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE> DataReaderListener_type; @@ -192,6 +191,8 @@ namespace CIAO ::DDS::StatusMask get_mask (void); + virtual DDSDataReader * get_impl_base (void); + private: typename DDS_TYPE::data_reader * impl_; diff --git a/CIAO/connectors/dds4ccm/impl/DataWriter.h b/CIAO/connectors/dds4ccm/impl/DataWriter.h index 34f79af3a2e..c352ed1206b 100644 --- a/CIAO/connectors/dds4ccm/impl/DataWriter.h +++ b/CIAO/connectors/dds4ccm/impl/DataWriter.h @@ -1,5 +1,4 @@ /** - * @author William R. Otte <wotte@dre.vanderbilt.edu> * @author Johnny Willemsen <jwillemsen@remedy.nl> * * $Id$ diff --git a/CIAO/connectors/dds4ccm/impl/DataWriter_T.h b/CIAO/connectors/dds4ccm/impl/DataWriter_T.h index c825212abae..b42147234b0 100644 --- a/CIAO/connectors/dds4ccm/impl/DataWriter_T.h +++ b/CIAO/connectors/dds4ccm/impl/DataWriter_T.h @@ -1,5 +1,4 @@ /** - * @author William R. Otte <wotte@dre.vanderbilt.edu> * @author Johnny Willemsen <jwillemsen@remedy.nl> * * $Id$ diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc index bdfb350e0a4..72b57aa965f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc @@ -1,9 +1,6 @@ // $Id$ -project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger { - - after += DDS4CCM_lem_stub - libs += DDS4CCM_lem_stub +project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, ciao_output, ccm_stub, ciao_logger { dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL macros += BUILDING_DDS_LIB @@ -17,6 +14,7 @@ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, taolib, ciao_output, ccm } Source_Files { + DataReader.cpp DataWriter.cpp Coherent_Changes_Guard.cpp DomainParticipantListener.cpp diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc index 197dc2e0594..4face6ad097 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub + libs += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub sharedname = DDS_Perf_Keyed_Test_Connector_exec - libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub + libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,14 +110,13 @@ project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel { - after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { + after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub sharedname = DDS_Perf_Keyed_Test_Connector_svnt libs += DDS_Perf_Keyed_Test_Connector_stub \ DDS_PK_Test_Connector_lem_stub \ DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_Perf_Keyed_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc index f67d1649582..b316341ff0f 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_Perf_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Receiver_stub \ DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub \ - DDS_PK_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_PK_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { after += DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \ DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ - DDS_Perf_Keyed_Test_Receiver_exec DDS_PK_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_Perf_Keyed_Test_Receiver_exec DDS_PK_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \ DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ - Receiver_exec DDS_PK_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_PK_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc index e399d673656..251c49f6cbe 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Perf_Keyed_Test_Sender_lem_stub DDS_Perf_Keyed_Test_Sender_stub \ - DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub \ - DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_skel { after += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Perf_Keyed_Test_Connector_stub \ + DDS_Perf_Keyed_Test_Connector_stub \ DDS_Perf_Keyed_Test_Connector_svnt DDS_PK_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_Perf_Keyed_Test_Base_stub \ + DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \ DDS_PK_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc index a4be2234500..a46e6d90fbe 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_LatencyTT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_LTT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LatencyTT_Test_Connector_lem_gen DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_LTT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_LatencyTT_Test_Connector_lem_gen DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub + libs += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,10 +84,10 @@ project(DDS_LatencyTT_Test_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub sharedname = DDS_LatencyTT_Test_Connector_exec - libs += DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Base_stub DDS4CCM_lem_stub + libs += DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,14 +110,13 @@ project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel { - after += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_exec DDS_LatencyTT_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { + after += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_exec DDS_LatencyTT_Test_Connector_stub sharedname = DDS_LatencyTT_Test_Connector_svnt libs += DDS_LatencyTT_Test_Connector_stub \ DDS_LTT_Test_Connector_lem_stub \ DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_LatencyTT_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc index 2f4b8445c7f..d98b6ce2ffd 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_LatencyTT_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LatencyTT_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_LatencyTT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LatencyTT_Test_Receiver_lem_stub DDS_LatencyTT_Test_Receiver_stub \ DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub \ - DDS_LTT_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_LTT_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,17 +113,16 @@ project(DDS_LatencyTT_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LatencyTT_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LatencyTT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LatencyTT_Test_Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \ DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ - DDS_LatencyTT_Test_Receiver_exec DDS_LTT_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_LatencyTT_Test_Receiver_exec DDS_LTT_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_LatencyTT_Test_Base_stub \ DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ - DDS_LatencyTT_Test_Connector_stub \ - Receiver_exec DDS_LTT_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + DDS_LatencyTT_Test_Connector_stub \ + Receiver_exec DDS_LTT_Test_Connector_lem_stub + libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc index fa55f3477e7..cc899b116c8 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_LatencyTT_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LatencyTT_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_LatencyTT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LatencyTT_Test_Sender_lem_stub DDS_LatencyTT_Test_Sender_stub \ - DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub \ - DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -114,13 +112,13 @@ project(DDS_LatencyTT_Test_Sender_exec) : ciao_executor, dds4ccm_base { } } -project(DDS_LatencyTT_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LatencyTT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_LatencyTT_Test_Connector_stub \ + DDS_LatencyTT_Test_Connector_stub \ DDS_LatencyTT_Test_Connector_svnt DDS_LTT_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_LatencyTT_Test_Base_stub \ + DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Connector_svnt \ DDS_LTT_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc index 4fb9e6d31b2..1008c4a36a2 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc @@ -33,8 +33,8 @@ project(DDS_Throughput_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } project(DDS_TP_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Throughput_Connector_lem_gen DDS_Throughput_Connector_stub DDS_Throughput_Base_stub DDS4CCM_lem_stub - libs += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub DDS4CCM_lem_stub + after += DDS_Throughput_Connector_lem_gen DDS_Throughput_Connector_stub DDS_Throughput_Base_stub + libs += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,10 +84,10 @@ project(DDS_Throughput_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub DDS4CCM_lem_stub +project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub sharedname = DDS_Throughput_Connector_exec - libs += DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub DDS_Throughput_Base_stub DDS4CCM_lem_stub + libs += DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub DDS_Throughput_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,14 +110,13 @@ project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel { - after += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_exec DDS_Throughput_Connector_stub DDS4CCM_lem_stub +project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { + after += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_exec DDS_Throughput_Connector_stub sharedname = DDS_Throughput_Connector_svnt libs += DDS_Throughput_Connector_stub \ DDS_TP_Test_Connector_lem_stub \ DDS_Throughput_Base_stub \ - DDS_Throughput_Connector_exec \ - DDS4CCM_lem_stub + DDS_Throughput_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc index 3ede1356e18..f9a93a52313 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc @@ -84,15 +84,14 @@ project(DDS_Throughput_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Throughput_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_Throughput_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Throughput_Receiver_lem_stub DDS_Throughput_Receiver_stub \ DDS_Throughput_Base_stub DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ - DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub DDS4CCM_lem_stub + DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_Throughput_Base_stub \ DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub \ - DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -115,18 +114,17 @@ project(DDS_Throughput_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Throughput_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Throughput_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_Throughput_Receiver_lem_stub DDS_Throughput_Base_stub \ DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ - DDS_Throughput_Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_Throughput_Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_Throughput_Base_stub \ DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ - Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub + libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc index 6bb33fc8eed..4cdd712fee1 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_TP_Sec_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_TP_Sec_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_TP_Sec_Connector_lem_gen DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub DDS4CCM_lem_stub - libs += DDS_Throughput_Base_stub DDS_Throughput_Sec_Connector_stub DDS4CCM_lem_stub +project(DDS_TP_Sec_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_TP_Sec_Connector_lem_gen DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub + libs += DDS_Throughput_Base_stub DDS_Throughput_Sec_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,10 +84,10 @@ project(DDS_Throughput_Sec_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub DDS4CCM_lem_stub +project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub sharedname = DDS_Throughput_Sec_Connector_exec - libs += DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Base_stub DDS4CCM_lem_stub + libs += DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -109,14 +109,13 @@ project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl { } } -project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel { - after += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_exec DDS_Throughput_Sec_Connector_stub DDS4CCM_lem_stub +project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub { + after += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_exec DDS_Throughput_Sec_Connector_stub sharedname = DDS_Throughput_Sec_Connector_svnt libs += DDS_Throughput_Sec_Connector_stub \ DDS_TP_Sec_Connector_lem_stub \ DDS_Throughput_Base_stub \ - DDS_Throughput_Sec_Connector_exec \ - DDS4CCM_lem_stub + DDS_Throughput_Sec_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc index 93ecd8e3499..1fef847f9bb 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc @@ -85,16 +85,14 @@ project(DDS_Throughput_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Throughput_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_Throughput_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Throughput_Sender_lem_stub DDS_Throughput_Sender_stub \ DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub \ - DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub \ - DDS4CCM_lem_stub + DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub \ DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub \ - DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub \ - DDS4CCM_lem_stub + DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -116,15 +114,15 @@ project(DDS_Throughput_Sender_exec) : ciao_executor, dds4ccm_base { } } -project(DDS_Throughput_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Throughput_Sender_svnt) : ciao_servant, dds4ccm_skel { after += DDS_Throughput_Base_stub DDS_Throughput_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ + DDS_Throughput_Connector_stub DDS_Throughput_Sec_Connector_stub \ DDS_Throughput_Connector_svnt DDS_TP_Test_Connector_lem_stub \ DDS_Throughput_Sec_Connector_svnt DDS_TP_Sec_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ - DDS4CCM_skel DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_Throughput_Base_stub \ + DDS_Throughput_Connector_stub DDS_Throughput_Connector_svnt \ + DDS_Throughput_Sec_Connector_stub DDS_Throughput_Sec_Connector_svnt \ DDS_TP_Test_Connector_lem_stub DDS_TP_Sec_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc index 8460eaa3b80..13a1c2e7b29 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub - libs += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub + libs += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub sharedname = DDS_CSL_DeadlineTest_Connector_exec - libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub + libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub sharedname = DDS_CSL_DeadlineTest_Connector_svnt libs += DDS_CSL_DeadlineTest_Connector_stub \ DDS_CSL_DT_Connector_lem_stub \ DDS_CSL_DeadlineTest_Base_stub \ - DDS_CSL_DeadlineTest_Connector_exec \ - DDS4CCM_lem_stub + DDS_CSL_DeadlineTest_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc index e5f28ff3631..43e0bd1b29a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_CSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc index b1ce2325867..176b73314cf 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_CSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub +project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub + DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc index c0787c38cea..52d15882ec0 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_CSL_QoSTest_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub DDS4CCM_lem_stub - libs += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_QoSTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub + libs += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_CSL_QoSTest_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub sharedname = DDS_CSL_QoSTest_Connector_exec - libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub DDS4CCM_lem_stub + libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub sharedname = DDS_CSL_QoSTest_Connector_svnt libs += DDS_CSL_QoSTest_Connector_stub \ DDS_CSL_QoSTest_Connector_lem_stub \ DDS_CSL_QoSTest_Base_stub \ - DDS_CSL_QoSTest_Connector_exec \ - DDS4CCM_lem_stub + DDS_CSL_QoSTest_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc index f010e21df19..521151482df 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_CSL_QoSTest_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Receiver_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Receiver_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc index a712ae733a1..8ac06eb8ae8 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_CSL_QoSTest_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub +project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_CSL_QoSTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub + DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc index 799ddef395e..413abfab643 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_CSL_SRTest_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub DDS4CCM_lem_stub - libs += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_SRTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub + libs += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_CSL_SRTest_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub sharedname = DDS_CSL_SRTest_Connector_exec - libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub DDS4CCM_lem_stub + libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub sharedname = DDS_CSL_SRTest_Connector_svnt libs += DDS_CSL_SRTest_Connector_stub \ DDS_CSL_SRTest_Connector_lem_stub \ DDS_CSL_SRTest_Base_stub \ - DDS_CSL_SRTest_Connector_exec \ - DDS4CCM_lem_stub + DDS_CSL_SRTest_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc index 2bd299851f7..95563a5ee78 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_CSL_SRTest_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Receiver_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Receiver_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc index 1de9ed84325..54cbec4e435 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_CSL_SRTest_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub +project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_CSL_SRTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub + DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc index 846598d377e..00a27ecb267 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub DDS4CCM_lem_stub - libs += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub + libs += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub sharedname = DDS_CSL_USTest_Connector_exec - libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub DDS4CCM_lem_stub + libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub + after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub sharedname = DDS_CSL_USTest_Connector_svnt libs += DDS_CSL_USTest_Connector_stub \ DDS_CSL_USTest_Connector_lem_stub \ DDS_CSL_USTest_Base_stub \ - DDS_CSL_USTest_Connector_exec \ - DDS4CCM_lem_stub + DDS_CSL_USTest_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc index 054755cc301..778caaf061e 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_CSL_USTest_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Receiver_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Receiver_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc index c47468b06f1..c5ba78c4f26 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_CSL_USTest_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub +project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub +project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_CSL_USTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub + DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc index 40aff6a2ff8..44a4935d9d4 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc @@ -81,12 +81,10 @@ project(DDS_Coh_Update_ReaderStarter_stub) : ccm_stub, dds4ccm_base { } -project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += Reader_Starter_stub Reader_Starter_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc index 9a411528d2c..ce67e3a7934 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc @@ -32,9 +32,9 @@ project(CoherentUpdate_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(CoherentUpdate_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentUpdate_Connector_lem_gen CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub DDS4CCM_lem_stub - libs += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub DDS4CCM_lem_stub +project(CoherentUpdate_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += CoherentUpdate_Connector_lem_gen CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub + libs += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -86,10 +86,10 @@ project(CoherentUpdate_Connector_stub) : ccm_stub, dds4ccm_base { project(CoherentUpdate_Connector_exec) : ciao_executor, dds4ccm_impl { after += CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \ - DDS4CCM_lem_stub CoherentUpdate_Test_Base_stub + CoherentUpdate_Test_Base_stub sharedname = CoherentUpdate_Connector_exec libs += CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \ - CoherentUpdate_Test_Base_stub DDS4CCM_lem_stub CoherentUpdate_Test_Base_stub + CoherentUpdate_Test_Base_stub CoherentUpdate_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -113,14 +113,14 @@ project(CoherentUpdate_Connector_exec) : ciao_executor, dds4ccm_impl { project(CoherentUpdate_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_exec \ - CoherentUpdate_Connector_stub DDS4CCM_lem_stub + after += CoherentUpdate_Connector_lem_stub \ + CoherentUpdate_Connector_exec \ + CoherentUpdate_Connector_stub sharedname = CoherentUpdate_Connector_svnt libs += CoherentUpdate_Connector_stub \ CoherentUpdate_Connector_lem_stub \ CoherentUpdate_Test_Base_stub \ - CoherentUpdate_Connector_exec \ - DDS4CCM_lem_stub + CoherentUpdate_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc index 692b1970bbe..d8da91edaa4 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(CoherentUpdate_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(CoherentUpdate_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(CoherentUpdate_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Receiver_stub \ CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \ - CoherentUpdate_Connector_lem_stub DDS4CCM_lem_stub \ + CoherentUpdate_Connector_lem_stub \ DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \ CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \ - DDS4CCM_lem_stub Reader_Starter_lem_stub Reader_Starter_stub + Reader_Starter_lem_stub Reader_Starter_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(CoherentUpdate_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Base_stub \ CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ CoherentUpdate_Test_Receiver_exec CoherentUpdate_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Coh_Update_ReaderStarter_stub \ + DDS_Coh_Update_ReaderStarter_stub \ DDS_Coh_Update_ReaderStarter_svnt DDS_Coh_Update_ReaderStarter_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \ CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ - Receiver_exec CoherentUpdate_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Reader_Starter_stub Reader_Starter_svnt \ + Receiver_exec CoherentUpdate_Connector_lem_stub \ + Reader_Starter_stub Reader_Starter_svnt \ Reader_Starter_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc index 0d4948b4414..9f7ed0fc325 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc @@ -87,14 +87,14 @@ project(CoherentUpdate_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(CoherentUpdate_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(CoherentUpdate_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += CoherentUpdate_Test_Sender_lem_stub CoherentUpdate_Test_Sender_stub \ CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \ - DDS4CCM_lem_stub DDS_Coh_Update_ReaderStarter_lem_stub + DDS_Coh_Update_ReaderStarter_lem_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \ CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \ - Reader_Starter_stub DDS4CCM_lem_stub Reader_Starter_lem_stub \ + Reader_Starter_stub Reader_Starter_lem_stub \ Reader_Starter_lem_stub libpaths += ../lib includes += .. @@ -118,15 +118,15 @@ project(CoherentUpdate_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CoherentUpdate_Test_Base_stub CoherentUpdate_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel CoherentUpdate_Connector_stub \ + CoherentUpdate_Connector_stub \ CoherentUpdate_Connector_svnt CoherentUpdate_Connector_lem_stub \ DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_svnt \ DDS_Coh_Update_ReaderStarter_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ + libs += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \ + CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \ CoherentUpdate_Connector_lem_stub Reader_Starter_stub \ Reader_Starter_svnt Reader_Starter_lem_stub libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc index 2687b4009fc..04bb3398d3f 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc @@ -81,12 +81,10 @@ project(DDS_Coherent_Reader_Starter_stub) : ccm_stub, dds4ccm_base { } -project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += Reader_Starter_stub Reader_Starter_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc index 7e4e4bb5ce5..6b1ca64bc64 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc @@ -32,9 +32,9 @@ project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub DDS4CCM_lem_stub - libs += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub DDS4CCM_lem_stub +project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub + libs += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(CoherentWrite_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub DDS4CCM_lem_stub CoherentWrite_Test_Base_stub + after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub sharedname = CoherentWrite_Test_Connector_exec - libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Base_stub DDS4CCM_lem_stub CoherentWrite_Test_Base_stub + libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Base_stub CoherentWrite_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub DDS4CCM_lem_stub + after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub sharedname = CoherentWrite_Test_Connector_svnt libs += CoherentWrite_Test_Connector_stub \ CoherentWrite_Test_Connector_lem_stub \ CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_exec \ - DDS4CCM_lem_stub + CoherentWrite_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc index 8d4f85f898d..e9be5b84283 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(CoherentWrite_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Receiver_stub \ CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_lem_stub DDS4CCM_lem_stub \ + CoherentWrite_Test_Connector_lem_stub \ DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \ CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub \ - DDS4CCM_lem_stub Reader_Starter_lem_stub Reader_Starter_stub + Reader_Starter_lem_stub Reader_Starter_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Base_stub \ CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ CoherentWrite_Test_Receiver_exec CoherentWrite_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Coherent_Reader_Starter_stub \ + DDS_Coherent_Reader_Starter_stub \ DDS_Coherent_Reader_Starter_svnt DDS_Coherent_Reader_Starter_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \ CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - Receiver_exec CoherentWrite_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Reader_Starter_stub Reader_Starter_svnt \ + Receiver_exec CoherentWrite_Test_Connector_lem_stub \ + Reader_Starter_stub Reader_Starter_svnt \ Reader_Starter_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc index a81c32d89c7..63da6227b89 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc @@ -87,14 +87,14 @@ project(CoherentWrite_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += CoherentWrite_Test_Sender_lem_stub CoherentWrite_Test_Sender_stub \ CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \ - DDS4CCM_lem_stub DDS_Coherent_Reader_Starter_lem_stub + DDS_Coherent_Reader_Starter_lem_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \ CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \ - Reader_Starter_stub DDS4CCM_lem_stub Reader_Starter_lem_stub \ + Reader_Starter_stub Reader_Starter_lem_stub \ Reader_Starter_lem_stub libpaths += ../lib includes += .. @@ -118,15 +118,15 @@ project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CoherentWrite_Test_Base_stub CoherentWrite_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel CoherentWrite_Test_Connector_stub \ + CoherentWrite_Test_Connector_stub \ CoherentWrite_Test_Connector_svnt CoherentWrite_Test_Connector_lem_stub \ DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_svnt \ DDS_Coherent_Reader_Starter_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \ + CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ CoherentWrite_Test_Connector_lem_stub Reader_Starter_stub \ Reader_Starter_svnt Reader_Starter_lem_stub libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc index db43169f7a1..af67ff71ab6 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc @@ -84,14 +84,13 @@ project(CFT_Test_Component_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_Test_Component_exec) : ciao_executor, dds4ccm_base { +project(CFT_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += CFT_Test_Component_lem_stub CFT_Test_Component_stub \ CFT_Test_Base_stub CFT_Test_Connector_stub \ - CFT_Test_Connector_lem_stub DDS4CCM_lem_stub + CFT_Test_Connector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub CFT_Test_Base_stub \ - CFT_Test_Connector_stub CFT_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + CFT_Test_Connector_stub CFT_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(CFT_Test_Component_exec) : ciao_executor, dds4ccm_base { } -project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_base { +project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_base, dds4ccm_lem_stub, dds4ccm_skel { after += CFT_Test_Component_lem_stub CFT_Test_Base_stub \ CFT_Test_Connector_stub CFT_Test_Connector_svnt \ - CFT_Test_Component_exec CFT_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + CFT_Test_Component_exec CFT_Test_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub CFT_Test_Base_stub \ CFT_Test_Connector_stub CFT_Test_Connector_svnt \ - Component_exec CFT_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec CFT_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc index a342ba9de1e..3d43d752ce4 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc @@ -32,9 +32,9 @@ project(CFT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(CFT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub DDS4CCM_lem_stub - libs += CFT_Test_Base_stub CFT_Test_Connector_stub DDS4CCM_lem_stub +project(CFT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub + libs += CFT_Test_Base_stub CFT_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,10 +84,10 @@ project(CFT_Test_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CFT_Test_Connector_lem_stub CFT_Test_Connector_stub DDS4CCM_lem_stub CFT_Test_Base_stub +project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += CFT_Test_Connector_lem_stub CFT_Test_Connector_stub CFT_Test_Base_stub sharedname = CFT_Test_Connector_exec - libs += CFT_Test_Connector_stub CFT_Test_Connector_lem_stub CFT_Test_Base_stub DDS4CCM_lem_stub CFT_Test_Base_stub + libs += CFT_Test_Connector_stub CFT_Test_Connector_lem_stub CFT_Test_Base_stub CFT_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,14 +110,13 @@ project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub DDS4CCM_lem_stub +project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { + after += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub sharedname = CFT_Test_Connector_svnt libs += CFT_Test_Connector_stub \ CFT_Test_Connector_lem_stub \ CFT_Test_Base_stub \ - CFT_Test_Connector_exec \ - DDS4CCM_lem_stub + CFT_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc index bfc4f5b504f..ec1fe4deef2 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_CFTLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_CFTLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_CFTLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub + libs += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,10 +84,10 @@ project(DDS_CFTLE_Test_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub DDS4CCM_lem_stub DDS_CFTLE_Test_Base_stub +project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub sharedname = DDS_CFTLE_Test_Connector_exec - libs += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Base_stub DDS4CCM_lem_stub DDS_CFTLE_Test_Base_stub + libs += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,14 +110,13 @@ project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { + after += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub sharedname = DDS_CFTLE_Test_Connector_svnt libs += DDS_CFTLE_Test_Connector_stub \ DDS_CFTLE_Test_Connector_lem_stub \ DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_CFTLE_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc index ff07765ceb6..1faaaf0f998 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_CFTLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CFTLE_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_CFTLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Receiver_stub \ DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub \ - DDS_CFTLE_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_CFTLE_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_CFTLE_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Base_stub \ DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ - DDS_CFTLE_Test_Receiver_exec DDS_CFTLE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_CFTLE_Test_Receiver_exec DDS_CFTLE_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \ DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ - Receiver_exec DDS_CFTLE_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_CFTLE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc index 689b1a67a15..eb3df66541f 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_CFTLE_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CFTLE_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_CFTLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_CFTLE_Test_Sender_lem_stub DDS_CFTLE_Test_Sender_stub \ - DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \ - DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_CFTLE_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_CFTLE_Test_Connector_stub \ + DDS_CFTLE_Test_Connector_stub \ DDS_CFTLE_Test_Connector_svnt DDS_CFTLE_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \ + DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \ DDS_CFTLE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc index 07ad709dac0..97169ed1f7c 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc @@ -84,14 +84,13 @@ project(CFT_Exception_Test_Component_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_Exception_Test_Component_exec) : ciao_executor, dds4ccm_base { +project(CFT_Exception_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Component_stub \ CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub \ - CFT_Exception_Test_Connector_lem_stub DDS4CCM_lem_stub + CFT_Exception_Test_Connector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \ - CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(CFT_Exception_Test_Component_exec) : ciao_executor, dds4ccm_base { } -project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_base { +project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Base_stub \ CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \ - CFT_Exception_Test_Component_exec CFT_Exception_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + CFT_Exception_Test_Component_exec CFT_Exception_Test_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \ CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \ - Component_exec CFT_Exception_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec CFT_Exception_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc index 7ea3ed0a905..6726b3a512d 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc @@ -32,9 +32,9 @@ project(CFT_Exception_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(CFT_Exception_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub DDS4CCM_lem_stub - libs += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub DDS4CCM_lem_stub +project(CFT_Exception_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub + libs += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,10 +84,10 @@ project(CFT_Exception_Test_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_stub DDS4CCM_lem_stub CFT_Exception_Test_Base_stub +project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { + after += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub sharedname = CFT_Exception_Test_Connector_exec - libs += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Base_stub DDS4CCM_lem_stub CFT_Exception_Test_Base_stub + libs += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Base_stub CFT_Exception_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,14 +110,13 @@ project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub DDS4CCM_lem_stub +project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { + after += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub sharedname = CFT_Exception_Test_Connector_svnt libs += CFT_Exception_Test_Connector_stub \ CFT_Exception_Test_Connector_lem_stub \ CFT_Exception_Test_Base_stub \ - CFT_Exception_Test_Connector_exec \ - DDS4CCM_lem_stub + CFT_Exception_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc index 9ddf965814e..ec68400148a 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc @@ -81,12 +81,10 @@ project(CFT_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base { } -project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_base { - after += CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel +project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub sharedname = CFT_ReadGet_Starter_svnt - libs += CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc index a34f0d941d4..91efb436de5 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc @@ -32,10 +32,10 @@ project(CFT_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(CFT_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(CFT_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += CFT_ReadGet_Test_Connector_lem_gen CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Base_stub DDS4CCM_lem_stub - libs += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub DDS4CCM_lem_stub + CFT_ReadGet_Test_Base_stub + libs += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,12 +85,12 @@ project(CFT_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl { +project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { after += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \ - DDS4CCM_lem_stub CFT_ReadGet_Test_Base_stub + CFT_ReadGet_Test_Base_stub sharedname = CFT_ReadGet_Test_Connector_exec libs += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \ - CFT_ReadGet_Test_Base_stub DDS4CCM_lem_stub CFT_ReadGet_Test_Base_stub + CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -113,15 +113,14 @@ project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl { } -project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { +project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { after += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_exec \ - CFT_ReadGet_Test_Connector_stub DDS4CCM_lem_stub + CFT_ReadGet_Test_Connector_stub sharedname = CFT_ReadGet_Test_Connector_svnt libs += CFT_ReadGet_Test_Connector_stub \ CFT_ReadGet_Test_Connector_lem_stub \ CFT_ReadGet_Test_Base_stub \ - CFT_ReadGet_Test_Connector_exec \ - DDS4CCM_lem_stub + CFT_ReadGet_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc index f9f166cda9e..4daad9c57dd 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(CFT_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(CFT_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Receiver_stub \ CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Test_Connector_lem_stub DDS4CCM_lem_stub \ + CFT_ReadGet_Test_Connector_lem_stub \ CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \ CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \ - DDS4CCM_lem_stub CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub + CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(CFT_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Base_stub \ CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ CFT_ReadGet_Test_Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel CFT_ReadGet_Starter_stub \ + CFT_ReadGet_Starter_stub \ CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \ CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ - Receiver_exec CFT_ReadGet_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \ + Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \ + CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \ CFT_ReadGet_Starter_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc index d814a381802..bc1f872af4d 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc @@ -87,14 +87,14 @@ project(CFT_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(CFT_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(CFT_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += CFT_ReadGet_Test_Sender_lem_stub CFT_ReadGet_Test_Sender_stub \ CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \ - DDS4CCM_lem_stub CFT_ReadGet_Starter_lem_stub + CFT_ReadGet_Starter_lem_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \ CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \ - CFT_ReadGet_Starter_stub DDS4CCM_lem_stub CFT_ReadGet_Starter_lem_stub \ + CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub \ CFT_ReadGet_Starter_lem_stub libpaths += ../lib includes += .. @@ -118,15 +118,15 @@ project(CFT_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel CFT_ReadGet_Test_Connector_stub \ + CFT_ReadGet_Test_Connector_stub \ CFT_ReadGet_Test_Connector_svnt CFT_ReadGet_Test_Connector_lem_stub \ CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \ CFT_ReadGet_Starter_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \ + CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \ CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Starter_stub \ CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc index 9987c3dd5ce..59f6ef9c4c5 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_CFTLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_CFTLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_CFTLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub + libs += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_CFTLS_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_CFTLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub DDS4CCM_lem_stub DDS_CFTLS_Test_Base_stub + after += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub sharedname = DDS_CFTLS_Test_Connector_exec - libs += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Base_stub DDS4CCM_lem_stub DDS_CFTLS_Test_Base_stub + libs += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_CFTLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub sharedname = DDS_CFTLS_Test_Connector_svnt libs += DDS_CFTLS_Test_Connector_stub \ DDS_CFTLS_Test_Connector_lem_stub \ DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_CFTLS_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc index ff9eaffe311..a546809f0ee 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_CFTLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CFTLS_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_CFTLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Receiver_stub \ DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub \ - DDS_CFTLS_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_CFTLS_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_CFTLS_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Base_stub \ DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ - DDS_CFTLS_Test_Receiver_exec DDS_CFTLS_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_CFTLS_Test_Receiver_exec DDS_CFTLS_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \ DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ - Receiver_exec DDS_CFTLS_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_CFTLS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc index 64fb647f65d..e462682551b 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_CFTLS_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_CFTLS_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_CFTLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_CFTLS_Test_Sender_lem_stub DDS_CFTLS_Test_Sender_stub \ - DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \ - DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_CFTLS_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_CFTLS_Test_Connector_stub \ + DDS_CFTLS_Test_Connector_stub \ DDS_CFTLS_Test_Connector_svnt DDS_CFTLS_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \ + DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \ DDS_CFTLS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc index 3509d24e144..28699ac1db8 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_DDSWriterEntityConnector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub - libs += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS4CCM_lem_stub +project(DDS_DDSWriterEntityConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub + libs += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_DDSWriterEntityConnector_stub) : ccm_stub, dds4ccm_base { } project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub DDS4CCM_lem_stub + after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub sharedname = DDS_DDSWriterEntityConnector_exec - libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub + libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl { project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub DDS4CCM_lem_stub + after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub sharedname = DDS_DDSWriterEntityConnector_svnt libs += DDS_DDSWriterEntityConnector_stub \ DDS_DDSWriterEntityConnector_lem_stub \ DDS_DDSWriterEntityBase_stub \ - DDS_DDSWriterEntityConnector_exec \ - DDS4CCM_lem_stub + DDS_DDSWriterEntityConnector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc index 2a28b1b6739..932540c1593 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_DDSWriterEntityReceiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityReceiver_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub +project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityReceiver_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp index 3b894489f5f..c5fa107d60e 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp @@ -6,6 +6,8 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_time.h" +#include "Base/Writer_BaseSupport.h" +#include "Connector/Writer_Connector_conn.h" namespace CIAO_Writer_Receiver_Impl { @@ -84,6 +86,36 @@ namespace CIAO_Writer_Receiver_Impl void Receiver_exec_i::configuration_complete (void) { + ::DDS::DataReader_var dds_dr = + this->context_->get_connection_info_out_dds_entity (); + + if (::CORBA::is_nil (dds_dr.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::configuration_complete - " + "Datareader connection is NIL.\n")); + throw ::CORBA::INTERNAL (); + } + + typedef ::CIAO::DDS4CCM::CCM_DDS_DataReader_Base DataReader_type; + + DataReader_type * typed_ccm_dr = dynamic_cast <DataReader_type*> (dds_dr.in ()); + if (typed_ccm_dr) + { + this->reader_ = WriterTestDataReader::narrow (typed_ccm_dr->get_impl_base ()); + if (!this->reader_) + { + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::configuration_complete - " + "Error casting the typed CCM DataReader to a typed " + "DDS DataReader.\n")); + throw ::CORBA::INTERNAL (); + } + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::configuration_complete - " + "Error casting DataReader to typed DataReader\n")); + throw ::CORBA::INTERNAL (); + } } void diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h index a0b47cd1288..e9d4ddab432 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.h @@ -14,6 +14,8 @@ #include "tao/LocalObject.h" +class WriterTestDataReader; + namespace CIAO_Writer_Receiver_Impl { //============================================================ @@ -65,6 +67,7 @@ namespace CIAO_Writer_Receiver_Impl virtual void ccm_remove (void); private: + WriterTestDataReader * reader_; ::Writer::CCM_Receiver_Context_var context_; }; diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc index f91fd6fa491..f9f7b4f7b5c 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc @@ -85,14 +85,14 @@ project(DDS_DDSWriterEntitySender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl { +project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl, dds4ccm_lem_stub { after += DDS_DDSWriterEntitySender_lem_stub DDS_DDSWriterEntitySender_stub \ DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \ - DDS4CCM_lem_stub DDS_DDSWriterEntityConnector_exec + DDS_DDSWriterEntityConnector_exec sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \ DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \ - DDS4CCM_lem_stub DDS_DDSWriterEntityConnector_exec + DDS_DDSWriterEntityConnector_exec libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +115,13 @@ project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_base, dds4ccm_i } -project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntitySender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_DDSWriterEntityConnector_stub \ + DDS_DDSWriterEntityConnector_stub \ DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityConnector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \ + DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt \ DDS_DDSWriterEntityConnector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc index 322b2d305c8..fd83b76e6f3 100755 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc @@ -31,9 +31,9 @@ project(DDS_DNM_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_DNM_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub DDS4CCM_lem_stub - libs += DDS_DNM_Base_stub DDS_DNM_Connector_stub DDS4CCM_lem_stub +project(DDS_DNM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub + libs += DDS_DNM_Base_stub DDS_DNM_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_DNM_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub DDS4CCM_lem_stub + after += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub sharedname = DDS_DNM_Connector_exec - libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub DDS4CCM_lem_stub + libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,13 +110,12 @@ project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub DDS4CCM_lem_stub + after += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub sharedname = DDS_DNM_Connector_svnt libs += DDS_DNM_Connector_stub \ DDS_DNM_Connector_lem_stub \ DDS_DNM_Base_stub \ - DDS_DNM_Connector_exec \ - DDS4CCM_lem_stub + DDS_DNM_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc index 5429820c287..dc7fb3175c7 100755 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc @@ -83,14 +83,12 @@ project(DNM_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DNM_Sender_exec) : ciao_executor, dds4ccm_base { +project(DNM_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DNM_Sender_lem_stub DNM_Sender_stub \ - DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub \ - DDS4CCM_lem_stub + DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \ - DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub \ - DDS4CCM_lem_stub + DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -113,13 +111,13 @@ project(DNM_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DNM_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DNM_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_DNM_Base_stub DNM_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_DNM_Connector_stub \ + DDS_DNM_Connector_stub \ DDS_DNM_Connector_svnt DDS_DNM_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_DNM_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_DNM_Connector_stub DDS_DNM_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \ + DDS_DNM_Connector_stub DDS_DNM_Connector_svnt \ DDS_DNM_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc index 502fa238eaf..2619e45f013 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_ECT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub DDS4CCM_lem_stub - libs += DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub +project(DDS_ECT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub + libs += DDS_ECT_Base_stub DDS_ECT_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub + after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub sharedname = DDS_ECT_Connector_exec - libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub + libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub DDS4CCM_lem_stub + after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub sharedname = DDS_ECT_Connector_svnt libs += DDS_ECT_Connector_stub \ DDS_ECT_Connector_lem_stub \ DDS_ECT_Base_stub \ - DDS_ECT_Connector_exec \ - DDS4CCM_lem_stub + DDS_ECT_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc index 99e5426adbe..e605f6517ba 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_ECT_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_ECT_Receiver_lem_stub DDS_ECT_Receiver_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_ECT_Receiver_lem_stub DDS_ECT_Receiver_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc index ce1d8d8e738..c6dad6940b4 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc @@ -109,11 +109,11 @@ project(DDS_ECT_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_ECT_Base_stub DDS_ECT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub +project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_ECT_Base_stub DDS_ECT_Sender_lem_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_ECT_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub + DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc index fbdec52bf6b..bb65328b879 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc @@ -31,9 +31,9 @@ project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub DDS4CCM_lem_stub - libs += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub DDS4CCM_lem_stub +project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub + libs += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_FSS_Event_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub DDS4CCM_lem_stub + after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub sharedname = DDS_FSS_Event_Connector_exec - libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub DDS4CCM_lem_stub + libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,13 +110,12 @@ project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub DDS4CCM_lem_stub + after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub sharedname = DDS_FSS_Event_Connector_svnt libs += DDS_FSS_Event_Connector_stub \ DDS_FSS_Event_Connector_lem_stub \ DDS_FSS_Event_Base_stub \ - DDS_FSS_Event_Connector_exec \ - DDS4CCM_lem_stub + DDS_FSS_Event_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc index b4b8beb8c6f..f06e2fc14b8 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub DDS4CCM_lem_stub - libs += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub DDS4CCM_lem_stub +project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub + libs += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_FSS_State_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS4CCM_lem_stub DDS_FSS_State_Base_stub + after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub sharedname = DDS_FSS_State_Connector_exec - libs += DDS_FSS_State_Connector_stub DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Base_stub DDS4CCM_lem_stub DDS_FSS_State_Base_stub + libs += DDS_FSS_State_Connector_stub DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Base_stub DDS_FSS_State_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub DDS4CCM_lem_stub + after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub sharedname = DDS_FSS_State_Connector_svnt libs += DDS_FSS_State_Connector_stub \ DDS_FSS_State_Connector_lem_stub \ DDS_FSS_State_Base_stub \ - DDS_FSS_State_Connector_exec \ - DDS4CCM_lem_stub + DDS_FSS_State_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc index 58657be9632..41c7ed9ebf1 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc @@ -84,14 +84,13 @@ project(GCE_Test_Component_stub) : ccm_stub, dds4ccm_base { } } -project(GCE_Test_Component_exec) : ciao_executor, dds4ccm_base { +project(GCE_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += GCE_Test_Component_lem_stub GCE_Test_Component_stub \ GCE_Test_Base_stub GCE_Test_Connector_stub \ - GCE_Test_Connector_lem_stub DDS4CCM_lem_stub + GCE_Test_Connector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub GCE_Test_Base_stub \ - GCE_Test_Connector_stub GCE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + GCE_Test_Connector_stub GCE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(GCE_Test_Component_exec) : ciao_executor, dds4ccm_base { } -project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_base { +project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += GCE_Test_Component_lem_stub GCE_Test_Base_stub \ GCE_Test_Connector_stub GCE_Test_Connector_svnt \ - GCE_Test_Component_exec GCE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + GCE_Test_Component_exec GCE_Test_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub GCE_Test_Base_stub \ GCE_Test_Connector_stub GCE_Test_Connector_svnt \ - Component_exec GCE_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec GCE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc index 774d7d26c61..bf0eef5ce18 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc @@ -32,9 +32,9 @@ project(GCE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(GCE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub DDS4CCM_lem_stub - libs += GCE_Test_Base_stub GCE_Test_Connector_stub DDS4CCM_lem_stub +project(GCE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub + libs += GCE_Test_Base_stub GCE_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(GCE_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(GCE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += GCE_Test_Connector_lem_stub GCE_Test_Connector_stub DDS4CCM_lem_stub GCE_Test_Base_stub + after += GCE_Test_Connector_lem_stub GCE_Test_Connector_stub GCE_Test_Base_stub sharedname = GCE_Test_Connector_exec - libs += GCE_Test_Connector_stub GCE_Test_Connector_lem_stub GCE_Test_Base_stub DDS4CCM_lem_stub GCE_Test_Base_stub + libs += GCE_Test_Connector_stub GCE_Test_Connector_lem_stub GCE_Test_Base_stub GCE_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(GCE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub DDS4CCM_lem_stub + after += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub sharedname = GCE_Test_Connector_svnt libs += GCE_Test_Connector_stub \ GCE_Test_Connector_lem_stub \ GCE_Test_Base_stub \ - GCE_Test_Connector_exec \ - DDS4CCM_lem_stub + GCE_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc index ae9635ab9d7..e8e9c957fd5 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc @@ -84,14 +84,13 @@ project(GCS_Test_Component_stub) : ccm_stub, dds4ccm_base { } } -project(GCS_Test_Component_exec) : ciao_executor, dds4ccm_base { +project(GCS_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += GCS_Test_Component_lem_stub GCS_Test_Component_stub \ GCS_Test_Base_stub GCS_Test_Connector_stub \ - GCS_Test_Connector_lem_stub DDS4CCM_lem_stub + GCS_Test_Connector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub GCS_Test_Base_stub \ - GCS_Test_Connector_stub GCS_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + GCS_Test_Connector_stub GCS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(GCS_Test_Component_exec) : ciao_executor, dds4ccm_base { } -project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_base { +project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += GCS_Test_Component_lem_stub GCS_Test_Base_stub \ GCS_Test_Connector_stub GCS_Test_Connector_svnt \ - GCS_Test_Component_exec GCS_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + GCS_Test_Component_exec GCS_Test_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub GCS_Test_Base_stub \ GCS_Test_Connector_stub GCS_Test_Connector_svnt \ - Component_exec GCS_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec GCS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc index 75810ca9abd..8fccb838986 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc @@ -32,9 +32,9 @@ project(GCS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(GCS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub DDS4CCM_lem_stub - libs += GCS_Test_Base_stub GCS_Test_Connector_stub DDS4CCM_lem_stub +project(GCS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub + libs += GCS_Test_Base_stub GCS_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(GCS_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(GCS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += GCS_Test_Connector_lem_stub GCS_Test_Connector_stub DDS4CCM_lem_stub GCS_Test_Base_stub + after += GCS_Test_Connector_lem_stub GCS_Test_Connector_stub GCS_Test_Base_stub sharedname = GCS_Test_Connector_exec - libs += GCS_Test_Connector_stub GCS_Test_Connector_lem_stub GCS_Test_Base_stub DDS4CCM_lem_stub GCS_Test_Base_stub + libs += GCS_Test_Connector_stub GCS_Test_Connector_lem_stub GCS_Test_Base_stub GCS_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(GCS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub DDS4CCM_lem_stub + after += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub sharedname = GCS_Test_Connector_svnt libs += GCS_Test_Connector_stub \ GCS_Test_Connector_lem_stub \ GCS_Test_Base_stub \ - GCS_Test_Connector_exec \ - DDS4CCM_lem_stub + GCS_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc index d025ce97151..0bd28cbdc34 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc @@ -82,12 +82,11 @@ project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base { } -project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Get_Invoker_idl_gen + DDS_Get_Invoker_idl_gen sharedname = Get_Invoker_svnt - libs += Get_Invoker_stub Get_Invoker_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += Get_Invoker_stub Get_Invoker_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc index 9ee0299711f..a010574641a 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Getter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_Getter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub + libs += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Getter_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS4CCM_lem_stub DDS_Getter_Test_Base_stub + after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub sharedname = DDS_Getter_Test_Connector_exec - libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS4CCM_lem_stub DDS_Getter_Test_Base_stub + libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS_Getter_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub sharedname = DDS_Getter_Test_Connector_svnt libs += DDS_Getter_Test_Connector_stub \ DDS_Getter_Test_Connector_lem_stub \ DDS_Getter_Test_Base_stub \ - DDS_Getter_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_Getter_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc index 14981b0be8b..474d94de77a 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(DDS_Getter_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Receiver_stub \ DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \ - DDS_Getter_Test_Connector_lem_stub DDS4CCM_lem_stub \ + DDS_Getter_Test_Connector_lem_stub \ DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \ DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub \ - DDS4CCM_lem_stub Get_Invoker_lem_stub Get_Invoker_stub + Get_Invoker_lem_stub Get_Invoker_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Base_stub \ DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ DDS_Getter_Test_Receiver_exec DDS_Getter_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Get_Invoker_stub \ + DDS_Get_Invoker_stub \ DDS_Get_Invoker_svnt DDS_Get_Invoker_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \ DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ - Receiver_exec DDS_Getter_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Get_Invoker_stub Get_Invoker_svnt \ + Receiver_exec DDS_Getter_Test_Connector_lem_stub \ + Get_Invoker_stub Get_Invoker_svnt \ Get_Invoker_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc index 0f0bb25367b..b13a29f80c1 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc @@ -87,14 +87,13 @@ project(DDS_Getter_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Getter_Test_Sender_lem_stub DDS_Getter_Test_Sender_stub \ - DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \ DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub \ - Get_Invoker_stub DDS4CCM_lem_stub + Get_Invoker_stub libpaths += ../lib includes += .. libout = ../lib @@ -117,14 +116,14 @@ project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_Getter_Test_Base_stub DDS_Getter_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Getter_Test_Connector_stub \ + DDS_Getter_Test_Connector_stub \ DDS_Getter_Test_Connector_svnt DDS_Getter_Test_Connector_lem_stub \ DDS_Get_Invoker_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \ + DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \ DDS_Getter_Test_Connector_lem_stub Get_Invoker_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc index f0ee22ce882..0126446a5b7 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_InstanceHandleConnector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub - libs += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub DDS4CCM_lem_stub +project(DDS_InstanceHandleConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub + libs += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_InstanceHandleConnector_stub) : ccm_stub, dds4ccm_base { } project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_stub + after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub sharedname = DDS_InstanceHandleConnector_exec - libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_stub + libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl { project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub DDS4CCM_lem_stub + after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub sharedname = DDS_InstanceHandleConnector_svnt libs += DDS_InstanceHandleConnector_stub \ DDS_InstanceHandleConnector_lem_stub \ DDS_DDSInstanceHandleBase_stub \ - DDS_InstanceHandleConnector_exec \ - DDS4CCM_lem_stub + DDS_InstanceHandleConnector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc index a2435c35e4b..a3b356f1bc2 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_DDSInstanceHandleSender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl { +project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_impl { after += DDS_DDSInstanceHandleSender_lem_stub DDS_DDSInstanceHandleSender_stub \ - DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub \ - DDS4CCM_lem_stub + DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \ - DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub \ - DDS4CCM_lem_stub + DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_base, dds4ccm } -project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleSender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_InstanceHandleConnector_stub \ + DDS_InstanceHandleConnector_stub \ DDS_InstanceHandleConnector_svnt DDS_InstanceHandleConnector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \ + DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_svnt \ DDS_InstanceHandleConnector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc index 23dffee521e..6b615a7c192 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Keyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_Keyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub + libs += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS4CCM_lem_stub DDS_Keyed_Test_Base_stub + after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub sharedname = DDS_Keyed_Test_Connector_exec - libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS4CCM_lem_stub DDS_Keyed_Test_Base_stub + libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub sharedname = DDS_Keyed_Test_Connector_svnt libs += DDS_Keyed_Test_Connector_stub \ DDS_Keyed_Test_Connector_lem_stub \ DDS_Keyed_Test_Base_stub \ - DDS_Keyed_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_Keyed_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc index 60df7633a8b..01f04f90ef5 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Receiver_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Receiver_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc index 3c0ce0ab6e2..19fb844d358 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc @@ -109,11 +109,11 @@ project(DDS_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub +project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_Keyed_Test_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub + DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc index 0973eab8f56..c4ba37345ef 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_KeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub DDS4CCM_lem_stub - libs += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub +project(DDS_KeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub + libs += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_KeyedWriterConnector_stub) : ccm_stub, dds4ccm_base { } project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_stub + after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub sharedname = DDS_KeyedWriterConnector_exec - libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_stub + libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl { project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub + after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub sharedname = DDS_KeyedWriterConnector_svnt libs += DDS_KeyedWriterConnector_stub \ DDS_KeyedWriterConnector_lem_stub \ DDS_KeyedWriterBase_stub \ - DDS_KeyedWriterConnector_exec \ - DDS4CCM_lem_stub + DDS_KeyedWriterConnector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc index c8f5cea2dec..229adbacaa3 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_KeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterReceiver_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub +project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterReceiver_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc index 16b78a271ad..2d2c5030b85 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_KeyedWriterSender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_base { - after += DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterSender_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub +project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterSender_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_KeyedWriterBase_stub DDS_KeyedWriterSender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub +project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_KeyedWriterBase_stub DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_KeyedWriterBase_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub + DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc index ab0159a2241..1cc4d1c2d6d 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_LMBM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_LMBM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub + libs += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_LMBM_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS4CCM_lem_stub DDS_LMBM_Test_Base_stub + after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub sharedname = DDS_LMBM_Test_Connector_exec - libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS4CCM_lem_stub DDS_LMBM_Test_Base_stub + libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub sharedname = DDS_LMBM_Test_Connector_svnt libs += DDS_LMBM_Test_Connector_stub \ DDS_LMBM_Test_Connector_lem_stub \ DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_LMBM_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc index f195ace478e..16eab169dc1 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_LMBM_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Receiver_stub \ DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub \ - DDS_LMBM_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_LMBM_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Base_stub \ DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ - DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \ DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ - Receiver_exec DDS_LMBM_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_LMBM_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc index 66a95a1292c..6aebd902bd3 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_LMBM_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LMBM_Test_Sender_lem_stub DDS_LMBM_Test_Sender_stub \ - DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \ - DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_LMBM_Test_Connector_stub \ + DDS_LMBM_Test_Connector_stub \ DDS_LMBM_Test_Connector_svnt DDS_LMBM_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \ + DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \ DDS_LMBM_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc index 14bf3dec8b6..41d97dd70e8 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub + libs += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_LNE_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub DDS_LNE_Test_Base_stub + after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub sharedname = DDS_LNE_Test_Connector_exec - libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub DDS_LNE_Test_Base_stub + libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS_LNE_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub sharedname = DDS_LNE_Test_Connector_svnt libs += DDS_LNE_Test_Connector_stub \ DDS_LNE_Test_Connector_lem_stub \ DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_LNE_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc index e994640fb3b..fc27ac6b86a 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_LNE_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Receiver_stub \ DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub \ - DDS_LNE_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_LNE_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Base_stub \ DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ - DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \ DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ - Receiver_exec DDS_LNE_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_LNE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc index 2c77e3cff5b..8d80594d294 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_LNE_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LNE_Test_Sender_lem_stub DDS_LNE_Test_Sender_stub \ - DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \ - DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LNE_Test_Base_stub DDS_LNE_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_LNE_Test_Connector_stub \ + DDS_LNE_Test_Connector_stub \ DDS_LNE_Test_Connector_svnt DDS_LNE_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \ + DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \ DDS_LNE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc index 27712df16cd..e8c4c878fdb 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_LOBO_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_LOBO_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub + libs += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_LOBO_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS4CCM_lem_stub DDS_LOBO_Test_Base_stub + after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub sharedname = DDS_LOBO_Test_Connector_exec - libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS4CCM_lem_stub DDS_LOBO_Test_Base_stub + libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub sharedname = DDS_LOBO_Test_Connector_svnt libs += DDS_LOBO_Test_Connector_stub \ DDS_LOBO_Test_Connector_lem_stub \ DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_LOBO_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc index ffc8c8895f6..41c64cc20a0 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_LOBO_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Receiver_stub \ DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub \ - DDS_LOBO_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_LOBO_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Base_stub \ DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ - DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \ DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ - Receiver_exec DDS_LOBO_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_LOBO_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc index 1e960071d50..e321b6908d7 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_LOBO_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_LOBO_Test_Sender_lem_stub DDS_LOBO_Test_Sender_stub \ - DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \ - DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_LOBO_Test_Connector_stub \ + DDS_LOBO_Test_Connector_stub \ DDS_LOBO_Test_Connector_svnt DDS_LOBO_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \ + DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \ DDS_LOBO_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc index ccaf168afbf..c05cd7a3a3b 100755 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc @@ -87,11 +87,10 @@ project(NonChangeable_Component_stub) : ccm_stub, dds4ccm_base { project(NonChangeable_Component_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl { after += NonChangeable_Component_lem_stub NonChangeable_Component_stub \ DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub \ - DDS_NonChangeableConnector_lem_stub DDS4CCM_lem_stub + DDS_NonChangeableConnector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \ - DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub \ - DDS4CCM_lem_stub + DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(NonChangeable_Component_exec) : ciao_executor, dds4ccm_base, dds4ccm_imp } -project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_base { +project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += NonChangeable_Component_lem_stub DDS_NonChangeableBase_stub \ DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \ - NonChangeable_Component_exec DDS_NonChangeableConnector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + NonChangeable_Component_exec DDS_NonChangeableConnector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \ DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \ - Component_exec DDS_NonChangeableConnector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec DDS_NonChangeableConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc index 0c34db34e34..d36f94a1d3c 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_NonChangeableConnector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub DDS4CCM_lem_stub - libs += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub DDS4CCM_lem_stub +project(DDS_NonChangeableConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub + libs += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_NonChangeableConnector_stub) : ccm_stub, dds4ccm_base { } project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS4CCM_lem_stub DDS_NonChangeableBase_stub + after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub sharedname = DDS_NonChangeableConnector_exec - libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS4CCM_lem_stub DDS_NonChangeableBase_stub + libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS_NonChangeableBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl { project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub DDS4CCM_lem_stub + after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub sharedname = DDS_NonChangeableConnector_svnt libs += DDS_NonChangeableConnector_stub \ DDS_NonChangeableConnector_lem_stub \ DDS_NonChangeableBase_stub \ - DDS_NonChangeableConnector_exec \ - DDS4CCM_lem_stub + DDS_NonChangeableConnector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc index 2610671718b..7c301fe99a7 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(OIT_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += OIT_Test_Receiver_lem_stub OIT_Test_Receiver_stub \ OIT_Test_Base_stub OIT_Receiver_Connector_stub \ - OIT_Receiver_Connector_lem_stub DDS4CCM_lem_stub + OIT_Receiver_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \ - OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub \ - DDS4CCM_lem_stub + OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += OIT_Test_Receiver_lem_stub OIT_Test_Base_stub \ OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \ - OIT_Test_Receiver_exec OIT_Receiver_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + OIT_Test_Receiver_exec OIT_Receiver_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \ OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \ - Receiver_exec OIT_Receiver_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec OIT_Receiver_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc index 81317fd8d65..da0aa40499c 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc @@ -32,9 +32,9 @@ project(OIT_Receiver_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(OIT_Receiver_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub DDS4CCM_lem_stub - libs += OIT_Test_Base_stub OIT_Receiver_Connector_stub DDS4CCM_lem_stub +project(OIT_Receiver_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub + libs += OIT_Test_Base_stub OIT_Receiver_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(OIT_Receiver_Connector_stub) : ccm_stub, dds4ccm_base { } project(OIT_Receiver_Connector_exec) : ciao_executor, dds4ccm_impl { - after += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_stub DDS4CCM_lem_stub OIT_Test_Base_stub + after += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_stub OIT_Test_Base_stub sharedname = OIT_Receiver_Connector_exec - libs += OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub OIT_Test_Base_stub DDS4CCM_lem_stub OIT_Test_Base_stub + libs += OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(OIT_Receiver_Connector_exec) : ciao_executor, dds4ccm_impl { project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub DDS4CCM_lem_stub + after += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub sharedname = OIT_Receiver_Connector_svnt libs += OIT_Receiver_Connector_stub \ OIT_Receiver_Connector_lem_stub \ OIT_Test_Base_stub \ - OIT_Receiver_Connector_exec \ - DDS4CCM_lem_stub + OIT_Receiver_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc index 887f0ba5dcb..a7b3c35c9f2 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc @@ -85,14 +85,12 @@ project(OIT_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(OIT_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(OIT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += OIT_Test_Sender_lem_stub OIT_Test_Sender_stub \ - OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub \ - DDS4CCM_lem_stub + OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub OIT_Test_Base_stub \ - OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub \ - DDS4CCM_lem_stub + OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(OIT_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += OIT_Test_Base_stub OIT_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel OIT_Sender_Connector_stub \ + OIT_Sender_Connector_stub \ OIT_Sender_Connector_svnt OIT_Sender_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub OIT_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel OIT_Sender_Connector_stub OIT_Sender_Connector_svnt \ + libs += Sender_stub Sender_lem_stub OIT_Test_Base_stub \ + OIT_Sender_Connector_stub OIT_Sender_Connector_svnt \ OIT_Sender_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc index 55570d20079..3c9dc6f812d 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc @@ -32,9 +32,9 @@ project(OIT_Sender_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(OIT_Sender_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub DDS4CCM_lem_stub - libs += OIT_Test_Base_stub OIT_Sender_Connector_stub DDS4CCM_lem_stub +project(OIT_Sender_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub + libs += OIT_Test_Base_stub OIT_Sender_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(OIT_Sender_Connector_stub) : ccm_stub, dds4ccm_base { } project(OIT_Sender_Connector_exec) : ciao_executor, dds4ccm_impl { - after += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub DDS4CCM_lem_stub OIT_Test_Base_stub + after += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub OIT_Test_Base_stub sharedname = OIT_Sender_Connector_exec - libs += OIT_Sender_Connector_stub OIT_Sender_Connector_lem_stub OIT_Test_Base_stub DDS4CCM_lem_stub OIT_Test_Base_stub + libs += OIT_Sender_Connector_stub OIT_Sender_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(OIT_Sender_Connector_exec) : ciao_executor, dds4ccm_impl { project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub DDS4CCM_lem_stub + after += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub sharedname = OIT_Sender_Connector_svnt libs += OIT_Sender_Connector_stub \ OIT_Sender_Connector_lem_stub \ OIT_Test_Base_stub \ - OIT_Sender_Connector_exec \ - DDS4CCM_lem_stub + OIT_Sender_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc index 13338391c9b..04a2fb82273 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc @@ -106,14 +106,12 @@ project(PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += PSAT_Connector_lem_gen \ DDS_PSAT_Connector_stub \ - DDS_CCM_Example_PSAT_stub \ - DDS4CCM_lem_stub + DDS_CCM_Example_PSAT_stub libs += DDS_CCM_Example_PSAT_stub \ - DDS_PSAT_Connector_stub \ - DDS4CCM_lem_stub + DDS_PSAT_Connector_stub libpaths += lib libout = lib includes += .. @@ -163,17 +161,15 @@ project(DDS_PSAT_Connector_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub { +project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl { after += DDS_CCM_Example_PSAT_type_stub \ PSAT_Connector_lem_stub \ - DDS_PSAT_Connector_stub \ - DDS4CCM_lem_stub + DDS_PSAT_Connector_stub sharedname = DDS_PSAT_Connector_exec libs += DDS_CCM_Example_PSAT_type_stub \ DDS_PSAT_Connector_stub \ PSAT_Connector_lem_stub \ - DDS_CCM_Example_PSAT_stub \ - DDS4CCM_lem_stub + DDS_CCM_Example_PSAT_stub libpaths += lib libout = lib includes += .. @@ -197,17 +193,15 @@ project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub } -project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub { +project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl { after += PSAT_Connector_lem_stub \ DDS_PSAT_Connector_exec \ - DDS_PSAT_Connector_skel \ - DDS4CCM_lem_stub + DDS_PSAT_Connector_skel sharedname = DDS_PSAT_Connector_svnt libs += DDS_PSAT_Connector_stub \ PSAT_Connector_lem_stub \ DDS_CCM_Example_PSAT_stub \ - DDS_PSAT_Connector_exec \ - DDS4CCM_lem_stub + DDS_PSAT_Connector_exec libpaths += lib libout = lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc index b8d8441d793..2c57768808b 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_PSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub DDS4CCM_lem_stub - libs += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub +project(DDS_PSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub + libs += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_PSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub DDS_PSL_DeadlineTest_Base_stub + after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub sharedname = DDS_PSL_DeadlineTest_Connector_exec - libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS_PSL_DeadlineTest_Base_stub + libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub + after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub sharedname = DDS_PSL_DeadlineTest_Connector_svnt libs += DDS_PSL_DeadlineTest_Connector_stub \ DDS_PSL_DT_Connector_lem_stub \ DDS_PSL_DeadlineTest_Base_stub \ - DDS_PSL_DeadlineTest_Connector_exec \ - DDS4CCM_lem_stub + DDS_PSL_DeadlineTest_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc index c7cfe0a622a..67689f76d8c 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_PSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Receiver_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Receiver_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc index a855c8bf427..0bd5a4a81f9 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_PSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub +project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub +project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_PSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub + DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc index 83feeb517c3..1983963e70b 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_PSL_SL_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub DDS4CCM_lem_stub - libs += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub +project(DDS_PSL_SL_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub + libs += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_PSL_SampleLost_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub DDS_PSL_SampleLost_Base_stub + after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub sharedname = DDS_PSL_SampleLost_Connector_exec - libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS4CCM_lem_stub DDS_PSL_SampleLost_Base_stub + libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub + after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub sharedname = DDS_PSL_SampleLost_Connector_svnt libs += DDS_PSL_SampleLost_Connector_stub \ DDS_PSL_SL_Connector_lem_stub \ DDS_PSL_SampleLost_Base_stub \ - DDS_PSL_SampleLost_Connector_exec \ - DDS4CCM_lem_stub + DDS_PSL_SampleLost_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc index a0d3d486f74..70418875765 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_PSL_SampleLost_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Receiver_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Receiver_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc index 40692e28eec..111cbfd9a01 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_PSL_SampleLost_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Sender_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub +project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Sender_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub +project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_PSL_SampleLost_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub + DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc index 7b42906282e..f8755973434 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc @@ -84,14 +84,13 @@ project(PortUsageEvent_Component_stub) : ccm_stub, dds4ccm_base { } } -project(PortUsageEvent_Component_exec) : ciao_executor, dds4ccm_base { +project(PortUsageEvent_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += PortUsageEvent_Component_lem_stub PortUsageEvent_Component_stub \ PortUsage_Test_Base_stub PortUsageEvent_Connector_stub \ - PortUsageEvent_Connector_lem_stub DDS4CCM_lem_stub + PortUsageEvent_Connector_lem_stub sharedname = EventComponent_exec libs += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \ - PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub \ - DDS4CCM_lem_stub + PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(PortUsageEvent_Component_exec) : ciao_executor, dds4ccm_base { } -project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_base { +project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += PortUsageEvent_Component_lem_stub PortUsage_Test_Base_stub \ PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \ - PortUsageEvent_Component_exec PortUsageEvent_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + PortUsageEvent_Component_exec PortUsageEvent_Connector_lem_stub sharedname = EventComponent_svnt libs += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \ PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \ - EventComponent_exec PortUsageEvent_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + EventComponent_exec PortUsageEvent_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc index 9a287ad488a..7ea5de29d75 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc @@ -32,9 +32,9 @@ project(PortUsageEvent_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(PortUsageEvent_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub DDS4CCM_lem_stub - libs += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub DDS4CCM_lem_stub +project(PortUsageEvent_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub + libs += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(PortUsageEvent_Connector_stub) : ccm_stub, dds4ccm_base { } project(PortUsageEvent_Connector_exec) : ciao_executor, dds4ccm_impl { - after += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_stub DDS4CCM_lem_stub PortUsage_Test_Base_stub + after += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_stub PortUsage_Test_Base_stub sharedname = PortUsageEvent_Connector_exec - libs += PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub PortUsage_Test_Base_stub DDS4CCM_lem_stub PortUsage_Test_Base_stub + libs += PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(PortUsageEvent_Connector_exec) : ciao_executor, dds4ccm_impl { project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub DDS4CCM_lem_stub + after += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub sharedname = PortUsageEvent_Connector_svnt libs += PortUsageEvent_Connector_stub \ PortUsageEvent_Connector_lem_stub \ PortUsage_Test_Base_stub \ - PortUsageEvent_Connector_exec \ - DDS4CCM_lem_stub + PortUsageEvent_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc index b6dc6707d51..a5ab91efbae 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc @@ -84,14 +84,13 @@ project(PortUsageState_Component_stub) : ccm_stub, dds4ccm_base { } } -project(PortUsageState_Component_exec) : ciao_executor, dds4ccm_base { +project(PortUsageState_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += PortUsageState_Component_lem_stub PortUsageState_Component_stub \ PortUsage_Test_Base_stub PortUsageState_Connector_stub \ - PortUsageState_Connector_lem_stub DDS4CCM_lem_stub + PortUsageState_Connector_lem_stub sharedname = StateComponent_exec libs += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \ - PortUsageState_Connector_stub PortUsageState_Connector_lem_stub \ - DDS4CCM_lem_stub + PortUsageState_Connector_stub PortUsageState_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(PortUsageState_Component_exec) : ciao_executor, dds4ccm_base { } -project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_base { +project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += PortUsageState_Component_lem_stub PortUsage_Test_Base_stub \ PortUsageState_Connector_stub PortUsageState_Connector_svnt \ - PortUsageState_Component_exec PortUsageState_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + PortUsageState_Component_exec PortUsageState_Connector_lem_stub sharedname = StateComponent_svnt libs += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \ PortUsageState_Connector_stub PortUsageState_Connector_svnt \ - StateComponent_exec PortUsageState_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + StateComponent_exec PortUsageState_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc index 4a5f5abf607..cab9c0ca48a 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc @@ -32,9 +32,9 @@ project(PortUsageState_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(PortUsageState_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub DDS4CCM_lem_stub - libs += PortUsage_Test_Base_stub PortUsageState_Connector_stub DDS4CCM_lem_stub +project(PortUsageState_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub + libs += PortUsage_Test_Base_stub PortUsageState_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(PortUsageState_Connector_stub) : ccm_stub, dds4ccm_base { } project(PortUsageState_Connector_exec) : ciao_executor, dds4ccm_impl { - after += PortUsageState_Connector_lem_stub PortUsageState_Connector_stub DDS4CCM_lem_stub PortUsage_Test_Base_stub + after += PortUsageState_Connector_lem_stub PortUsageState_Connector_stub PortUsage_Test_Base_stub sharedname = PortUsageState_Connector_exec - libs += PortUsageState_Connector_stub PortUsageState_Connector_lem_stub PortUsage_Test_Base_stub DDS4CCM_lem_stub PortUsage_Test_Base_stub + libs += PortUsageState_Connector_stub PortUsageState_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(PortUsageState_Connector_exec) : ciao_executor, dds4ccm_impl { project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub DDS4CCM_lem_stub + after += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub sharedname = PortUsageState_Connector_svnt libs += PortUsageState_Connector_stub \ PortUsageState_Connector_lem_stub \ PortUsage_Test_Base_stub \ - PortUsageState_Connector_exec \ - DDS4CCM_lem_stub + PortUsageState_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc index a921dc9f998..14e3468a0ba 100755 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc @@ -84,14 +84,13 @@ project(QosProfile_Test_Component_stub) : ccm_stub, dds4ccm_base { } } -project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_base { +project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += QosProfile_Test_Component_lem_stub QosProfile_Test_Component_stub \ QosProfile_Test_Base_stub QosProfile_Test_Connector_stub \ - QosProfile_Test_Connector_lem_stub DDS4CCM_lem_stub + QosProfile_Test_Connector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub QosProfile_Test_Base_stub \ - QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_base { } -project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_base { +project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QosProfile_Test_Component_lem_stub QosProfile_Test_Base_stub \ QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \ - QosProfile_Test_Component_exec QosProfile_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + QosProfile_Test_Component_exec QosProfile_Test_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub QosProfile_Test_Base_stub \ QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \ - Component_exec QosProfile_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec QosProfile_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc index 548c1197389..d72b9cbc98d 100755 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc @@ -32,9 +32,9 @@ project(QosProfile_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(QosProfile_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub DDS4CCM_lem_stub - libs += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub DDS4CCM_lem_stub +project(QosProfile_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub + libs += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(QosProfile_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(QosProfile_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_stub DDS4CCM_lem_stub QosProfile_Test_Base_stub + after += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_stub QosProfile_Test_Base_stub sharedname = QosProfile_Test_Connector_exec - libs += QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub QosProfile_Test_Base_stub DDS4CCM_lem_stub QosProfile_Test_Base_stub + libs += QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub QosProfile_Test_Base_stub QosProfile_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(QosProfile_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub DDS4CCM_lem_stub + after += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub sharedname = QosProfile_Test_Connector_svnt libs += QosProfile_Test_Connector_stub \ QosProfile_Test_Connector_lem_stub \ QosProfile_Test_Base_stub \ - QosProfile_Test_Connector_exec \ - DDS4CCM_lem_stub + QosProfile_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc index 02991ba09fb..53e453e7139 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc @@ -32,10 +32,10 @@ project(QC_Different_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(QC_Different_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(QC_Different_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += QC_Different_Test_Connector_lem_gen QC_Different_Test_Connector_stub \ - QC_Different_Test_Base_stub DDS4CCM_lem_stub - libs += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub DDS4CCM_lem_stub + QC_Different_Test_Base_stub + libs += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -87,10 +87,10 @@ project(QC_Different_Test_Connector_stub) : ccm_stub, dds4ccm_base { project(QC_Different_Test_Connector_exec) : ciao_executor, dds4ccm_impl { after += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub \ - DDS4CCM_lem_stub QC_Different_Test_Base_stub + QC_Different_Test_Base_stub sharedname = QC_Different_Test_Connector_exec libs += QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub \ - QC_Different_Test_Base_stub DDS4CCM_lem_stub QC_Different_Test_Base_stub + QC_Different_Test_Base_stub QC_Different_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -115,13 +115,12 @@ project(QC_Different_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { after += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_exec \ - QC_Different_Test_Connector_stub DDS4CCM_lem_stub + QC_Different_Test_Connector_stub sharedname = QC_Different_Test_Connector_svnt libs += QC_Different_Test_Connector_stub \ QC_Different_Test_Connector_lem_stub \ QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_exec \ - DDS4CCM_lem_stub + QC_Different_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc index eb65a5d3b86..4fd3cbfd937 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(QC_Different_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(QC_Different_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(QC_Different_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += QC_Different_Test_Receiver_lem_stub QC_Different_Test_Receiver_stub \ QC_Different_Test_Base_stub QC_Different_Test_Connector_stub \ - QC_Different_Test_Connector_lem_stub DDS4CCM_lem_stub + QC_Different_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(QC_Different_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QC_Different_Test_Receiver_lem_stub QC_Different_Test_Base_stub \ QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ - QC_Different_Test_Receiver_exec QC_Different_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + QC_Different_Test_Receiver_exec QC_Different_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \ QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ - Receiver_exec QC_Different_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec QC_Different_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc index bd3373494ed..27b3c350f94 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc @@ -85,14 +85,12 @@ project(QC_Different_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(QC_Different_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(QC_Different_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += QC_Different_Test_Sender_lem_stub QC_Different_Test_Sender_stub \ - QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub \ - DDS4CCM_lem_stub + QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \ - QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub \ - DDS4CCM_lem_stub + QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(QC_Different_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QC_Different_Test_Base_stub QC_Different_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel QC_Different_Test_Connector_stub \ + QC_Different_Test_Connector_stub \ QC_Different_Test_Connector_svnt QC_Different_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \ + QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \ QC_Different_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc index b4b86693f1a..9bb5e407515 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_QCLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_QCLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_QCLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub + libs += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_QCLE_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_QCLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub DDS4CCM_lem_stub DDS_QCLE_Test_Base_stub + after += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub sharedname = DDS_QCLE_Test_Connector_exec - libs += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Base_stub DDS4CCM_lem_stub DDS_QCLE_Test_Base_stub + libs += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_QCLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub sharedname = DDS_QCLE_Test_Connector_svnt libs += DDS_QCLE_Test_Connector_stub \ DDS_QCLE_Test_Connector_lem_stub \ DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_QCLE_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc index 2f0f739c7f3..a1e9d69441b 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_QCLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_QCLE_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_QCLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Receiver_stub \ DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub \ - DDS_QCLE_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_QCLE_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_QCLE_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Base_stub \ DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ - DDS_QCLE_Test_Receiver_exec DDS_QCLE_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_QCLE_Test_Receiver_exec DDS_QCLE_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \ DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ - Receiver_exec DDS_QCLE_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_QCLE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc index 7bc38c4b089..5a17aaa90ca 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_QCLE_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_QCLE_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_QCLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_QCLE_Test_Sender_lem_stub DDS_QCLE_Test_Sender_stub \ - DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \ - DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_QCLE_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_QCLE_Test_Connector_stub \ + DDS_QCLE_Test_Connector_stub \ DDS_QCLE_Test_Connector_svnt DDS_QCLE_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \ + DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \ DDS_QCLE_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc index cb43ee81c90..94d1d42f37a 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc @@ -81,12 +81,10 @@ project(QC_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base { } -project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_base { - after += QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel +project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub sharedname = QC_ReadGet_Starter_svnt - libs += QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc index d1f06e889c4..12f3cc89114 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc @@ -32,10 +32,10 @@ project(QC_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(QC_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(QC_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += QC_ReadGet_Test_Connector_lem_gen QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Base_stub DDS4CCM_lem_stub - libs += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub DDS4CCM_lem_stub + QC_ReadGet_Test_Base_stub + libs += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -87,10 +87,10 @@ project(QC_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base { project(QC_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl { after += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \ - DDS4CCM_lem_stub QC_ReadGet_Test_Base_stub + QC_ReadGet_Test_Base_stub sharedname = QC_ReadGet_Test_Connector_exec libs += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \ - QC_ReadGet_Test_Base_stub DDS4CCM_lem_stub QC_ReadGet_Test_Base_stub + QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -115,13 +115,12 @@ project(QC_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { after += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_exec \ - QC_ReadGet_Test_Connector_stub DDS4CCM_lem_stub + QC_ReadGet_Test_Connector_stub sharedname = QC_ReadGet_Test_Connector_svnt libs += QC_ReadGet_Test_Connector_stub \ QC_ReadGet_Test_Connector_lem_stub \ QC_ReadGet_Test_Base_stub \ - QC_ReadGet_Test_Connector_exec \ - DDS4CCM_lem_stub + QC_ReadGet_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc index d9efc9cb2c4..6b074df52d9 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(QC_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Receiver_stub \ QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Test_Connector_lem_stub DDS4CCM_lem_stub \ + QC_ReadGet_Test_Connector_lem_stub \ QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \ QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \ - DDS4CCM_lem_stub QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub + QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Base_stub \ QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ QC_ReadGet_Test_Receiver_exec QC_ReadGet_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel QC_ReadGet_Starter_stub \ + QC_ReadGet_Starter_stub \ QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \ QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ - Receiver_exec QC_ReadGet_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \ + Receiver_exec QC_ReadGet_Test_Connector_lem_stub \ + QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \ QC_ReadGet_Starter_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc index 5fabebd2750..5a6fbcd89ea 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc @@ -87,14 +87,14 @@ project(QC_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(QC_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(QC_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += QC_ReadGet_Test_Sender_lem_stub QC_ReadGet_Test_Sender_stub \ QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \ - DDS4CCM_lem_stub QC_ReadGet_Starter_lem_stub + QC_ReadGet_Starter_lem_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \ QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \ - QC_ReadGet_Starter_stub DDS4CCM_lem_stub QC_ReadGet_Starter_lem_stub \ + QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub \ QC_ReadGet_Starter_lem_stub libpaths += ../lib includes += .. @@ -118,15 +118,15 @@ project(QC_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel QC_ReadGet_Test_Connector_stub \ + QC_ReadGet_Test_Connector_stub \ QC_ReadGet_Test_Connector_svnt QC_ReadGet_Test_Connector_lem_stub \ QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \ QC_ReadGet_Starter_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \ + QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \ QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Starter_stub \ QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc index 0fe0d60f9c7..280a7b459b5 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_QCLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_QCLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_QCLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub + libs += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_QCLS_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_QCLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub DDS4CCM_lem_stub DDS_QCLS_Test_Base_stub + after += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub sharedname = DDS_QCLS_Test_Connector_exec - libs += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Base_stub DDS4CCM_lem_stub DDS_QCLS_Test_Base_stub + libs += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_QCLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub sharedname = DDS_QCLS_Test_Connector_svnt libs += DDS_QCLS_Test_Connector_stub \ DDS_QCLS_Test_Connector_lem_stub \ DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_QCLS_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc index 015a9deb178..40f25e6eacc 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_QCLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_QCLS_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_QCLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Receiver_stub \ DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub \ - DDS_QCLS_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_QCLS_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_QCLS_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Base_stub \ DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ - DDS_QCLS_Test_Receiver_exec DDS_QCLS_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_QCLS_Test_Receiver_exec DDS_QCLS_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \ DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ - Receiver_exec DDS_QCLS_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_QCLS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc index a68957f5eb2..39fab9e9c7e 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_QCLS_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_QCLS_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_QCLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_QCLS_Test_Sender_lem_stub DDS_QCLS_Test_Sender_stub \ - DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \ - DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_QCLS_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_QCLS_Test_Connector_stub \ + DDS_QCLS_Test_Connector_stub \ DDS_QCLS_Test_Connector_svnt DDS_QCLS_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \ + DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \ DDS_QCLS_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc index ac4d21150d6..b8c87f6b474 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_QCTL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_QCTL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_QCTL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub + libs += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_QCTL_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_QCTL_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub DDS4CCM_lem_stub DDS_QCTL_Test_Base_stub + after += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub sharedname = DDS_QCTL_Test_Connector_exec - libs += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Base_stub DDS4CCM_lem_stub DDS_QCTL_Test_Base_stub + libs += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_QCTL_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub sharedname = DDS_QCTL_Test_Connector_svnt libs += DDS_QCTL_Test_Connector_stub \ DDS_QCTL_Test_Connector_lem_stub \ DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_QCTL_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc index 35e5dcfcdd4..6a301bb798a 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc @@ -84,14 +84,13 @@ project(DDS_QCTL_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_QCTL_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_QCTL_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Receiver_stub \ DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub \ - DDS_QCTL_Test_Connector_lem_stub DDS4CCM_lem_stub + DDS_QCTL_Test_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(DDS_QCTL_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Base_stub \ DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ - DDS_QCTL_Test_Receiver_exec DDS_QCTL_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_QCTL_Test_Receiver_exec DDS_QCTL_Test_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \ DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ - Receiver_exec DDS_QCTL_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Receiver_exec DDS_QCTL_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc index b174a32fc51..82a3680ea61 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc @@ -85,14 +85,12 @@ project(DDS_QCTL_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_QCTL_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_QCTL_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_QCTL_Test_Sender_lem_stub DDS_QCTL_Test_Sender_stub \ - DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \ - DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -115,13 +113,13 @@ project(DDS_QCTL_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_QCTL_Test_Connector_stub \ + DDS_QCTL_Test_Connector_stub \ DDS_QCTL_Test_Connector_svnt DDS_QCTL_Test_Connector_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \ + DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \ DDS_QCTL_Test_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc index e1ece448b43..3c76cb764f3 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc @@ -81,12 +81,10 @@ project(QC_QCTQ_Starter_stub) : ccm_stub, dds4ccm_base { } -project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_base { - after += QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel +project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub sharedname = QC_QCTQ_Starter_svnt - libs += QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc index b1d8d9ab0d7..328ea31df85 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc @@ -32,10 +32,10 @@ project(QC_QCTQ_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(QC_QCTQ_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(QC_QCTQ_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += QC_QCTQ_Test_Connector_lem_gen QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Base_stub DDS4CCM_lem_stub - libs += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub DDS4CCM_lem_stub + QC_QCTQ_Test_Base_stub + libs += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -87,10 +87,10 @@ project(QC_QCTQ_Test_Connector_stub) : ccm_stub, dds4ccm_base { project(QC_QCTQ_Test_Connector_exec) : ciao_executor, dds4ccm_impl { after += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \ - DDS4CCM_lem_stub QC_QCTQ_Test_Base_stub + QC_QCTQ_Test_Base_stub sharedname = QC_QCTQ_Test_Connector_exec libs += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \ - QC_QCTQ_Test_Base_stub DDS4CCM_lem_stub QC_QCTQ_Test_Base_stub + QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -115,13 +115,12 @@ project(QC_QCTQ_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { after += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_exec \ - QC_QCTQ_Test_Connector_stub DDS4CCM_lem_stub + QC_QCTQ_Test_Connector_stub sharedname = QC_QCTQ_Test_Connector_svnt libs += QC_QCTQ_Test_Connector_stub \ QC_QCTQ_Test_Connector_lem_stub \ QC_QCTQ_Test_Base_stub \ - QC_QCTQ_Test_Connector_exec \ - DDS4CCM_lem_stub + QC_QCTQ_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc index 94c76586ab1..666cb739f3a 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(QC_QCTQ_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(QC_QCTQ_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(QC_QCTQ_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Receiver_stub \ QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Test_Connector_lem_stub DDS4CCM_lem_stub \ + QC_QCTQ_Test_Connector_lem_stub \ QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \ QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \ - DDS4CCM_lem_stub QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub + QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(QC_QCTQ_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Base_stub \ QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ QC_QCTQ_Test_Receiver_exec QC_QCTQ_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel QC_QCTQ_Starter_stub \ + QC_QCTQ_Starter_stub \ QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \ QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ - Receiver_exec QC_QCTQ_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \ + Receiver_exec QC_QCTQ_Test_Connector_lem_stub \ + QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \ QC_QCTQ_Starter_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc index 8624ffe42a0..7fc08d3de25 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc @@ -87,14 +87,14 @@ project(QC_QCTQ_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(QC_QCTQ_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(QC_QCTQ_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += QC_QCTQ_Test_Sender_lem_stub QC_QCTQ_Test_Sender_stub \ QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \ - DDS4CCM_lem_stub QC_QCTQ_Starter_lem_stub + QC_QCTQ_Starter_lem_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \ QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \ - QC_QCTQ_Starter_stub DDS4CCM_lem_stub QC_QCTQ_Starter_lem_stub \ + QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub \ QC_QCTQ_Starter_lem_stub libpaths += ../lib includes += .. @@ -118,15 +118,15 @@ project(QC_QCTQ_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel QC_QCTQ_Test_Connector_stub \ + QC_QCTQ_Test_Connector_stub \ QC_QCTQ_Test_Connector_svnt QC_QCTQ_Test_Connector_lem_stub \ QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \ QC_QCTQ_Starter_lem_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \ + QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \ QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Starter_stub \ QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc index b5989badd72..ca02024d4da 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc @@ -82,12 +82,10 @@ project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base { } -project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + libs += Reader_Starter_stub Reader_Starter_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc index 54d042d867b..c5051492881 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Reader_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_Reader_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub + libs += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Reader_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS4CCM_lem_stub DDS_Reader_Test_Base_stub + after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub sharedname = DDS_Reader_Test_Connector_exec - libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS4CCM_lem_stub DDS_Reader_Test_Base_stub + libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS_Reader_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub DDS4CCM_lem_stub + after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub sharedname = DDS_Reader_Test_Connector_svnt libs += DDS_Reader_Test_Connector_stub \ DDS_Reader_Test_Connector_lem_stub \ DDS_Reader_Test_Base_stub \ - DDS_Reader_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_Reader_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc index 821c42afad1..e3cc08db939 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc @@ -87,15 +87,15 @@ project(DDS_Reader_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Receiver_stub \ DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \ - DDS_Reader_Test_Connector_lem_stub DDS4CCM_lem_stub \ + DDS_Reader_Test_Connector_lem_stub \ DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \ DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub \ - DDS4CCM_lem_stub Reader_Starter_lem_stub Reader_Starter_stub + Reader_Starter_lem_stub Reader_Starter_stub libpaths += ../lib libout = ../lib includes += .. @@ -118,17 +118,17 @@ project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Base_stub \ DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ DDS_Reader_Test_Receiver_exec DDS_Reader_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Reader_Starter_stub \ + DDS_Reader_Starter_stub \ DDS_Reader_Starter_svnt DDS_Reader_Starter_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \ DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ - Receiver_exec DDS_Reader_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Reader_Starter_stub Reader_Starter_svnt \ + Receiver_exec DDS_Reader_Test_Connector_lem_stub \ + Reader_Starter_stub Reader_Starter_svnt \ Reader_Starter_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc index 51e144d311f..5677d410fcb 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc @@ -87,14 +87,13 @@ project(DDS_Reader_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_Reader_Test_Sender_lem_stub DDS_Reader_Test_Sender_stub \ - DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub \ - DDS4CCM_lem_stub + DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \ DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub \ - Reader_Starter_stub DDS4CCM_lem_stub + Reader_Starter_stub libpaths += ../lib includes += .. libout = ../lib @@ -117,14 +116,14 @@ project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_Reader_Test_Base_stub DDS_Reader_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Reader_Test_Connector_stub \ + DDS_Reader_Test_Connector_stub \ DDS_Reader_Test_Connector_svnt DDS_Reader_Test_Connector_lem_stub \ DDS_Reader_Starter_stub sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ + libs += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \ + DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \ DDS_Reader_Test_Connector_lem_stub Reader_Starter_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc index c0bf39ab357..c56b0d5ac3a 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SL_OC_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub DDS4CCM_lem_stub - libs += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub +project(DDS_SL_OC_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub + libs += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_SL_Disabled_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub DDS_SL_Disabled_Base_stub + after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub sharedname = DDS_SL_Disabled_Connector_exec - libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS4CCM_lem_stub DDS_SL_Disabled_Base_stub + libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub + after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub sharedname = DDS_SL_Disabled_Connector_svnt libs += DDS_SL_Disabled_Connector_stub \ DDS_SL_OC_Connector_lem_stub \ DDS_SL_Disabled_Base_stub \ - DDS_SL_Disabled_Connector_exec \ - DDS4CCM_lem_stub + DDS_SL_Disabled_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc index 19b8f0ef1d2..c3c8bc0aef2 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_SL_Disabled_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Receiver_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Receiver_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc index b74ffa8d3c0..f833d213b00 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_SL_Disabled_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Sender_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub +project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Sender_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub +project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_SL_Disabled_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub + DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc index 29190ca99e4..c2ab7baeb2f 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SL_MBM_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub DDS4CCM_lem_stub - libs += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub +project(DDS_SL_MBM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub + libs += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_SL_ManyByMany_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub DDS_SL_ManyByMany_Base_stub + after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub sharedname = DDS_SL_ManyByMany_Connector_exec - libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS4CCM_lem_stub DDS_SL_ManyByMany_Base_stub + libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub + after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub sharedname = DDS_SL_ManyByMany_Connector_svnt libs += DDS_SL_ManyByMany_Connector_stub \ DDS_SL_MBM_Connector_lem_stub \ DDS_SL_ManyByMany_Base_stub \ - DDS_SL_ManyByMany_Connector_exec \ - DDS4CCM_lem_stub + DDS_SL_ManyByMany_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc index ccdc192ef52..7f2b8733876 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_SL_ManyByMany_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Receiver_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Receiver_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc index 8dd50db8433..e364cebe383 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_SL_ManyByMany_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Sender_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub +project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Sender_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub +project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_SL_ManyByMany_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub + DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc index 70abc28cdef..55ad3afdc19 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SL_OBO_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub DDS4CCM_lem_stub - libs += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub +project(DDS_SL_OBO_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub + libs += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_SL_OneByOne_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub DDS_SL_OneByOne_Base_stub + after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub sharedname = DDS_SL_OneByOne_Connector_exec - libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS4CCM_lem_stub DDS_SL_OneByOne_Base_stub + libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub + after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub sharedname = DDS_SL_OneByOne_Connector_svnt libs += DDS_SL_OneByOne_Connector_stub \ DDS_SL_OBO_Connector_lem_stub \ DDS_SL_OneByOne_Base_stub \ - DDS_SL_OneByOne_Connector_exec \ - DDS4CCM_lem_stub + DDS_SL_OneByOne_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc index cc099de67c1..9cf0b955d26 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_SL_OneByOne_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Receiver_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Receiver_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc index 98e1844f2f1..60c69f44135 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_SL_OneByOne_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Sender_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub +project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Sender_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub +project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_SL_OneByOne_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub + DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc index 0c724a98152..34d08cabcb9 100755 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc @@ -84,14 +84,13 @@ project(SetAttribute_Component_stub) : ccm_stub, dds4ccm_base { } } -project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl { +project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_impl { after += SetAttribute_Component_lem_stub SetAttribute_Component_stub \ DDS_SCABase_stub DDS_SCAConnector_stub \ - DDS_SCAConnector_lem_stub DDS4CCM_lem_stub + DDS_SCAConnector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub DDS_SCABase_stub \ - DDS_SCAConnector_stub DDS_SCAConnector_lem_stub \ - DDS4CCM_lem_stub + DDS_SCAConnector_stub DDS_SCAConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl } -project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_base { +project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += SetAttribute_Component_lem_stub DDS_SCABase_stub \ DDS_SCAConnector_stub DDS_SCAConnector_svnt \ - SetAttribute_Component_exec DDS_SCAConnector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + SetAttribute_Component_exec DDS_SCAConnector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub DDS_SCABase_stub \ DDS_SCAConnector_stub DDS_SCAConnector_svnt \ - Component_exec DDS_SCAConnector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec DDS_SCAConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc index 643f3523918..b85f34d4e3a 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub DDS4CCM_lem_stub - libs += DDS_SCABase_stub DDS_SCAConnector_stub DDS4CCM_lem_stub +project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub + libs += DDS_SCABase_stub DDS_SCAConnector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_SCAConnector_stub) : ccm_stub, dds4ccm_base { } project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS4CCM_lem_stub DDS_SCABase_stub + after += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS_SCABase_stub sharedname = DDS_SCAConnector_exec - libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS4CCM_lem_stub DDS_SCABase_stub + libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS_SCABase_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl { project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub DDS4CCM_lem_stub + after += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub sharedname = DDS_SCAConnector_svnt libs += DDS_SCAConnector_stub \ DDS_SCAConnector_lem_stub \ DDS_SCABase_stub \ - DDS_SCAConnector_exec \ - DDS4CCM_lem_stub + DDS_SCAConnector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc index 91cfeeb566b..a85446b5b15 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc @@ -86,18 +86,16 @@ project(DDS_SharedDP_DDComponent_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl { +project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_impl { after += DDS_SharedDP_DDComponent_lem_stub DDS_SharedDP_DDComponent_stub \ DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub \ DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub \ DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub \ - DDS4CCM_lem_stub CIAO_DDS4CCM_DDS_Impl sharedname = Component_exec libs += Component_stub Component_lem_stub DDS_SharedDP_DDBase_stub \ DDS_Connector1_lem_stub DDS_Connector1_stub \ DDS_Connector2_lem_stub DDS_Connector2_stub \ - DDS_Connector3_lem_stub DDS_Connector3_stub \ - DDS4CCM_lem_stub + DDS_Connector3_lem_stub DDS_Connector3_stub libpaths += ../lib includes += .. libout = ../lib @@ -120,15 +118,14 @@ project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_im } -project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_base { +project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_SharedDP_DDBase_stub DDS_SharedDP_DDComponent_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel \ DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector1_svnt DDS_SharedDP_Connector1_lem_stub \ DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector2_svnt DDS_SharedDP_Connector2_lem_stub \ DDS_SharedDP_Connector3_stub DDS_SharedDP_Connector3_svnt DDS_SharedDP_Connector3_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub \ - DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS4CCM_skel \ + DDS_SharedDP_DDBase_stub \ DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \ DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \ DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc index 1f876451431..cbdfc31a238 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc @@ -31,9 +31,9 @@ project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub - libs += DDS_SharedDP_DDBase_stub DDS_Connector1_stub DDS4CCM_lem_stub +project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub + libs += DDS_SharedDP_DDBase_stub DDS_Connector1_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_SharedDP_Connector1_stub) : ccm_stub, dds4ccm_base { } project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub + after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub sharedname = DDS_Connector1_exec - libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub + libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,13 +110,12 @@ project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl { project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub DDS4CCM_lem_stub + after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub sharedname = DDS_Connector1_svnt libs += DDS_Connector1_stub \ DDS_Connector1_lem_stub \ DDS_SharedDP_DDBase_stub \ - DDS_Connector1_exec \ - DDS4CCM_lem_stub + DDS_Connector1_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc index 11e37e75918..73573bac8ea 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc @@ -31,9 +31,9 @@ project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub - libs += DDS_SharedDP_DDBase_stub DDS_Connector2_stub DDS4CCM_lem_stub +project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub + libs += DDS_SharedDP_DDBase_stub DDS_Connector2_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_SharedDP_Connector2_stub) : ccm_stub, dds4ccm_base { } project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub + after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub sharedname = DDS_Connector2_exec - libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub + libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,13 +110,12 @@ project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl { project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub DDS4CCM_lem_stub + after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub sharedname = DDS_Connector2_svnt libs += DDS_Connector2_stub \ DDS_Connector2_lem_stub \ DDS_SharedDP_DDBase_stub \ - DDS_Connector2_exec \ - DDS4CCM_lem_stub + DDS_Connector2_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc index c1c318be933..3084ea5d5e5 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc @@ -31,9 +31,9 @@ project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub - libs += DDS_SharedDP_DDBase_stub DDS_Connector3_stub DDS4CCM_lem_stub +project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub + libs += DDS_SharedDP_DDBase_stub DDS_Connector3_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_SharedDP_Connector3_stub) : ccm_stub, dds4ccm_base { } project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub + after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub sharedname = DDS_Connector3_exec - libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub + libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,13 +110,12 @@ project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl { project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub DDS4CCM_lem_stub + after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub sharedname = DDS_Connector3_svnt libs += DDS_Connector3_stub \ DDS_Connector3_lem_stub \ DDS_SharedDP_DDBase_stub \ - DDS_Connector3_exec \ - DDS4CCM_lem_stub + DDS_Connector3_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc index 4840be4cd90..00f2dedd90f 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc @@ -84,14 +84,12 @@ project(DDS_SharedDPComponent_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl { +project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_impl { after += DDS_SharedDPComponent_lem_stub DDS_SharedDPComponent_stub \ - DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub \ - DDS4CCM_lem_stub + DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub sharedname = Component_exec libs += Component_stub Component_lem_stub DDS_SharedDPBase_stub \ - DDS_Connector_lem_stub DDS_Connector_stub \ - DDS4CCM_lem_stub + DDS_Connector_lem_stub DDS_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -114,14 +112,13 @@ project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl } -project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_base { +project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_SharedDPBase_stub DDS_SharedDPComponent_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel \ DDS_SharedDP_Connector_stub DDS_SharedDP_Connector_svnt \ DDS_SharedDP_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub \ - DDS_SharedDPBase_stub DDS4CCM_lem_stub DDS4CCM_skel \ + DDS_SharedDPBase_stub \ DDS_Connector_stub DDS_Connector_svnt DDS_Connector_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc index b992e8c472a..f2e187fdeba 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc @@ -31,9 +31,9 @@ project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SharedDP_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub DDS4CCM_lem_stub - libs += DDS_SharedDPBase_stub DDS_Connector_stub DDS4CCM_lem_stub +project(DDS_SharedDP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub + libs += DDS_SharedDPBase_stub DDS_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_SharedDP_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS4CCM_lem_stub DDS_SharedDPBase_stub + after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub sharedname = DDS_Connector_exec - libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS4CCM_lem_stub DDS_SharedDPBase_stub + libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS_SharedDPBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -110,13 +110,12 @@ project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub DDS4CCM_lem_stub + after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub sharedname = DDS_Connector_svnt libs += DDS_Connector_stub \ DDS_Connector_lem_stub \ DDS_SharedDPBase_stub \ - DDS_Connector_exec \ - DDS4CCM_lem_stub + DDS_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc index 2841637c40d..f7d970dcca9 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub DDS4CCM_lem_stub - libs += DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS4CCM_lem_stub +project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub + libs += DDS_SCT_Base_stub DDS_SCT_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_SCT_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS4CCM_lem_stub DDS_SCT_Base_stub + after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub sharedname = DDS_SCT_Connector_exec - libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS4CCM_lem_stub DDS_SCT_Base_stub + libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS_SCT_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub DDS4CCM_lem_stub + after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub sharedname = DDS_SCT_Connector_svnt libs += DDS_SCT_Connector_stub \ DDS_SCT_Connector_lem_stub \ DDS_SCT_Base_stub \ - DDS_SCT_Connector_exec \ - DDS4CCM_lem_stub + DDS_SCT_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc index cc2fd4dc5d2..92866a73ea8 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_SCT_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_SCT_Receiver_lem_stub DDS_SCT_Receiver_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_SCT_Receiver_lem_stub DDS_SCT_Receiver_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc index c07010a17f4..c02f131cb1d 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc @@ -109,11 +109,11 @@ project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_SCT_Base_stub DDS_SCT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub +project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_SCT_Base_stub DDS_SCT_Sender_lem_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_SCT_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub + DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc index b401f006520..fd28afa04ff 100755 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub +project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub + libs += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_TwoTopics_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_stub + after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub sharedname = DDS_TwoTopics_Connector_exec - libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_stub + libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS_TwoTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub + after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub sharedname = DDS_TwoTopics_Connector_svnt libs += DDS_TwoTopics_Connector_stub \ DDS_TwoTopics_Connector_lem_stub \ DDS_TwoTopics_Base_stub \ - DDS_TwoTopics_Connector_exec \ - DDS4CCM_lem_stub + DDS_TwoTopics_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc index fa57ed6b392..a84d2d0f415 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc @@ -31,11 +31,10 @@ project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += DDS_TTDN_Connector_lem_gen DDS_TTDN_Connector_stub \ - DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ - DDS4CCM_lem_stub - libs += DDS_Connector_stub DDS4CCM_lem_stub \ + DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub + libs += DDS_Connector_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub libpaths += ../lib libout = ../lib @@ -88,10 +87,10 @@ project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub DDS4CCM_lem_stub \ + after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub - libs += DDS_Connector_stub DDS_Connector_lem_stub DDS4CCM_lem_stub \ + libs += DDS_Connector_stub DDS_Connector_lem_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub sharedname = DDS_Connector_exec @@ -120,12 +119,11 @@ project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_exec \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ - DDS_TTDN_Connector_stub DDS4CCM_lem_stub + DDS_TTDN_Connector_stub libs += DDS_Connector_stub \ DDS_Connector_lem_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ - DDS_Connector_exec \ - DDS4CCM_lem_stub + DDS_Connector_exec sharedname = DDS_Connector_svnt libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc index ec7f91f579c..ee1b077b410 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc @@ -32,10 +32,10 @@ project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_Unkeyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(DDS_Unkeyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += DDS_Unkeyed_Test_Connector_lem_gen DDS_Unkeyed_Test_Connector_stub \ - DDS_Unkeyed_Test_Base_stub DDS4CCM_lem_stub - libs += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_stub + DDS_Unkeyed_Test_Base_stub + libs += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -87,10 +87,10 @@ project(DDS_Unkeyed_Test_Connector_stub) : ccm_stub, dds4ccm_base { project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { after += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub \ - DDS4CCM_lem_stub DDS_Unkeyed_Test_Base_stub + DDS_Unkeyed_Test_Base_stub sharedname = DDS_Unkeyed_Test_Connector_exec libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub \ - DDS_Unkeyed_Test_Base_stub DDS4CCM_lem_stub DDS_Unkeyed_Test_Base_stub + DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -115,13 +115,12 @@ project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_exec \ - DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_stub + DDS_Unkeyed_Test_Connector_stub sharedname = DDS_Unkeyed_Test_Connector_svnt libs += DDS_Unkeyed_Test_Connector_stub \ DDS_Unkeyed_Test_Connector_lem_stub \ DDS_Unkeyed_Test_Base_stub \ - DDS_Unkeyed_Test_Connector_exec \ - DDS4CCM_lem_stub + DDS_Unkeyed_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc index 241402b0302..1bc5eb64e43 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_Unkeyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Receiver_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Receiver_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc index ec8283538bd..3ed08340da8 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_Unkeyed_Test_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_stub +project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub +project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_Unkeyed_Test_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub + DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc index 14fd3cb1870..6e65176c578 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc @@ -32,11 +32,10 @@ project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_UnkeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_base { +project(DDS_UnkeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += DDS_UnkeyedWriterConnector_lem_gen DDS_UnkeyedWriterConnector_stub \ - DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub - libs += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub \ - DDS4CCM_lem_stub + DDS_UnkeyedWriterBase_stub + libs += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub libpaths += ../lib libout = ../lib includes += .. @@ -88,10 +87,10 @@ project(DDS_UnkeyedWriterConnector_stub) : ccm_stub, dds4ccm_base { project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl { after += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub \ - DDS4CCM_lem_stub DDS_UnkeyedWriterBase_stub + DDS_UnkeyedWriterBase_stub sharedname = DDS_UnkeyedWriterConnector_exec libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub \ - DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_stub + DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterBase_stub libpaths += ../lib libout = ../lib includes += .. @@ -116,13 +115,12 @@ project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl { project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_exec \ - DDS_UnkeyedWriterConnector_stub DDS4CCM_lem_stub + DDS_UnkeyedWriterConnector_stub sharedname = DDS_UnkeyedWriterConnector_svnt libs += DDS_UnkeyedWriterConnector_stub \ DDS_UnkeyedWriterConnector_lem_stub \ DDS_UnkeyedWriterBase_stub \ - DDS_UnkeyedWriterConnector_exec \ - DDS4CCM_lem_stub + DDS_UnkeyedWriterConnector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc index 8d3f1763e6b..b8a39e62e40 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_UnkeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterReceiver_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub +project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterReceiver_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc index 98085765b92..67d82ffb3f8 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_UnkeyedWriterSender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_base { - after += DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub DDS4CCM_lem_stub +project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterSender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub +project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub + DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc index d4e0426c6c9..26f83636ed4 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_UPDATER_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub DDS4CCM_lem_stub - libs += DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS4CCM_lem_stub +project(DDS_UPDATER_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub + libs += DDS_Updater_Base_stub DDS_Updater_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_Updater_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS4CCM_lem_stub DDS_Updater_Base_stub + after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub sharedname = DDS_Updater_Connector_exec - libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS4CCM_lem_stub DDS_Updater_Base_stub + libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS_Updater_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub DDS4CCM_lem_stub + after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub sharedname = DDS_Updater_Connector_svnt libs += DDS_Updater_Connector_stub \ DDS_UPDATER_Connector_lem_stub \ DDS_Updater_Base_stub \ - DDS_Updater_Connector_exec \ - DDS4CCM_lem_stub + DDS_Updater_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc index dbd06cc3438..8ec2842b0e9 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc @@ -81,10 +81,10 @@ project(DDS_Updater_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_base { - after += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Receiver_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub +project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Receiver_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -107,10 +107,10 @@ project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel +project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc index 364954297d4..c6ac1d95eb5 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc @@ -83,10 +83,10 @@ project(DDS_Updater_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_base { - after += DDS_Updater_Sender_lem_stub DDS_Updater_Sender_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS4CCM_lem_stub +project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_lem_stub { + after += DDS_Updater_Sender_lem_stub DDS_Updater_Sender_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS4CCM_lem_stub + libs += Sender_stub Sender_lem_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -109,11 +109,11 @@ project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Updater_Base_stub DDS_Updater_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub +project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_Updater_Base_stub DDS_Updater_Sender_lem_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ - DDS_Updater_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub + DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc index 2a02e6a2257..3387c891da4 100755 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc @@ -84,14 +84,13 @@ project(UCC_Test_Component_stub) : ccm_stub, dds4ccm_base { } } -project(UCC_Test_Component_exec) : ciao_executor, dds4ccm_base { +project(UCC_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub { after += UCC_Test_Component_lem_stub UCC_Test_Component_stub \ UCC_Test_Base_stub UCC_Test_Connector_stub \ - UCC_Test_Connector_lem_stub DDS4CCM_lem_stub + UCC_Test_Connector_lem_stub sharedname = Component_exec libs += Component_stub Component_lem_stub UCC_Test_Base_stub \ - UCC_Test_Connector_stub UCC_Test_Connector_lem_stub \ - DDS4CCM_lem_stub + UCC_Test_Connector_stub UCC_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,16 +113,14 @@ project(UCC_Test_Component_exec) : ciao_executor, dds4ccm_base { } -project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_base { +project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += UCC_Test_Component_lem_stub UCC_Test_Base_stub \ UCC_Test_Connector_stub UCC_Test_Connector_svnt \ - UCC_Test_Component_exec UCC_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + UCC_Test_Component_exec UCC_Test_Connector_lem_stub sharedname = Component_svnt libs += Component_stub Component_lem_stub UCC_Test_Base_stub \ UCC_Test_Connector_stub UCC_Test_Connector_svnt \ - Component_exec UCC_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel + Component_exec UCC_Test_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc index 16d87ddabcd..7c1f3f74466 100755 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc @@ -32,9 +32,9 @@ project(UCC_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(UCC_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub DDS4CCM_lem_stub - libs += UCC_Test_Base_stub UCC_Test_Connector_stub DDS4CCM_lem_stub +project(UCC_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub + libs += UCC_Test_Base_stub UCC_Test_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(UCC_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(UCC_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += UCC_Test_Connector_lem_stub UCC_Test_Connector_stub DDS4CCM_lem_stub UCC_Test_Base_stub + after += UCC_Test_Connector_lem_stub UCC_Test_Connector_stub UCC_Test_Base_stub sharedname = UCC_Test_Connector_exec - libs += UCC_Test_Connector_stub UCC_Test_Connector_lem_stub UCC_Test_Base_stub DDS4CCM_lem_stub UCC_Test_Base_stub + libs += UCC_Test_Connector_stub UCC_Test_Connector_lem_stub UCC_Test_Base_stub UCC_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(UCC_Test_Connector_exec) : ciao_executor, dds4ccm_impl { project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub DDS4CCM_lem_stub + after += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub sharedname = UCC_Test_Connector_svnt libs += UCC_Test_Connector_stub \ UCC_Test_Connector_lem_stub \ UCC_Test_Base_stub \ - UCC_Test_Connector_exec \ - DDS4CCM_lem_stub + UCC_Test_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc index a8837356842..761b14515bf 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VT_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub DDS4CCM_lem_stub +project(DDS_VT_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VT_Array_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub sharedname = DDS_VT_Array_Connector_exec - libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub DDS4CCM_lem_stub + after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub sharedname = DDS_VT_Array_Connector_svnt libs += DDS_VT_Array_Connector_stub \ DDS_VT_ARRAY_Connector_lem_stub \ DDS_VTopic_Base_stub \ - DDS_VT_Array_Connector_exec \ - DDS4CCM_lem_stub + DDS_VT_Array_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc index aec200c80ef..843a4fa14c7 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VT_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub +project(DDS_VT_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VT_Seq_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub sharedname = DDS_VT_Seq_Connector_exec - libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub + after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub sharedname = DDS_VT_Seq_Connector_svnt libs += DDS_VT_Seq_Connector_stub \ DDS_VT_SEQ_Connector_lem_stub \ DDS_VTopic_Base_stub \ - DDS_VT_Seq_Connector_exec \ - DDS4CCM_lem_stub + DDS_VT_Seq_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc index 6d62047c50f..3e65fa33321 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VT_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub DDS4CCM_lem_stub +project(DDS_VT_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VT_String_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS_VTopic_Base_stub sharedname = DDS_VT_String_Connector_exec - libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub DDS4CCM_lem_stub + after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub sharedname = DDS_VT_String_Connector_svnt libs += DDS_VT_String_Connector_stub \ DDS_VT_STRING_Connector_lem_stub \ DDS_VTopic_Base_stub \ - DDS_VT_String_Connector_exec \ - DDS4CCM_lem_stub + DDS_VT_String_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc index d08a716dd79..c1bb787a5cf 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc @@ -31,9 +31,9 @@ project(DDS_VT_UNION_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VT_UNION_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub DDS4CCM_lem_stub +project(DDS_VT_UNION_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_VT_Union_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VT_Union_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + after += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub sharedname = DDS_VT_Union_Connector_exec - libs += DDS_VT_Union_Connector_stub DDS_VT_UNION_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + libs += DDS_VT_Union_Connector_stub DDS_VT_UNION_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VT_Union_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_exec \ - DDS_VT_Union_Connector_stub DDS4CCM_lem_stub + DDS_VT_Union_Connector_stub sharedname = DDS_VT_Union_Connector_svnt libs += DDS_VT_Union_Connector_stub \ DDS_VT_UNION_Connector_lem_stub \ DDS_VTopic_Base_stub \ - DDS_VT_Union_Connector_exec \ - DDS4CCM_lem_stub + DDS_VT_Union_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc index 8624e17e3f1..0e80dda9817 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc @@ -31,9 +31,9 @@ project(DDS_VT_VALUETYPE_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VT_VALUETYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VT_VALUETYPE_Connector_lem_gen DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopic_Base_stub DDS_VT_Valuetype_Connector_stub DDS4CCM_lem_stub +project(DDS_VT_VALUETYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VT_VALUETYPE_Connector_lem_gen DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Base_stub DDS_VT_Valuetype_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_VT_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VT_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + after += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub sharedname = DDS_VT_Valuetype_Connector_exec - libs += DDS_VT_Valuetype_Connector_stub DDS_VT_VALUETYPE_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + libs += DDS_VT_Valuetype_Connector_stub DDS_VT_VALUETYPE_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VT_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VT_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_exec \ - DDS_VT_Valuetype_Connector_stub DDS4CCM_lem_stub + DDS_VT_Valuetype_Connector_stub sharedname = DDS_VT_Valuetype_Connector_svnt libs += DDS_VT_Valuetype_Connector_stub \ DDS_VT_VALUETYPE_Connector_lem_stub \ DDS_VTopic_Base_stub \ - DDS_VT_Valuetype_Connector_exec \ - DDS4CCM_lem_stub + DDS_VT_Valuetype_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc index 524644f1223..fd8b3fae706 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub DDS4CCM_lem_stub +project(DDS_VTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VTopic_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VTopic_Base_stub sharedname = DDS_VTopic_Connector_exec - libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub + libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub DDS4CCM_lem_stub + after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub sharedname = DDS_VTopic_Connector_svnt libs += DDS_VTopic_Connector_stub \ DDS_VTopic_Connector_lem_stub \ DDS_VTopic_Base_stub \ - DDS_VTopic_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTopic_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc index 56f6c919fb0..7ba401de13a 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc @@ -90,20 +90,19 @@ project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_VTopic_Receiver_lem_stub DDS_VTopic_Receiver_stub \ DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub\ DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \ DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \ DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \ DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \ - DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub \ - DDS4CCM_lem_stub + DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub \ DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \ DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \ - DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub + DDS_VT_Seq_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -126,9 +125,8 @@ project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_VTopic_Base_stub DDS_VTopic_Receiver_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel \ DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \ DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub\ DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \ @@ -138,8 +136,6 @@ project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_base { sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub \ DDS_VTopic_Base_stub \ - DDS4CCM_lem_stub \ - DDS4CCM_skel \ DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \ DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \ DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc index 609f731c6a2..87f0a724472 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc @@ -92,21 +92,20 @@ project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_VTopic_Sender_lem_stub DDS_VTopic_Sender_stub \ DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \ DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \ DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \ DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \ DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \ - DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub \ - DDS4CCM_lem_stub + DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_VTopic_Base_stub \ DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \ DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \ DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \ - DDS_VT_Union_Connector_stub DDS4CCM_lem_stub + DDS_VT_Union_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -129,9 +128,8 @@ project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base { +project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_VTopic_Base_stub DDS_VTopic_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel \ DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub \ DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \ DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \ @@ -141,7 +139,6 @@ project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base { sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ DDS_VTopic_Base_stub \ - DDS4CCM_lem_stub DDS4CCM_skel \ DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \ DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \ DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc index 3d6b34a9aee..336e0b542b1 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTS_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub DDS4CCM_lem_stub +project(DDS_VTS_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub + libs += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VTS_Array_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub sharedname = DDS_VTS_Array_Connector_exec - libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub DDS4CCM_lem_stub + after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub sharedname = DDS_VTS_Array_Connector_svnt libs += DDS_VTS_Array_Connector_stub \ DDS_VTS_ARRAY_Connector_lem_stub \ DDS_VTopics_Base_stub \ - DDS_VTS_Array_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTS_Array_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc index c349893b6af..90adfbca433 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub +project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub + libs += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VTS_Seq_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub sharedname = DDS_VTS_Seq_Connector_exec - libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub + after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub sharedname = DDS_VTS_Seq_Connector_svnt libs += DDS_VTS_Seq_Connector_stub \ DDS_VTS_SEQ_Connector_lem_stub \ DDS_VTopics_Base_stub \ - DDS_VTS_Seq_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTS_Seq_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc index 88cc45548d9..ddf01c3cece 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTS_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub DDS4CCM_lem_stub +project(DDS_VTS_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub + libs += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VTS_String_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub sharedname = DDS_VTS_String_Connector_exec - libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub DDS4CCM_lem_stub + after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub sharedname = DDS_VTS_String_Connector_svnt libs += DDS_VTS_String_Connector_stub \ DDS_VTS_STRING_Connector_lem_stub \ DDS_VTopics_Base_stub \ - DDS_VTS_String_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTS_String_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc index 1abfb1ccbaf..b4f50b4ed17 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc @@ -31,9 +31,9 @@ project(DDS_VTS_Union_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTS_Union_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub DDS4CCM_lem_stub +project(DDS_VTS_Union_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub + libs += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -84,9 +84,9 @@ project(DDS_VTS_Union_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VTS_Union_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + after += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub sharedname = DDS_VTS_Union_Connector_exec - libs += DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + libs += DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VTS_Union_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_exec \ - DDS_VTS_Union_Connector_stub DDS4CCM_lem_stub + DDS_VTS_Union_Connector_stub sharedname = DDS_VTS_Union_Connector_svnt libs += DDS_VTS_Union_Connector_stub \ DDS_VTS_Union_Connector_lem_stub \ DDS_VTopics_Base_stub \ - DDS_VTS_Union_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTS_Union_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc index d70b6701557..71e0ce97349 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc @@ -31,10 +31,10 @@ project(DDS_VTS_Valuetype_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTS_VALUE_TYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_base { +project(DDS_VTS_VALUE_TYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += DDS_VTS_Valuetype_Connector_lem_gen DDS_VTS_Valuetype_Connector_stub \ - DDS_VTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub DDS4CCM_lem_stub + DDS_VTopics_Base_stub + libs += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -86,10 +86,10 @@ project(DDS_VTS_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base { project(DDS_VTS_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl { after += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \ - DDS4CCM_lem_stub DDS_VTopics_Base_stub + DDS_VTopics_Base_stub sharedname = DDS_VTS_Valuetype_Connector_exec libs += DDS_VTS_Valuetype_Connector_stub DDS_VTS_VALUE_TYPE_Connector_lem_stub \ - DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + DDS_VTopics_Base_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -114,13 +114,12 @@ project(DDS_VTS_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl { after += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_exec\ - DDS_VTS_Valuetype_Connector_stub DDS4CCM_lem_stub + DDS_VTS_Valuetype_Connector_stub sharedname = DDS_VTS_Valuetype_Connector_svnt libs += DDS_VTS_Valuetype_Connector_stub \ DDS_VTS_VALUE_TYPE_Connector_lem_stub \ DDS_VTopics_Base_stub \ - DDS_VTS_Valuetype_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTS_Valuetype_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc index f8d4ead5d11..6982ab916ad 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc @@ -32,9 +32,9 @@ project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_VTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub - libs += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub DDS4CCM_lem_stub +project(DDS_VTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub + libs += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_VTopics_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS_VTopics_Base_stub sharedname = DDS_VTopics_Connector_exec - libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub + libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,13 +111,12 @@ project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub DDS4CCM_lem_stub + after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub sharedname = DDS_VTopics_Connector_svnt libs += DDS_VTopics_Connector_stub \ DDS_VTopics_Connector_lem_stub \ DDS_VTopics_Base_stub \ - DDS_VTopics_Connector_exec \ - DDS4CCM_lem_stub + DDS_VTopics_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc index 5c7fa544359..c7cda9d2681 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc @@ -95,20 +95,19 @@ project(DDS_VTopics_Receiver_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_base { +project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \ DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub \ DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_stub \ DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_stub \ DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_stub \ DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_stub \ - DDS4CCM_lem_stub + DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_stub sharedname = Receiver_exec libs += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \ DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \ DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTopics_Connector_lem_stub DDS4CCM_lem_stub \ + DDS_VTopics_Connector_lem_stub \ DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub libpaths += ../lib libout = ../lib @@ -132,23 +131,21 @@ project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_base { } -project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_base { +project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Receiver_exec \ DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \ DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \ DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \ DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \ DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \ - DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \ DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \ DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt \ DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_stub \ DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_stub \ - Receiver_exec DDS_VTopics_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel + Receiver_exec DDS_VTopics_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc index 59319692bf6..836cf7f9951 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc @@ -89,21 +89,20 @@ project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_VTopics_Sender_lem_stub DDS_VTopics_Sender_stub \ DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \ DDS_VTS_String_Connector_lem_stub DDS_VTS_String_Connector_stub \ DDS_VTS_Array_Connector_lem_stub DDS_VTS_Array_Connector_stub \ DDS_VTS_Valuetype_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \ DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub \ - DDS_VTS_Seq_Connector_lem_stub DDS_VTS_Seq_Connector_stub \ - DDS4CCM_lem_stub + DDS_VTS_Seq_Connector_lem_stub DDS_VTS_Seq_Connector_stub sharedname = Sender_exec libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub \ DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \ DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \ DDS_VTS_Valuetype_Connector_stub DDS_VTS_Seq_Connector_stub \ - DDS_VTS_Union_Connector_stub DDS4CCM_lem_stub + DDS_VTS_Union_Connector_stub libpaths += ../lib includes += .. libout = ../lib @@ -126,9 +125,8 @@ project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base { } -project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base { - after += DDS_VTopics_Base_stub DDS_VTopics_Sender_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel \ +project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += DDS_VTopics_Base_stub DDS_VTopics_Sender_lem_stub \ DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \ DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \ DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \ @@ -138,7 +136,6 @@ project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base { sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ DDS_VTopics_Base_stub \ - DDS4CCM_lem_stub DDS4CCM_skel \ DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt \ DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt \ DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt \ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc index f136f705023..cee0f7d6848 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc @@ -94,13 +94,11 @@ project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base { } } -project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_base { +project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_lem_stub { after += Shapes_Receiver_comp_lem_stub Shapes_Receiver_comp_stub \ - Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub \ - DDS4CCM_lem_stub - + Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ - Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub DDS4CCM_lem_stub + Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub libpaths += ../../lib libout = ../../lib @@ -126,14 +124,14 @@ project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_base { } -project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_base { +project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { after += Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \ - Shapes_ShapeType_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + Shapes_ShapeType_conn_lem_stub libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \ - Shapes_ShapeType_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel + Shapes_ShapeType_conn_lem_stub libpaths += ../../lib libout = ../../lib diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc index 29b0f62ec38..7142f466673 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc @@ -127,15 +127,15 @@ project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base { } -project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_base { - after += Shapes_ShapeType_msg_stub Shapes_Sender_comp_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ +project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += Shapes_ShapeType_msg_stub Shapes_Sender_comp_lem_stub \ + Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \ Shapes_Control_obj_stub Shapes_Control_obj_svnt \ Shapes_Control_obj_lem_stub libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub \ - Shapes_ShapeType_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \ + Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \ Shapes_Control_obj_stub Shapes_Control_obj_svnt \ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc index 36a1afb2946..26a7aa50c2b 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc @@ -34,10 +34,10 @@ project(Shapes_ShapeType_conn_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(Shapes_ShapeType_conn_lem_stub) : ccm_svnt, dds4ccm_base { - after += Shapes_ShapeType_conn_lem_gen Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub DDS4CCM_lem_stub +project(Shapes_ShapeType_conn_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += Shapes_ShapeType_conn_lem_gen Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub - libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub DDS4CCM_lem_stub + libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub libpaths += ../lib libout = ../lib @@ -93,9 +93,9 @@ project(Shapes_ShapeType_conn_stub) : ccm_stub, dds4ccm_base { } project(Shapes_ShapeType_conn_exec) : ciao_executor, dds4ccm_impl { - after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub DDS4CCM_lem_stub + after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub DDS4CCM_lem_stub + libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub libpaths += ../lib libout = ../lib @@ -122,10 +122,9 @@ project(Shapes_ShapeType_conn_exec) : ciao_executor, dds4ccm_impl { project(Shapes_ShapeType_conn_svnt) : ciao_servant, dds4ccm_impl { - after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_exec Shapes_ShapeType_conn_stub DDS4CCM_lem_stub + after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_exec Shapes_ShapeType_conn_stub - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_exec \ - DDS4CCM_lem_stub + libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_exec libpaths += ../lib libout = ../lib |