diff options
85 files changed, 490 insertions, 2434 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 41210f188c5..096c20cf2ea 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,91 @@ +Mon Feb 22 09:29:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc + * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.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/Base/Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.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/Connector/VTopic_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.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/Connector/VTopics_Connector.mpc + Use the new dds4ccm_ts_defaults base project + Mon Feb 22 08:29:03 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc index f2c91f30ae4..5403a525578 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc @@ -1,75 +1,23 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Perf_Keyed_Test_Base" -project(DDS_Perf_Keyed_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=PERF_KEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Perf_Keyed_Test_Base_stub_export.h IDL_Files { Perf_Keyed_Test_Base.idl } -} - -project(DDS_Perf_Keyed_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Perf_Keyed_Test_Base_idl_gen - - NDDSTypeSupport_Files { - Perf_Keyed_Test_Base.idl - } -} - -project(DDS_Perf_Keyed_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Perf_Keyed_Test_Base_ndds_ts_gen DDS_Perf_Keyed_Test_Base_stub - libs += DDS_Perf_Keyed_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Perf_Keyed_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Perf_Keyed_Test_Base.cxx - Perf_Keyed_Test_BasePlugin.cxx - Perf_Keyed_Test_BaseSupport.cxx - } - Header_Files { - Perf_Keyed_Test_Base.h - Perf_Keyed_Test_BasePlugin.h - Perf_Keyed_Test_BaseSupport.h - } + opendds_ts_flags += --export=PERF_KEYED_TEST_BASE_STUB_Export - Inline_Files { + DDSGenerator_Files { + Perf_Keyed_Test_Base.idl } } -project(DDS_Perf_Keyed_Test_Base_stub) : ccm_stub { - after += DDS_Perf_Keyed_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Perf_Keyed_Test_Base_stub - dynamicflags = PERF_KEYED_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Perf_Keyed_Test_BaseC.cpp - } - - Header_Files { - Perf_Keyed_Test_BaseC.h - Perf_Keyed_Test_Base_stub_export.h - } - - Inline_Files { - Perf_Keyed_Test_BaseC.inl - } -} 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 724ba6bc5fa..e78f3eec0d7 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 @@ -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 DDS_Perf_Keyed_Test_Base_NDDS_TS + after += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_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 DDS_Perf_Keyed_Test_Base_NDDS_TS + libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc index 40fd989ffa1..0f0bd9de2d4 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc @@ -1,75 +1,23 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Latency_Test_Base" -project(DDS_Latency_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ - -Wb,stub_export_macro=LATENCY_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=Latency_Test_Base_stub_export.h - - IDL_Files { - Latency_Test_Base.idl - } -} - -project(DDS_Latency_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Latency_Test_Base_idl_gen - - NDDSTypeSupport_Files { - Latency_Test_Base.idl - } -} - -project(DDS_Latency_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Latency_Test_Base_ndds_ts_gen DDS_Latency_Test_Base_stub - libs += DDS_Latency_Test_Base_stub +project (DDS_Latency_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += LATENCY_KEYED_TEST_BASE_STUB_BUILD_DLL libout = ../lib - libpaths += ../lib - sharedname = DDS_Latency_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Latency_Test_Base.cxx - Latency_Test_BasePlugin.cxx - Latency_Test_BaseSupport.cxx - } - - Header_Files { - Latency_Test_Base.h - Latency_Test_BasePlugin.h - Latency_Test_BaseSupport.h - } - Inline_Files { - } -} - -project(DDS_Latency_Test_Base_stub) : ccm_stub { - after += DDS_Latency_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Latency_Test_Base_stub - dynamicflags = LATENCY_TEST_BASE_STUB_BUILD_DLL + idlflags += -SS -Gxhst -Sci \ + -Wb,stub_export_macro=LATENCY_KEYED_TEST_BASE_STUB_Export \ + -Wb,stub_export_include=Latency_Keyed_Test_Base_stub_export.h IDL_Files { + Latency_Test_Base.idl } - Source_Files { - Latency_Test_BaseC.cpp - } - - Header_Files { - Latency_Test_BaseC.h - Latency_Test_Base_stub_export.h - } + opendds_ts_flags += --export=LATENCY_KEYED_TEST_BASE_STUB_Export - Inline_Files { - Latency_Test_BaseC.inl + DDSGenerator_Files { + Latency_Test_Base.idl } } + diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc index 03dff69292a..3d1cf3b0c6c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc @@ -85,9 +85,9 @@ project(DDS_Latency_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_Latency_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub DDS_Latency_Test_Base_NDDS_TS + after += DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub sharedname = DDS_Latency_Test_Connector_exec - libs += DDS_Latency_Test_Connector_stub DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Base_stub DDS4CCM_lem_stub DDS_Latency_Test_Base_NDDS_TS + libs += DDS_Latency_Test_Connector_stub DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc index 0f7bd175447..0bfffb69c55 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc @@ -1,76 +1,23 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_DeadlineTest_Base" -project(DDS_CSL_DeadlineTest_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_DEADLINETEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_DeadlineTest_Base_stub_export.h IDL_Files { CSL_DeadlineTest_Base.idl } -} -project(DDS_CSL_DeadlineTest_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_CSL_DeadlineTest_Base_idl_gen + opendds_ts_flags += --export=CSL_DEADLINETEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { CSL_DeadlineTest_Base.idl } } -project(DDS_CSL_DeadlineTest_Base_NDDS_TS) : nddslib, taolib { - after += DDS_CSL_DeadlineTest_Base_ndds_ts_gen DDS_CSL_DeadlineTest_Base_stub - libs += DDS_CSL_DeadlineTest_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_DeadlineTest_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - CSL_DeadlineTest_Base.cxx - CSL_DeadlineTest_BasePlugin.cxx - CSL_DeadlineTest_BaseSupport.cxx - } - - Header_Files { - CSL_DeadlineTest_Base.h - CSL_DeadlineTest_BasePlugin.h - CSL_DeadlineTest_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_CSL_DeadlineTest_Base_stub) : ccm_stub { - after += DDS_CSL_DeadlineTest_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_DeadlineTest_Base_stub - dynamicflags = CSL_DEADLINETEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_DeadlineTest_BaseC.cpp - } - - Header_Files { - CSL_DeadlineTest_BaseC.h - CSL_DeadlineTest_Base_stub_export.h - } - - Inline_Files { - CSL_DeadlineTest_BaseC.inl - } -} - 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 0c3d94ca892..b5da17377e8 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc @@ -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 DDS_CSL_DeadlineTest_Base_NDDS_TS + after += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_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 DDS_CSL_DeadlineTest_Base_NDDS_TS + libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc index 265c9d28574..e50c473d271 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_QoSTest_Base" -project(DDS_CSL_QoSTest_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_QOSTEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_QoSTest_Base_stub_export.h IDL_Files { CSL_QoSTest_Base.idl } -} -project(DDS_CSL_QoSTest_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_CSL_QoSTest_Base_idl_gen + opendds_ts_flags += --export=CSL_QOSTEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { CSL_QoSTest_Base.idl } } -project(DDS_CSL_QoSTest_Base_NDDS_TS) : nddslib, taolib { - after += DDS_CSL_QoSTest_Base_ndds_ts_gen DDS_CSL_QoSTest_Base_stub - libs += DDS_CSL_QoSTest_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_QoSTest_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - CSL_QoSTest_Base.cxx - CSL_QoSTest_BasePlugin.cxx - CSL_QoSTest_BaseSupport.cxx - } - - Header_Files { - CSL_QoSTest_Base.h - CSL_QoSTest_BasePlugin.h - CSL_QoSTest_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_CSL_QoSTest_Base_stub) : ccm_stub { - after += DDS_CSL_QoSTest_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_QoSTest_Base_stub - dynamicflags = CSL_QOSTEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_QoSTest_BaseC.cpp - } - - Header_Files { - CSL_QoSTest_BaseC.h - CSL_QoSTest_Base_stub_export.h - } - - Inline_Files { - CSL_QoSTest_BaseC.inl - } -} - 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 805c02b10c8..aa8ae6170c0 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc @@ -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 DDS_CSL_QoSTest_Base_NDDS_TS + after += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_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 DDS_CSL_QoSTest_Base_NDDS_TS + libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc index 9d46f751cef..ac2efd9aa23 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_SRTest_Base" -project(DDS_CSL_SRTest_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_SRTEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_SRTest_Base_stub_export.h IDL_Files { CSL_SRTest_Base.idl } -} -project(DDS_CSL_SRTest_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_CSL_SRTest_Base_idl_gen + opendds_ts_flags += --export=CSL_SRTEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { CSL_SRTest_Base.idl } } -project(DDS_CSL_SRTest_Base_NDDS_TS) : nddslib, taolib { - after += DDS_CSL_SRTest_Base_ndds_ts_gen DDS_CSL_SRTest_Base_stub - libs += DDS_CSL_SRTest_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_SRTest_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - CSL_SRTest_Base.cxx - CSL_SRTest_BasePlugin.cxx - CSL_SRTest_BaseSupport.cxx - } - - Header_Files { - CSL_SRTest_Base.h - CSL_SRTest_BasePlugin.h - CSL_SRTest_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_CSL_SRTest_Base_stub) : ccm_stub { - after += DDS_CSL_SRTest_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_SRTest_Base_stub - dynamicflags = CSL_SRTEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_SRTest_BaseC.cpp - } - - Header_Files { - CSL_SRTest_BaseC.h - CSL_SRTest_Base_stub_export.h - } - - Inline_Files { - CSL_SRTest_BaseC.inl - } -} - 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 fe9c1cf33fd..dc0dc2decd4 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc @@ -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 DDS_CSL_SRTest_Base_NDDS_TS + after += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_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 DDS_CSL_SRTest_Base_NDDS_TS + libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc index 64b74a47a2a..a1ddf2365e4 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_USTest_Base" -project(DDS_CSL_USTest_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_CSL_USTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_USTEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_USTest_Base_stub_export.h IDL_Files { CSL_USTest_Base.idl } -} -project(DDS_CSL_USTest_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_CSL_USTest_Base_idl_gen + opendds_ts_flags += --export=CSL_USTEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { CSL_USTest_Base.idl } } -project(DDS_CSL_USTest_Base_NDDS_TS) : nddslib, taolib { - after += DDS_CSL_USTest_Base_ndds_ts_gen DDS_CSL_USTest_Base_stub - libs += DDS_CSL_USTest_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_USTest_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - CSL_USTest_Base.cxx - CSL_USTest_BasePlugin.cxx - CSL_USTest_BaseSupport.cxx - } - - Header_Files { - CSL_USTest_Base.h - CSL_USTest_BasePlugin.h - CSL_USTest_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_CSL_USTest_Base_stub) : ccm_stub { - after += DDS_CSL_USTest_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_CSL_USTest_Base_stub - dynamicflags = CSL_USTEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CSL_USTest_BaseC.cpp - } - - Header_Files { - CSL_USTest_BaseC.h - CSL_USTest_Base_stub_export.h - } - - Inline_Files { - CSL_USTest_BaseC.inl - } -} - 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 d3be6c9e452..55c35b1b339 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc @@ -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 DDS_CSL_USTest_Base_NDDS_TS + after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_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 DDS_CSL_USTest_Base_NDDS_TS + libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc index bcc6d0008c1..2c89c588a8e 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base" -project(DDS_DDSWriterEntityBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += WRITER_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { Writer_Base.idl } -} -project(DDS_DDSWriterEntityBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_DDSWriterEntityBase_idl_gen + opendds_ts_flags += --export=WRITER_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Writer_Base.idl } } -project(DDS_DDSWriterEntityBase_NDDS_TS) : nddslib, taolib { - after += DDS_DDSWriterEntityBase_ndds_ts_gen DDS_DDSWriterEntityBase_stub - libs += DDS_DDSWriterEntityBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_DDSWriterEntityBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Writer_Base.cxx - Writer_BasePlugin.cxx - Writer_BaseSupport.cxx - } - - Header_Files { - Writer_Base.h - Writer_BasePlugin.h - Writer_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_DDSWriterEntityBase_stub) : ccm_stub { - after += DDS_DDSWriterEntityBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_DDSWriterEntityBase_stub - dynamicflags = WRITER_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_BaseC.cpp - } - - Header_Files { - Writer_BaseC.h - Writer_Base_stub_export.h - } - - Inline_Files { - Writer_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc index a9ab308bd09..07307635bf7 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc @@ -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 DDS_DDSWriterEntityBase_NDDS_TS + after += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub DDS4CCM_lem_stub sharedname = DDS_DDSWriterEntityConnector_exec - libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub DDS_DDSWriterEntityBase_NDDS_TS + libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc index 1f7085ef55e..a7e75c673cd 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -project(DDS_ECT_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_ECT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h IDL_Files { Event_Connection_Test_Base.idl } -} -project(DDS_ECT_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_ECT_Base_idl_gen + opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Event_Connection_Test_Base.idl } } -project(DDS_ECT_Base_NDDS_TS) : nddslib, taolib { - after += DDS_ECT_Base_ndds_ts_gen DDS_ECT_Base_stub - libs += DDS_ECT_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_ECT_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Event_Connection_Test_Base.cxx - Event_Connection_Test_BasePlugin.cxx - Event_Connection_Test_BaseSupport.cxx - } - - Header_Files { - Event_Connection_Test_Base.h - Event_Connection_Test_BasePlugin.h - Event_Connection_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_ECT_Base_stub) : ccm_stub { - after += DDS_ECT_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_ECT_Base_stub - dynamicflags = EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Event_Connection_Test_BaseC.cpp - } - - Header_Files { - Event_Connection_Test_BaseC.h - Event_Connection_Test_Base_stub_export.h - } - - Inline_Files { - Event_Connection_Test_BaseC.inl - } -} - 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 07fb60e28cc..2e9a9e6ae90 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 @@ -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 DDS_ECT_Base_NDDS_TS + after += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub sharedname = DDS_ECT_Connector_exec - libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub DDS_ECT_Base_NDDS_TS + libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc index d02840124e8..a183aea1455 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n FSS_Event_Base" -project(DDS_FSS_Event_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_FSS_Event_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export \ -Wb,stub_export_include=FSS_Event_Base_stub_export.h IDL_Files { FSS_Event_Base.idl } -} -project(DDS_FSS_Event_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_FSS_Event_Base_idl_gen + opendds_ts_flags += --export=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { FSS_Event_Base.idl } } -project(DDS_FSS_Event_Base_NDDS_TS) : nddslib, taolib { - after += DDS_FSS_Event_Base_ndds_ts_gen DDS_FSS_Event_Base_stub - libs += DDS_FSS_Event_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_FSS_Event_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - FSS_Event_Base.cxx - FSS_Event_BasePlugin.cxx - FSS_Event_BaseSupport.cxx - } - - Header_Files { - FSS_Event_Base.h - FSS_Event_BasePlugin.h - FSS_Event_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_FSS_Event_Base_stub) : ccm_stub { - after += DDS_FSS_Event_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_FSS_Event_Base_stub - dynamicflags = FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_Event_BaseC.cpp - } - - Header_Files { - FSS_Event_BaseC.h - FSS_Event_Base_stub_export.h - } - - Inline_Files { - FSS_Event_BaseC.inl - } -} 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 4b06553411a..60e84fb4401 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 @@ -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 DDS_FSS_Event_Base_NDDS_TS + after += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub DDS4CCM_lem_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 DDS_FSS_Event_Base_NDDS_TS + libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc index 856e5d0afe5..df198d64605 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc @@ -1,75 +1,23 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n FSS_State_Base" -project(DDS_FSS_State_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_FSS_State_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export \ -Wb,stub_export_include=FSS_State_Base_stub_export.h IDL_Files { FSS_State_Base.idl } -} -project(DDS_FSS_State_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_FSS_State_Base_idl_gen + opendds_ts_flags += --export=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { FSS_State_Base.idl } } -project(DDS_FSS_State_Base_NDDS_TS) : nddslib, taolib { - after += DDS_FSS_State_Base_ndds_ts_gen DDS_FSS_State_Base_stub - libs += DDS_FSS_State_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_FSS_State_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - FSS_State_Base.cxx - FSS_State_BasePlugin.cxx - FSS_State_BaseSupport.cxx - } - - Header_Files { - FSS_State_Base.h - FSS_State_BasePlugin.h - FSS_State_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_FSS_State_Base_stub) : ccm_stub { - after += DDS_FSS_State_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_FSS_State_Base_stub - dynamicflags = FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - FSS_State_BaseC.cpp - } - - Header_Files { - FSS_State_BaseC.h - FSS_State_Base_stub_export.h - } - - Inline_Files { - FSS_State_BaseC.inl - } -} 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 380a57a899d..433e333e3fb 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 @@ -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_NDDS_TS + after += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc index 2d1a03c53ed..3880d3ed8fe 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc @@ -1,75 +1,23 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Getter_Test_Base" -project(DDS_Getter_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Getter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=GETTER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Getter_Test_Base_stub_export.h IDL_Files { Getter_Test_Base.idl } -} -project(DDS_Getter_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Getter_Test_Base_idl_gen + opendds_ts_flags += --export=GETTER_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Getter_Test_Base.idl } } -project(DDS_Getter_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Getter_Test_Base_ndds_ts_gen DDS_Getter_Test_Base_stub - libs += DDS_Getter_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Getter_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Getter_Test_Base.cxx - Getter_Test_BasePlugin.cxx - Getter_Test_BaseSupport.cxx - } - - Header_Files { - Getter_Test_Base.h - Getter_Test_BasePlugin.h - Getter_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_Getter_Test_Base_stub) : ccm_stub { - after += DDS_Getter_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Getter_Test_Base_stub - dynamicflags = GETTER_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Getter_Test_BaseC.cpp - } - - Header_Files { - Getter_Test_BaseC.h - Getter_Test_Base_stub_export.h - } - - Inline_Files { - Getter_Test_BaseC.inl - } -} 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 e1902480c02..76d0019905c 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc @@ -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_NDDS_TS + after += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc index 2b9bb339fe5..c70199fd9e3 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base" -project(DDS_DDSInstanceHandleBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += WRITER_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { Writer_Base.idl } -} -project(DDS_DDSInstanceHandleBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_DDSInstanceHandleBase_idl_gen + opendds_ts_flags += --export=WRITER_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Writer_Base.idl } } -project(DDS_DDSInstanceHandleBase_NDDS_TS) : nddslib, taolib { - after += DDS_DDSInstanceHandleBase_ndds_ts_gen DDS_DDSInstanceHandleBase_stub - libs += DDS_DDSInstanceHandleBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_DDSInstanceHandleBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Writer_Base.cxx - Writer_BasePlugin.cxx - Writer_BaseSupport.cxx - } - - Header_Files { - Writer_Base.h - Writer_BasePlugin.h - Writer_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_DDSInstanceHandleBase_stub) : ccm_stub { - after += DDS_DDSInstanceHandleBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_DDSInstanceHandleBase_stub - dynamicflags = WRITER_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_BaseC.cpp - } - - Header_Files { - Writer_BaseC.h - Writer_Base_stub_export.h - } - - Inline_Files { - Writer_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc index 47a332cd188..7187afbcf59 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc @@ -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_NDDS_TS + after += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_stub sharedname = DDS_InstanceHandleConnector_exec - libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_NDDS_TS + libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc index 3814ea67918..3af54a3c4cd 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Keyed_Test_Base" -project(DDS_Keyed_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Keyed_Test_Base_stub_export.h IDL_Files { Keyed_Test_Base.idl } -} -project(DDS_Keyed_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Keyed_Test_Base_idl_gen + opendds_ts_flags += --export=KEYED_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Keyed_Test_Base.idl } } -project(DDS_Keyed_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Keyed_Test_Base_ndds_ts_gen DDS_Keyed_Test_Base_stub - libs += DDS_Keyed_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Keyed_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Keyed_Test_Base.cxx - Keyed_Test_BasePlugin.cxx - Keyed_Test_BaseSupport.cxx - } - - Header_Files { - Keyed_Test_Base.h - Keyed_Test_BasePlugin.h - Keyed_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_Keyed_Test_Base_stub) : ccm_stub { - after += DDS_Keyed_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Keyed_Test_Base_stub - dynamicflags = KEYED_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Keyed_Test_BaseC.cpp - } - - Header_Files { - Keyed_Test_BaseC.h - Keyed_Test_Base_stub_export.h - } - - Inline_Files { - Keyed_Test_BaseC.inl - } -} - 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 a130930e482..37c7417c48e 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc @@ -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_NDDS_TS + after += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc index e8dd47efc0f..936a263dd82 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base" -project(DDS_KeyedWriterBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_KeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += WRITER_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { Writer_Base.idl } -} -project(DDS_KeyedWriterBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_KeyedWriterBase_idl_gen + opendds_ts_flags += --export=WRITER_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Writer_Base.idl } } -project(DDS_KeyedWriterBase_NDDS_TS) : nddslib, taolib { - after += DDS_KeyedWriterBase_ndds_ts_gen DDS_KeyedWriterBase_stub - libs += DDS_KeyedWriterBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_KeyedWriterBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Writer_Base.cxx - Writer_BasePlugin.cxx - Writer_BaseSupport.cxx - } - - Header_Files { - Writer_Base.h - Writer_BasePlugin.h - Writer_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_KeyedWriterBase_stub) : ccm_stub { - after += DDS_KeyedWriterBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_KeyedWriterBase_stub - dynamicflags = WRITER_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_BaseC.cpp - } - - Header_Files { - Writer_BaseC.h - Writer_Base_stub_export.h - } - - Inline_Files { - Writer_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc index d2049e2adfe..ef8702d2fba 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc @@ -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_NDDS_TS + after += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_stub sharedname = DDS_KeyedWriterConnector_exec - libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_NDDS_TS + libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc index f521e910d58..1e779ccb38c 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LMBM_Test_Base" -project(DDS_LMBM_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_LMBM_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export \ -Wb,stub_export_include=LMBM_Test_Base_stub_export.h IDL_Files { LMBM_Test_Base.idl } -} -project(DDS_LMBM_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_LMBM_Test_Base_idl_gen + opendds_ts_flags += --export=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { LMBM_Test_Base.idl } } -project(DDS_LMBM_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_LMBM_Test_Base_ndds_ts_gen DDS_LMBM_Test_Base_stub - libs += DDS_LMBM_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_LMBM_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - LMBM_Test_Base.cxx - LMBM_Test_BasePlugin.cxx - LMBM_Test_BaseSupport.cxx - } - - Header_Files { - LMBM_Test_Base.h - LMBM_Test_BasePlugin.h - LMBM_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_LMBM_Test_Base_stub) : ccm_stub { - after += DDS_LMBM_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_LMBM_Test_Base_stub - dynamicflags = LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LMBM_Test_BaseC.cpp - } - - Header_Files { - LMBM_Test_BaseC.h - LMBM_Test_Base_stub_export.h - } - - Inline_Files { - LMBM_Test_BaseC.inl - } -} 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 0b2747f6f8a..b532fe7203e 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc @@ -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_NDDS_TS + after += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc index a39cb37b0b6..a70c39a1030 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LNE_Test_Base" -project(DDS_LNE_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_LNE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=LNE_Test_Base_stub_export.h IDL_Files { LNE_Test_Base.idl } -} -project(DDS_LNE_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_LNE_Test_Base_idl_gen + opendds_ts_flags += --export=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { LNE_Test_Base.idl } } -project(DDS_LNE_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_LNE_Test_Base_ndds_ts_gen DDS_LNE_Test_Base_stub - libs += DDS_LNE_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_LNE_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - LNE_Test_Base.cxx - LNE_Test_BasePlugin.cxx - LNE_Test_BaseSupport.cxx - } - - Header_Files { - LNE_Test_Base.h - LNE_Test_BasePlugin.h - LNE_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_LNE_Test_Base_stub) : ccm_stub { - after += DDS_LNE_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_LNE_Test_Base_stub - dynamicflags = LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LNE_Test_BaseC.cpp - } - - Header_Files { - LNE_Test_BaseC.h - LNE_Test_Base_stub_export.h - } - - Inline_Files { - LNE_Test_BaseC.inl - } -} 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 c8b3845161a..a7c08d84744 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc @@ -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_NDDS_TS + after += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc index 89f1db4f525..7b88d1bfef9 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LOBO_Test_Base" -project(DDS_LOBO_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_LOBO_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \ -Wb,stub_export_include=LOBO_Test_Base_stub_export.h IDL_Files { LOBO_Test_Base.idl } -} -project(DDS_LOBO_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_LOBO_Test_Base_idl_gen + opendds_ts_flags += --export=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { LOBO_Test_Base.idl } } -project(DDS_LOBO_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_LOBO_Test_Base_ndds_ts_gen DDS_LOBO_Test_Base_stub - libs += DDS_LOBO_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_LOBO_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - LOBO_Test_Base.cxx - LOBO_Test_BasePlugin.cxx - LOBO_Test_BaseSupport.cxx - } - - Header_Files { - LOBO_Test_Base.h - LOBO_Test_BasePlugin.h - LOBO_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_LOBO_Test_Base_stub) : ccm_stub { - after += DDS_LOBO_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_LOBO_Test_Base_stub - dynamicflags = LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - LOBO_Test_BaseC.cpp - } - - Header_Files { - LOBO_Test_BaseC.h - LOBO_Test_Base_stub_export.h - } - - Inline_Files { - LOBO_Test_BaseC.inl - } -} 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 5a30e193e6b..184bc402696 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc @@ -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_NDDS_TS + after += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc index 396c11037e5..ef0bdd5ab54 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n NonChangeable_Base" -project(DDS_NonChangeableBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_NonChangeableBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=NONCHANGEABLE_BASE_STUB_Export \ -Wb,stub_export_include=NonChangeable_Base_stub_export.h IDL_Files { NonChangeable_Base.idl } -} -project(DDS_NonChangeableBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_NonChangeableBase_idl_gen + opendds_ts_flags += --export=NONCHANGEABLE_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { NonChangeable_Base.idl } } -project(DDS_NonChangeableBase_NDDS_TS) : nddslib, taolib { - after += DDS_NonChangeableBase_ndds_ts_gen DDS_NonChangeableBase_stub - libs += DDS_NonChangeableBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_NonChangeableBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - NonChangeable_Base.cxx - NonChangeable_BasePlugin.cxx - NonChangeable_BaseSupport.cxx - } - - Header_Files { - NonChangeable_Base.h - NonChangeable_BasePlugin.h - NonChangeable_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_NonChangeableBase_stub) : ccm_stub { - after += DDS_NonChangeableBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_NonChangeableBase_stub - dynamicflags = NONCHANGEABLE_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - NonChangeable_BaseC.cpp - } - - Header_Files { - NonChangeable_BaseC.h - NonChangeable_Base_stub_export.h - } - - Inline_Files { - NonChangeable_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc index 586eacdf46e..cfe5c7d6e04 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc @@ -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_NDDS_TS + after += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS4CCM_lem_stub DDS_NonChangeableBase_stub sharedname = DDS_NonChangeableConnector_exec - libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS4CCM_lem_stub DDS_NonChangeableBase_NDDS_TS + libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS4CCM_lem_stub DDS_NonChangeableBase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc index 0ef849ed087..efdc0ce2694 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n ConnectorStatusListener_Test_Base" -project(DDS_OIT_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_OIT_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += CONNECTORSTATUSLISTENER_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=ConnectorStatusListener_Test_Base_stub_export.h IDL_Files { ConnectorStatusListener_Test_Base.idl } -} -project(DDS_OIT_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_OIT_Test_Base_idl_gen + opendds_ts_flags += --export=CONNECTORSTATUSLISTENER_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { ConnectorStatusListener_Test_Base.idl } } -project(DDS_OIT_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_OIT_Test_Base_ndds_ts_gen DDS_OIT_Test_Base_stub - libs += DDS_ConnectorStatusListener_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_ConnectorStatusListener_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - ConnectorStatusListener_Test_Base.cxx - ConnectorStatusListener_Test_BasePlugin.cxx - ConnectorStatusListener_Test_BaseSupport.cxx - } - - Header_Files { - ConnectorStatusListener_Test_Base.h - ConnectorStatusListener_Test_BasePlugin.h - ConnectorStatusListener_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_OIT_Test_Base_stub) : ccm_stub { - after += DDS_OIT_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_ConnectorStatusListener_Test_Base_stub - dynamicflags = CONNECTORSTATUSLISTENER_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - ConnectorStatusListener_Test_BaseC.cpp - } - - Header_Files { - ConnectorStatusListener_Test_BaseC.h - ConnectorStatusListener_Test_Base_stub_export.h - } - - Inline_Files { - ConnectorStatusListener_Test_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc index a73cd551511..cfc67b0a585 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc @@ -85,9 +85,9 @@ project(DDS_OIT_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_OIT_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_OIT_Test_Connector_lem_stub DDS_OIT_Test_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_NDDS_TS + after += DDS_OIT_Test_Connector_lem_stub DDS_OIT_Test_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_stub sharedname = DDS_ConnectorStatusListener_Test_Connector_exec - libs += DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_NDDS_TS + libs += DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc index dce4ce8e64b..965c04855a5 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc @@ -85,9 +85,9 @@ project(DDS_OIT_TestSec_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_OIT_TestSec_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_OIT_TestSec_Connector_lem_stub DDS_OIT_TestSec_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_NDDS_TS + after += DDS_OIT_TestSec_Connector_lem_stub DDS_OIT_TestSec_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_stub sharedname = DDS_ConnectorStatusListener_TestSec_Connector_exec - libs += DDS_ConnectorStatusListener_TestSec_Connector_stub DDS_CSL_TestSec_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_NDDS_TS + libs += DDS_ConnectorStatusListener_TestSec_Connector_stub DDS_CSL_TestSec_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc index c6a7c9ba18c..2f26d07f137 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n PSL_DeadlineTest_Base" -project(DDS_PSL_DeadlineTest_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \ -Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h IDL_Files { PSL_DeadlineTest_Base.idl } -} -project(DDS_PSL_DeadlineTest_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_PSL_DeadlineTest_Base_idl_gen + opendds_ts_flags += --export=PSL_DEADLINETEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { PSL_DeadlineTest_Base.idl } } -project(DDS_PSL_DeadlineTest_Base_NDDS_TS) : nddslib, taolib { - after += DDS_PSL_DeadlineTest_Base_ndds_ts_gen DDS_PSL_DeadlineTest_Base_stub - libs += DDS_PSL_DeadlineTest_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_PSL_DeadlineTest_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - PSL_DeadlineTest_Base.cxx - PSL_DeadlineTest_BasePlugin.cxx - PSL_DeadlineTest_BaseSupport.cxx - } - - Header_Files { - PSL_DeadlineTest_Base.h - PSL_DeadlineTest_BasePlugin.h - PSL_DeadlineTest_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_PSL_DeadlineTest_Base_stub) : ccm_stub { - after += DDS_PSL_DeadlineTest_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_PSL_DeadlineTest_Base_stub - dynamicflags = PSL_DEADLINETEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_DeadlineTest_BaseC.cpp - } - - Header_Files { - PSL_DeadlineTest_BaseC.h - PSL_DeadlineTest_Base_stub_export.h - } - - Inline_Files { - PSL_DeadlineTest_BaseC.inl - } -} - 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 bc89da29748..88e15afda50 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc @@ -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_NDDS_TS + after += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc index 5c627f1b6a3..a637f97a26c 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n PSL_SampleLost_Base" -project(DDS_PSL_SampleLost_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=PSL_SAMPLELOST_BASE_STUB_Export \ -Wb,stub_export_include=PSL_SampleLost_Base_stub_export.h IDL_Files { PSL_SampleLost_Base.idl } -} -project(DDS_PSL_SampleLost_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_PSL_SampleLost_Base_idl_gen + opendds_ts_flags += --export=PSL_SAMPLELOST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { PSL_SampleLost_Base.idl } } -project(DDS_PSL_SampleLost_Base_NDDS_TS) : nddslib, taolib { - after += DDS_PSL_SampleLost_Base_ndds_ts_gen DDS_PSL_SampleLost_Base_stub - libs += DDS_PSL_SampleLost_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_PSL_SampleLost_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - PSL_SampleLost_Base.cxx - PSL_SampleLost_BasePlugin.cxx - PSL_SampleLost_BaseSupport.cxx - } - - Header_Files { - PSL_SampleLost_Base.h - PSL_SampleLost_BasePlugin.h - PSL_SampleLost_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_PSL_SampleLost_Base_stub) : ccm_stub { - after += DDS_PSL_SampleLost_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_PSL_SampleLost_Base_stub - dynamicflags = PSL_SAMPLELOST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - PSL_SampleLost_BaseC.cpp - } - - Header_Files { - PSL_SampleLost_BaseC.h - PSL_SampleLost_Base_stub_export.h - } - - Inline_Files { - PSL_SampleLost_BaseC.inl - } -} - 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 7b362a1e975..0ee6507bfbb 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc @@ -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_NDDS_TS + after += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc index 8361cb4761b..02bc7f25114 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n QueryFilter_Test_Base" -project(QueryFilter_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (QueryFilter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += QUERY_FILTER_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=QUERY_FILTER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=QueryFilter_Test_Base_stub_export.h IDL_Files { QueryFilter_Test_Base.idl } -} -project(QueryFilter_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += QueryFilter_Test_Base_idl_gen - ndds_ts_flags += -corba QueryFilter_Test_BaseC.h -orb ACE_TAO1.7 + opendds_ts_flags += --export=QUERY_FILTER_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { QueryFilter_Test_Base.idl } } -project(QueryFilter_Test_Base_NDDS_TS) : nddslib, taolib { - after += QueryFilter_Test_Base_ndds_ts_gen QueryFilter_Test_Base_stub - libs += QueryFilter_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = QueryFilter_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - QueryFilter_Test_Base.cxx - QueryFilter_Test_BasePlugin.cxx - QueryFilter_Test_BaseSupport.cxx - } - - Header_Files { - QueryFilter_Test_Base.h - QueryFilter_Test_BasePlugin.h - QueryFilter_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(QueryFilter_Test_Base_stub) : ccm_stub { - after += QueryFilter_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = QueryFilter_Test_Base_stub - dynamicflags = QUERY_FILTER_TEST_BASE_STUB_BUILD_DLL STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - QueryFilter_Test_BaseC.cpp - } - - Header_Files { - QueryFilter_Test_BaseC.h - QueryFilter_Test_Base_stub_export.h - } - - Inline_Files { - QueryFilter_Test_BaseC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc index afc5d040b60..5d53907bf0d 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc @@ -85,9 +85,9 @@ project(QueryFilter_Test_Connector_stub) : ccm_stub, dds4ccm_base { } project(QueryFilter_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Connector_stub DDS4CCM_lem_stub QueryFilter_Test_Base_NDDS_TS + after += QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Connector_stub DDS4CCM_lem_stub QueryFilter_Test_Base_stub sharedname = QueryFilter_Test_Connector_exec - libs += QueryFilter_Test_Connector_stub QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Base_stub DDS4CCM_lem_stub QueryFilter_Test_Base_NDDS_TS + libs += QueryFilter_Test_Connector_stub QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Base_stub DDS4CCM_lem_stub QueryFilter_Test_Base_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc index 4675b2e663f..ce6b98edbda 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Reader_Test_Base" -project(DDS_Reader_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Reader_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=READER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Reader_Test_Base_stub_export.h IDL_Files { Reader_Test_Base.idl } -} -project(DDS_Reader_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Reader_Test_Base_idl_gen + opendds_ts_flags += --export=READER_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Reader_Test_Base.idl } } -project(DDS_Reader_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Reader_Test_Base_ndds_ts_gen DDS_Reader_Test_Base_stub - libs += DDS_Reader_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Reader_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Reader_Test_Base.cxx - Reader_Test_BasePlugin.cxx - Reader_Test_BaseSupport.cxx - } - - Header_Files { - Reader_Test_Base.h - Reader_Test_BasePlugin.h - Reader_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_Reader_Test_Base_stub) : ccm_stub { - after += DDS_Reader_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Reader_Test_Base_stub - dynamicflags = READER_TEST_BASE_STUB_BUILD_DLL STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_Test_BaseC.cpp - } - - Header_Files { - Reader_Test_BaseC.h - Reader_Test_Base_stub_export.h - } - - Inline_Files { - Reader_Test_BaseC.inl - } -} 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 766d9fc4eeb..614b24dd829 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc @@ -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_NDDS_TS + after += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc index 6deddfa04d0..0c1061efb25 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SL_Disabled_Base" -project(DDS_SL_Disabled_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_SL_Disabled_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SL_DISABLED_BASE_STUB_Export \ -Wb,stub_export_include=SL_Disabled_Base_stub_export.h IDL_Files { SL_Disabled_Base.idl } -} -project(DDS_SL_Disabled_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SL_Disabled_Base_idl_gen + opendds_ts_flags += --export=SL_DISABLED_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { SL_Disabled_Base.idl } } -project(DDS_SL_Disabled_Base_NDDS_TS) : nddslib, taolib { - after += DDS_SL_Disabled_Base_ndds_ts_gen DDS_SL_Disabled_Base_stub - libs += DDS_SL_Disabled_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SL_Disabled_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - SL_Disabled_Base.cxx - SL_Disabled_BasePlugin.cxx - SL_Disabled_BaseSupport.cxx - } - - Header_Files { - SL_Disabled_Base.h - SL_Disabled_BasePlugin.h - SL_Disabled_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SL_Disabled_Base_stub) : ccm_stub { - after += DDS_SL_Disabled_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SL_Disabled_Base_stub - dynamicflags = SL_DISABLED_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_Disabled_BaseC.cpp - } - - Header_Files { - SL_Disabled_BaseC.h - SL_Disabled_Base_stub_export.h - } - - Inline_Files { - SL_Disabled_BaseC.inl - } -} - 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 382fe87e5d4..b94119f57ea 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc @@ -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_NDDS_TS + after += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc index 9549ce8f754..ccf3161ec02 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SL_ManyByMany_Base" -project(DDS_SL_ManyByMany_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SL_MANYBYMANY_BASE_STUB_Export \ -Wb,stub_export_include=SL_ManyByMany_Base_stub_export.h IDL_Files { SL_ManyByMany_Base.idl } -} -project(DDS_SL_ManyByMany_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SL_ManyByMany_Base_idl_gen + opendds_ts_flags += --export=SL_MANYBYMANY_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { SL_ManyByMany_Base.idl } } -project(DDS_SL_ManyByMany_Base_NDDS_TS) : nddslib, taolib { - after += DDS_SL_ManyByMany_Base_ndds_ts_gen DDS_SL_ManyByMany_Base_stub - libs += DDS_SL_ManyByMany_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SL_ManyByMany_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - SL_ManyByMany_Base.cxx - SL_ManyByMany_BasePlugin.cxx - SL_ManyByMany_BaseSupport.cxx - } - - Header_Files { - SL_ManyByMany_Base.h - SL_ManyByMany_BasePlugin.h - SL_ManyByMany_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SL_ManyByMany_Base_stub) : ccm_stub { - after += DDS_SL_ManyByMany_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SL_ManyByMany_Base_stub - dynamicflags = SL_MANYBYMANY_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_ManyByMany_BaseC.cpp - } - - Header_Files { - SL_ManyByMany_BaseC.h - SL_ManyByMany_Base_stub_export.h - } - - Inline_Files { - SL_ManyByMany_BaseC.inl - } -} - 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 51f8ab8a037..f7c5a3ff88d 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc @@ -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_NDDS_TS + after += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc index 1d7342c2940..ed03e2bab1d 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SL_OneByOne_Base" -project(DDS_SL_OneByOne_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SL_ONEBYONE_BASE_STUB_Export \ -Wb,stub_export_include=SL_OneByOne_Base_stub_export.h IDL_Files { SL_OneByOne_Base.idl } -} -project(DDS_SL_OneByOne_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SL_OneByOne_Base_idl_gen + opendds_ts_flags += --export=SL_ONEBYONE_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { SL_OneByOne_Base.idl } } -project(DDS_SL_OneByOne_Base_NDDS_TS) : nddslib, taolib { - after += DDS_SL_OneByOne_Base_ndds_ts_gen DDS_SL_OneByOne_Base_stub - libs += DDS_SL_OneByOne_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SL_OneByOne_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - SL_OneByOne_Base.cxx - SL_OneByOne_BasePlugin.cxx - SL_OneByOne_BaseSupport.cxx - } - - Header_Files { - SL_OneByOne_Base.h - SL_OneByOne_BasePlugin.h - SL_OneByOne_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SL_OneByOne_Base_stub) : ccm_stub { - after += DDS_SL_OneByOne_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SL_OneByOne_Base_stub - dynamicflags = SL_ONEBYONE_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SL_OneByOne_BaseC.cpp - } - - Header_Files { - SL_OneByOne_BaseC.h - SL_OneByOne_Base_stub_export.h - } - - Inline_Files { - SL_OneByOne_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc index b133018f34b..d9bddedbaea 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc @@ -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_NDDS_TS + after += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc index 8376568d111..f0169ecde84 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SetConnectorAttribute_Base" -project(DDS_SCABase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_SCABase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_BASE_STUB_Export \ -Wb,stub_export_include=SetConnectorAttribute_Base_stub_export.h IDL_Files { SetConnectorAttribute_Base.idl } -} -project(DDS_SCABase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SCABase_idl_gen + opendds_ts_flags += --export=SETCONNECTORATTRIBUTE_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { SetConnectorAttribute_Base.idl } } -project(DDS_SCABase_NDDS_TS) : nddslib, taolib { - after += DDS_SCABase_ndds_ts_gen DDS_SCABase_stub - libs += DDS_SCABase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SCABase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - SetConnectorAttribute_Base.cxx - SetConnectorAttribute_BasePlugin.cxx - SetConnectorAttribute_BaseSupport.cxx - } - - Header_Files { - SetConnectorAttribute_Base.h - SetConnectorAttribute_BasePlugin.h - SetConnectorAttribute_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SCABase_stub) : ccm_stub { - after += DDS_SCABase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SCABase_stub - dynamicflags = SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - SetConnectorAttribute_BaseC.cpp - } - - Header_Files { - SetConnectorAttribute_BaseC.h - SetConnectorAttribute_Base_stub_export.h - } - - Inline_Files { - SetConnectorAttribute_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc index f4fe73131dc..9a219ed11f6 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc @@ -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_NDDS_TS + after += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS4CCM_lem_stub DDS_SCABase_stub sharedname = DDS_SCAConnector_exec - libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS4CCM_lem_stub DDS_SCABase_NDDS_TS + libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS4CCM_lem_stub DDS_SCABase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc index ddd7cb0fb57..153ab3d7fdd 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc @@ -1,77 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Base" -project(DDS_SharedDP_DDBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ - -Wb,stub_export_macro=Base_STUB_Export \ +project (DDS_SharedDP_DDBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ + -Wb,stub_export_macro=BASE_STUB_Export \ -Wb,stub_export_include=Base_stub_export.h IDL_Files { Base.idl } -} -project(DDS_SharedDP_DDBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SharedDP_DDBase_idl_gen - ndds_ts_flags += -corba BaseC.h -orb ACE_TAO1.7 + opendds_ts_flags += --export=BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Base.idl } } -project(DDS_SharedDP_DDBase_NDDS_TS) : nddslib, taolib { - after += DDS_SharedDP_DDBase_ndds_ts_gen DDS_SharedDP_DDBase_stub - libs += DDS_SharedDP_DDBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SharedDP_DDBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Base.cxx - BasePlugin.cxx - BaseSupport.cxx - } - - Header_Files { - Base.h - BasePlugin.h - BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SharedDP_DDBase_stub) : ccm_stub { - after += DDS_SharedDP_DDBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SharedDP_DDBase_stub - dynamicflags = Base_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BaseC.cpp - } - - Header_Files { - BaseC.h - Base_stub_export.h - } - - Inline_Files { - BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc index ac63ba51983..e824470b722 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc @@ -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_NDDS_TS + after += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub 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 45c81b405d2..52e1c8b2206 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc @@ -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_NDDS_TS + after += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub 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 4dd2572ec6b..41a76dfaa53 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc @@ -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_NDDS_TS + after += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc index 1dc9440651c..9ca2363d579 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Base" -project(DDS_SharedDPBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_SharedDPBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=Base_STUB_Export \ -Wb,stub_export_include=Base_stub_export.h IDL_Files { Base.idl } -} -project(DDS_SharedDPBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SharedDPBase_idl_gen + opendds_ts_flags += --export=BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Base.idl } } -project(DDS_SharedDPBase_NDDS_TS) : nddslib, taolib { - after += DDS_SharedDPBase_ndds_ts_gen DDS_SharedDPBase_stub - libs += DDS_SharedDPBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SharedDPBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Base.cxx - BasePlugin.cxx - BaseSupport.cxx - } - - Header_Files { - Base.h - BasePlugin.h - BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SharedDPBase_stub) : ccm_stub { - after += DDS_SharedDPBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SharedDPBase_stub - dynamicflags = Base_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - BaseC.cpp - } - - Header_Files { - BaseC.h - Base_stub_export.h - } - - Inline_Files { - BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc index 62e116908a5..216ecfe9343 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc @@ -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_NDDS_TS + after += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS4CCM_lem_stub DDS_SharedDPBase_stub sharedname = DDS_Connector_exec - libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS4CCM_lem_stub DDS_SharedDPBase_NDDS_TS + libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS4CCM_lem_stub DDS_SharedDPBase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc index 156756cbafd..68b08ddb40f 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc @@ -1,75 +1,22 @@ // $Id$ -project(DDS_SCT_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_SCT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=STATE_CONNECTION_TEST_BASE_STUB_Export \ -Wb,stub_export_include=State_Connection_Test_Base_stub_export.h IDL_Files { State_Connection_Test_Base.idl } -} -project(DDS_SCT_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_SCT_Base_idl_gen + opendds_ts_flags += --export=STATE_CONNECTION_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { State_Connection_Test_Base.idl } } -project(DDS_SCT_Base_NDDS_TS) : nddslib, taolib { - after += DDS_SCT_Base_ndds_ts_gen DDS_SCT_Base_stub - libs += DDS_SCT_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_SCT_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - State_Connection_Test_Base.cxx - State_Connection_Test_BasePlugin.cxx - State_Connection_Test_BaseSupport.cxx - } - - Header_Files { - State_Connection_Test_Base.h - State_Connection_Test_BasePlugin.h - State_Connection_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_SCT_Base_stub) : ccm_stub { - after += DDS_SCT_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_SCT_Base_stub - dynamicflags = STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - State_Connection_Test_BaseC.cpp - } - - Header_Files { - State_Connection_Test_BaseC.h - State_Connection_Test_Base_stub_export.h - } - - Inline_Files { - State_Connection_Test_BaseC.inl - } -} - 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 a839ddd8e2d..21697a3c9f5 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 @@ -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_NDDS_TS + after += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS4CCM_lem_stub DDS_SCT_Base_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc index d2ce4c07a2e..c20da15a600 100755 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc @@ -1,74 +1,22 @@ // $Id$ -project(DDS_TwoTopics_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ - -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \ +project (DDS_TwoTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ + -Wb,stub_export_macro=TWOTOPICS_TEST_BASE_STUB_Export \ -Wb,stub_export_include=TwoTopics_Base_stub_export.h IDL_Files { TwoTopics_Base.idl } -} -project(DDS_TwoTopics_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_TwoTopics_Base_idl_gen + opendds_ts_flags += --export=TWOTOPICS_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { TwoTopics_Base.idl } } -project(DDS_TwoTopics_Base_NDDS_TS) : nddslib, taolib { - after += DDS_TwoTopics_Base_ndds_ts_gen DDS_TwoTopics_Base_stub - libs += DDS_TwoTopics_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_TwoTopics_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - TwoTopics_Base.cxx - TwoTopics_BasePlugin.cxx - TwoTopics_BaseSupport.cxx - } - - Header_Files { - TwoTopics_Base.h - TwoTopics_BasePlugin.h - TwoTopics_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_TwoTopics_Base_stub) : ccm_stub { - after += DDS_TwoTopics_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_TwoTopics_Base_stub - dynamicflags = LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - TwoTopics_BaseC.cpp - } - - Header_Files { - TwoTopics_BaseC.h - TwoTopics_Base_stub_export.h - } - - Inline_Files { - TwoTopics_BaseC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc index 3426a561ab2..9a5aac0cf37 100755 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc @@ -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_NDDS_TS + after += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_stub 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 4fb6e741aaf..b8406ada9be 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc @@ -90,11 +90,11 @@ 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 \ - DDS_Goodbye_Namespace_Base_NDDS_TS DDS_Hello_Namespace_Base_NDDS_TS \ + 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 \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ - DDS_Goodbye_Namespace_Base_NDDS_TS DDS_Hello_Namespace_Base_NDDS_TS + DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub sharedname = DDS_Connector_exec libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc index c5f0c22aae5..d7702259221 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc @@ -1,75 +1,22 @@ // $Id$ -project(DDS_Goodbye_Namespace_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=GOODBYE_NAMESPACE_STUB_Export \ -Wb,stub_export_include=Goodbye_stub_export.h IDL_Files { HelloGoodbye.idl } -} -project(DDS_Goodbye_Namespace_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Goodbye_Namespace_Base_idl_gen + opendds_ts_flags += --export=GOODBYE_NAMESPACE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { HelloGoodbye.idl } } -project(DDS_Goodbye_Namespace_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Goodbye_Namespace_Base_ndds_ts_gen DDS_Goodbye_Namespace_Base_stub - libs += DDS_Goodbye_Namespace_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Goodbye_Namespace_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - HelloGoodbye.cxx - HelloGoodbyePlugin.cxx - HelloGoodbyeSupport.cxx - } - - Header_Files { - HelloGoodbye.h - HelloGoodbyePlugin.h - HelloGoodbyeSupport.h - } - - Inline_Files { - } -} - -project(DDS_Goodbye_Namespace_Base_stub) : ccm_stub { - after += DDS_Goodbye_Namespace_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Goodbye_Namespace_Base_stub - dynamicflags = GOODBYE_NAMESPACE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloGoodbyeC.cpp - } - - Header_Files { - HelloGoodbyeC.h - Goodbye_stub_export.h - } - - Inline_Files { - HelloGoodbyeC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc index 42aebfca6ee..b4ef6ef6e87 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc @@ -1,74 +1,22 @@ // $Id$ -project(DDS_Hello_Namespace_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=HELLO_NAMESPACE_STUB_Export \ -Wb,stub_export_include=Hello_stub_export.h IDL_Files { HelloGoodbye.idl } -} -project(DDS_Hello_Namespace_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Hello_Namespace_Base_idl_gen + opendds_ts_flags += --export=HELLO_NAMESPACE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { HelloGoodbye.idl } } -project(DDS_Hello_Namespace_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Hello_Namespace_Base_ndds_ts_gen DDS_Hello_Namespace_Base_stub - libs += DDS_Hello_Namespace_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Hello_Namespace_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - HelloGoodbye.cxx - HelloGoodbyePlugin.cxx - HelloGoodbyeSupport.cxx - } - - Header_Files { - HelloGoodbye.h - HelloGoodbyePlugin.h - HelloGoodbyeSupport.h - } - - Inline_Files { - } -} - -project(DDS_Hello_Namespace_Base_stub) : ccm_stub { - after += DDS_Hello_Namespace_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Hello_Namespace_Base_stub - dynamicflags = HELLO_NAMESPACE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - HelloGoodbyeC.cpp - } - - Header_Files { - HelloGoodbyeC.h - Hello_stub_export.h - } - - Inline_Files { - HelloGoodbyeC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc index d4637595a6e..f5ef65bedf7 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Unkeyed_Test_Base" -project(DDS_Unkeyed_Test_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=UNKEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Unkeyed_Test_Base_stub_export.h IDL_Files { Unkeyed_Test_Base.idl } -} -project(DDS_Unkeyed_Test_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Unkeyed_Test_Base_idl_gen + opendds_ts_flags += --export=UNKEYED_TEST_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Unkeyed_Test_Base.idl } } -project(DDS_Unkeyed_Test_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Unkeyed_Test_Base_ndds_ts_gen DDS_Unkeyed_Test_Base_stub - libs += DDS_Unkeyed_Test_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Unkeyed_Test_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Unkeyed_Test_Base.cxx - Unkeyed_Test_BasePlugin.cxx - Unkeyed_Test_BaseSupport.cxx - } - - Header_Files { - Unkeyed_Test_Base.h - Unkeyed_Test_BasePlugin.h - Unkeyed_Test_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_Unkeyed_Test_Base_stub) : ccm_stub { - after += DDS_Unkeyed_Test_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Unkeyed_Test_Base_stub - dynamicflags = UNKEYED_TEST_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Unkeyed_Test_BaseC.cpp - } - - Header_Files { - Unkeyed_Test_BaseC.h - Unkeyed_Test_Base_stub_export.h - } - - Inline_Files { - Unkeyed_Test_BaseC.inl - } -} - 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 2383233f959..602fdefe7da 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc @@ -85,9 +85,9 @@ 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_NDDS_TS + after += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_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_NDDS_TS + 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 libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc index 2211293fef0..9310944e2db 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base" -project(DDS_UnkeyedWriterBase_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += WRITER_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { Writer_Base.idl } -} -project(DDS_UnkeyedWriterBase_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_UnkeyedWriterBase_idl_gen + opendds_ts_flags += --export=WRITER_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Writer_Base.idl } } -project(DDS_UnkeyedWriterBase_NDDS_TS) : nddslib, taolib { - after += DDS_UnkeyedWriterBase_ndds_ts_gen DDS_UnkeyedWriterBase_stub - libs += DDS_UnkeyedWriterBase_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_UnkeyedWriterBase_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Writer_Base.cxx - Writer_BasePlugin.cxx - Writer_BaseSupport.cxx - } - - Header_Files { - Writer_Base.h - Writer_BasePlugin.h - Writer_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_UnkeyedWriterBase_stub) : ccm_stub { - after += DDS_UnkeyedWriterBase_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_UnkeyedWriterBase_stub - dynamicflags = WRITER_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Writer_BaseC.cpp - } - - Header_Files { - Writer_BaseC.h - Writer_Base_stub_export.h - } - - Inline_Files { - Writer_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc index c78422936d0..243fbc4b068 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc @@ -85,9 +85,9 @@ 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_NDDS_TS + after += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_stub sharedname = DDS_UnkeyedWriterConnector_exec - libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_NDDS_TS + libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc index f7dbf24108e..12959ef3f86 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Updater_Base" -project(DDS_Updater_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_Updater_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += UPDATER_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=UPDATER_BASE_STUB_Export \ -Wb,stub_export_include=Updater_Base_stub_export.h IDL_Files { Updater_Base.idl } -} -project(DDS_Updater_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_Updater_Base_idl_gen + opendds_ts_flags += --export=UPDATER_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { Updater_Base.idl } } -project(DDS_Updater_Base_NDDS_TS) : nddslib, taolib { - after += DDS_Updater_Base_ndds_ts_gen DDS_Updater_Base_stub - libs += DDS_Updater_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_Updater_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - Updater_Base.cxx - Updater_BasePlugin.cxx - Updater_BaseSupport.cxx - } - - Header_Files { - Updater_Base.h - Updater_BasePlugin.h - Updater_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_Updater_Base_stub) : ccm_stub { - after += DDS_Updater_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_Updater_Base_stub - dynamicflags = UPDATER_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Updater_BaseC.cpp - } - - Header_Files { - Updater_BaseC.h - Updater_Base_stub_export.h - } - - Inline_Files { - Updater_BaseC.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc index 8574e530fd1..666e1656d13 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc @@ -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_NDDS_TS + after += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS4CCM_lem_stub DDS_Updater_Base_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc index 30478eb529b..d7d990a8b50 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n VTopic_Base" -project(DDS_VTopic_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_VTopic_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \ -Wb,stub_export_include=VTopic_Base_stub_export.h IDL_Files { VTopic_Base.idl } -} -project(DDS_VTopic_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_VTopic_Base_idl_gen + opendds_ts_flags += --export=VTOPIC_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { VTopic_Base.idl } } -project(DDS_VTopic_Base_NDDS_TS) : nddslib, taolib { - after += DDS_VTopic_Base_ndds_ts_gen DDS_VTopic_Base_stub - libs += DDS_VTopic_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_VTopic_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - VTopic_Base.cxx - VTopic_BasePlugin.cxx - VTopic_BaseSupport.cxx - } - - Header_Files { - VTopic_Base.h - VTopic_BasePlugin.h - VTopic_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_VTopic_Base_stub) : ccm_stub { - after += DDS_VTopic_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_VTopic_Base_stub - dynamicflags = VTOPIC_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopic_BaseC.cpp - } - - Header_Files { - VTopic_BaseC.h - VTopic_Base_stub_export.h - } - - Inline_Files { - VTopic_BaseC.inl - } -} - 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 ced3bdeb81a..32911713e28 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 @@ -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_NDDS_TS + after += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub 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 5c4879afbcb..089fb797ff2 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 @@ -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_NDDS_TS + after += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub 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 c348dc4c29c..ebcda44d646 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 @@ -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_NDDS_TS + after += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub 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 6ad54619d22..2475bee40c3 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc @@ -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_NDDS_TS + after += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc index 454f0ed4a13..3164a7383eb 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc @@ -1,76 +1,22 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n VTopics_Base" -project(DDS_VTopics_Base_idl_gen) : taoidldefaults, anytypecode { - custom_only = 1 - idlflags -= -St -Sa - idlflags += -SS -Gxhst \ +project (DDS_VTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { + sharedname = * + dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \ -Wb,stub_export_include=VTopics_Base_stub_export.h IDL_Files { VTopics_Base.idl } -} -project(DDS_VTopics_Base_ndds_ts_gen) : ndds_ts_defaults { - custom_only = 1 - after += DDS_VTopics_Base_idl_gen + opendds_ts_flags += --export=VTOPICS_BASE_STUB_Export - NDDSTypeSupport_Files { + DDSGenerator_Files { VTopics_Base.idl } } -project(DDS_VTopics_Base_NDDS_TS) : nddslib, taolib { - after += DDS_VTopics_Base_ndds_ts_gen DDS_VTopics_Base_stub - libs += DDS_VTopics_Base_stub - libout = ../lib - libpaths += ../lib - sharedname = DDS_VTopics_Base_NDDS_TS - dynamicflags = NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - } - - Source_Files { - VTopics_Base.cxx - VTopics_BasePlugin.cxx - VTopics_BaseSupport.cxx - } - - Header_Files { - VTopics_Base.h - VTopics_BasePlugin.h - VTopics_BaseSupport.h - } - - Inline_Files { - } -} - -project(DDS_VTopics_Base_stub) : ccm_stub { - after += DDS_VTopics_Base_idl_gen - libout = ../lib - libpaths += ../lib - sharedname = DDS_VTopics_Base_stub - dynamicflags = VTOPICS_BASE_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - VTopics_BaseC.cpp - } - - Header_Files { - VTopics_BaseC.h - VTopics_Base_stub_export.h - } - - Inline_Files { - VTopics_BaseC.inl - } -} - 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 fe672dc596e..68441c30d6e 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 @@ -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_NDDS_TS + after += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub 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 1c93f010378..a872c3eaa29 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 @@ -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_NDDS_TS + after += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub 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 2424e534f5d..c93701ff54f 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 @@ -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_NDDS_TS + after += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub 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 269909db41b..a7ee8569970 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc @@ -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_NDDS_TS + after += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS4CCM_lem_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_NDDS_TS + libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub libpaths += ../lib libout = ../lib includes += .. |