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

2 files changed, 10 insertions, 63 deletions

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 += ..