Mon Dec 6 00:27:20 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * MPC/config/dds4ccm_ts_default.mpb:
          Updated some comments

        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc:
        * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl:
        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
          Fixed compile problems when no dds implementation is enabled

5 files changed, 32 insertions, 30 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e29fe165918..67572a6f8f6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec  6 00:27:20 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm_ts_default.mpb:
+          Updated some comments
+
+        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc:
+        * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl:
+        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
+          Fixed compile problems when no dds implementation is enabled
+
 Sat Dec  4 10:37:05 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp:
diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb
index 3f91c951d2b..22220ef3127 100644
--- a/CIAO/MPC/config/dds4ccm_ts_default.mpb
+++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb
@@ -39,7 +39,7 @@ feature(!dds4ccm_opendds) {
 }
 
 feature(!dds4ccm_ndds) {
-  // this allows the user's project to reference opendds_ts_flags,
+  // this allows the user's project to reference ndds_ts_flags,
   // which will simply be ignored
   Define_Custom(NDDSDummyTypeSupport) {
     keyword ndds_ts_flags
@@ -47,7 +47,7 @@ feature(!dds4ccm_ndds) {
 }
 
 feature(!dds4ccm_splice) {
-  // this allows the user's project to reference opendds_ts_flags,
+  // this allows the user's project to reference splice_ts_flags,
   // which will simply be ignored
   Define_Custom(SpliceDummyTypeSupport) {
     keyword splice_ts_flags
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
index 9a40a67f6a0..149c177b3b8 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
@@ -1,23 +1,17 @@
 // $Id$
-project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+
+project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CCM_DDS_MT_STUB_Export \
               -Wb,stub_export_include=ccm_dds_mt_stub_export.h \
               -Wb,skel_export_macro=CCM_DDS_MT_SKEL_Export \
               -Wb,skel_export_include=ccm_dds_mt_skel_export.h \
-              -SS -Gxhst \
+              -SS -Scc -Sci -Gxhst \
               -I $(CIAO_ROOT)/connectors/dds4ccm/idl
 
   IDL_Files {
     ccm_dds_mt.idl
   }
-
-  opendds_ts_flags += --export=CCM_DDS_MT_STUB_Export
-  ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-  
-  DDSGenerator_Files {
-    ccm_dds_mt.idl
-  }
 }
 
 project(DDS_MultiTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
@@ -53,8 +47,8 @@ project(DDS_MultiTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_MultiTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_MultiTopic_Connector_lem_gen DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub 
-  libs  += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub 
+  after += DDS_MultiTopic_Connector_lem_gen DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
+  libs  += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -105,9 +99,9 @@ project(DDS_MultiTopic_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub 
+  after   += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub
   sharedname = DDS_MultiTopic_Connector_exec
-  libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Base_stub 
+  libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -131,12 +125,12 @@ project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_exec DDS_MultiTopic_Connector_stub 
+  after      += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_exec DDS_MultiTopic_Connector_stub
   sharedname  = DDS_MultiTopic_Connector_svnt
   libs       += DDS_MultiTopic_Connector_stub \
                 DDS_MultiTopic_Connector_lem_stub  \
                 DDS_MultiTopic_Base_stub \
-                DDS_MultiTopic_Connector_exec 
+                DDS_MultiTopic_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
index a2c7616c550..a3cd3283b2c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
@@ -12,9 +12,7 @@
 
 #pragma dds4ccm impl "MultiTopic_Connector_T.h"
 
-#if defined (__TAO_IDL)
 #include <ccm_dds.idl>
-#endif
 
 /**
  * @namespace CCM_DDS_MT
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
index 04a2fb82273..afb4c079a72 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
@@ -24,7 +24,7 @@ project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default {
   }
 }
 
-project (DDS_CCM_Example_PSAT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts_default {
+project (DDS_CCM_Example_PSAT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts_default, dds4ccm {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CCM_DDS_PSAT_STUB_Export \
               -Wb,stub_export_include=ccm_dds_psat_stub_export.h \
@@ -39,7 +39,7 @@ project (DDS_CCM_Example_PSAT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts
 
   opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export
   ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-  
+
   DDSGenerator_Files {
     ccm_dds_psat.idl
   }
@@ -51,10 +51,10 @@ project (DDS_CCM_Example_PSAT_stub) : anytypecode, dds4ccm_stub, ccm_stub, dds4c
   dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL
   libout = lib
   includes += -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-  
+
   IDL_Files {
   }
-  
+
   Source_Files {
     ccm_dds_psat.cxx
     ccm_dds_psatC.cpp
@@ -69,7 +69,7 @@ project (DDS_CCM_Example_PSAT_stub) : anytypecode, dds4ccm_stub, ccm_stub, dds4c
     ccm_dds_psatSupport.h
     ccm_dds_psat_stub_export.h
   }
-  
+
   Inline_Files {
     ccm_dds_psatC.inl
   }
@@ -109,9 +109,9 @@ project(PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after  += PSAT_Connector_lem_gen \
             DDS_PSAT_Connector_stub \
-            DDS_CCM_Example_PSAT_stub 
+            DDS_CCM_Example_PSAT_stub
   libs   += DDS_CCM_Example_PSAT_stub \
-            DDS_PSAT_Connector_stub 
+            DDS_PSAT_Connector_stub
   libpaths += lib
   libout = lib
   includes += ..
@@ -164,12 +164,12 @@ project(DDS_PSAT_Connector_stub) : ccm_stub, dds4ccm_base {
 project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl {
   after    += DDS_CCM_Example_PSAT_type_stub \
               PSAT_Connector_lem_stub \
-              DDS_PSAT_Connector_stub 
+              DDS_PSAT_Connector_stub
   sharedname = DDS_PSAT_Connector_exec
   libs += DDS_CCM_Example_PSAT_type_stub \
           DDS_PSAT_Connector_stub \
           PSAT_Connector_lem_stub \
-          DDS_CCM_Example_PSAT_stub 
+          DDS_CCM_Example_PSAT_stub
   libpaths += lib
   libout = lib
   includes += ..
@@ -196,12 +196,12 @@ project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl {
 project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += PSAT_Connector_lem_stub \
                 DDS_PSAT_Connector_exec \
-                DDS_PSAT_Connector_skel 
+                DDS_PSAT_Connector_skel
   sharedname  = DDS_PSAT_Connector_svnt
   libs       += DDS_PSAT_Connector_stub \
                 PSAT_Connector_lem_stub  \
                 DDS_CCM_Example_PSAT_stub \
-                DDS_PSAT_Connector_exec 
+                DDS_PSAT_Connector_exec
   libpaths += lib
   libout = lib
   includes += ..