8 files changed, 36 insertions, 16 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
index b755cc4155e..60696f3b55f 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
@@ -24,18 +24,25 @@ struct SharedDPTest1 {
   string key1;
   long iteration1;
 };
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest1> SharedDPTest1Seq;
+#endif
 
 struct SharedDPTest2 {
   string key2;
   long iteration2;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest2> SharedDPTest2Seq;
+#endif
 
 struct SharedDPTest3 {
   string key3;
   long iteration3;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest3> SharedDPTest3Seq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index a1999b81ff5..9293423f2bf 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -100,7 +100,8 @@ project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_impl {
   includes += ..
   libout = ../lib
   dynamicflags += COMPONENT_EXEC_BUILD_DLL
-  requires += ndds
+
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
index edbb93d61f1..bbd5643d6ad 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector1/Connector1E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector1
 {
   module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index 47577d5f9d0..3d85c0181dc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
               -Wb,stub_export_include=Connector1_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub 
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub 
+  after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub
+  libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub 
+  after      += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub
   sharedname  = DDS_Connector1_svnt
   libs       += DDS_Connector1_stub \
                 DDS_Connector1_lem_stub  \
                 DDS_SharedDP_DDBase_stub \
-                DDS_Connector1_exec 
+                DDS_Connector1_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
index 51a1fbcb3b0..c9a54be1cd2 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector2/Connector2E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector2
 {
   module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index 25b513ce964..a2698aca377 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
               -Wb,stub_export_include=Connector2_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub 
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector2_stub 
+  after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub
+  libs  += DDS_SharedDP_DDBase_stub DDS_Connector2_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub 
+  after      += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub
   sharedname  = DDS_Connector2_svnt
   libs       += DDS_Connector2_stub \
                 DDS_Connector2_lem_stub  \
                 DDS_SharedDP_DDBase_stub \
-                DDS_Connector2_exec 
+                DDS_Connector2_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
index 13e64e91aed..21196720078 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector3/Connector3E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector3
 {
   module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index 8d687b20c36..8bc2b4f99f5 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
               -Wb,stub_export_include=Connector3_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub 
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector3_stub 
+  after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub
+  libs  += DDS_SharedDP_DDBase_stub DDS_Connector3_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub 
+  after      += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub
   sharedname  = DDS_Connector3_svnt
   libs       += DDS_Connector3_stub \
                 DDS_Connector3_lem_stub  \
                 DDS_SharedDP_DDBase_stub \
-                DDS_Connector3_exec 
+                DDS_Connector3_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..