Sun Apr 10 12:04:57 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * MPC/config/ndds_ts_default.mpb:
          Derive from the new ndds_cck_ts_defaults, we always use the CCK for
          dds4ccm

        * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp:
          No need for the CCK and TAO, we just use ACE to get a portable
          main

12 files changed, 36 insertions, 27 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 41cdc5b4f99..9885a6317e0 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,22 @@
+Sun Apr 10 12:04:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ndds_ts_default.mpb:
+          Derive from the new ndds_cck_ts_defaults, we always use the CCK for
+          dds4ccm
+
+        * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp:
+          No need for the CCK and TAO, we just use ACE to get a portable
+          main
+
 Sun Apr 10 03:40:52 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp:
diff --git a/CIAO/MPC/config/ndds_ts_default.mpb b/CIAO/MPC/config/ndds_ts_default.mpb
index facbe03a3af..867171151b7 100644
--- a/CIAO/MPC/config/ndds_ts_default.mpb
+++ b/CIAO/MPC/config/ndds_ts_default.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ndds_ts_defaults, nddslib, typecode {
+project : ndds_cck_ts_defaults, nddslib, typecode {
   Define_Custom(DDSGenerator) : NDDSTypeSupport {
     commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT)
     keyword dds_ts_flags = commandflags
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
index 7c717f65e73..1390b8ab990 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
@@ -1,19 +1,10 @@
 // $Id$
 
-project(Base_stub) : taoidldefaults, ndds_ts_defaults, typecode, nddslib {
+project(Base_stub) : ndds_ts_defaults, nddslib {
   sharedname = Base_stub
-  dynamicflags += BASE_STUB_BUILD_DLL NDDS_USER_DLL_EXPORT
+  dynamicflags += NDDS_USER_DLL_EXPORT
   libout = ../descriptors
 
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
   NDDSTypeSupport_Files {
     Base.idl
   }
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
index 24092609c1a..920505cdd81 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*qc_receiver) : nddslib, ndds_ts_default {
+project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_receiver
   after += Base_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
index 89ff5169e89..904268dc8df 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
@@ -8,6 +8,8 @@ using namespace std;
 #include "Base.h"
 #include "BaseSupport.h"
 
+#include "ace/OS_main.h"
+
 #define LIBRARY_NAME  "QueryCondition_Library"
 #define PROFILE_NAME  "QueryCondition_Profile"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
index d272df47d83..72aa1a8c62a 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*qc_sender) : nddslib, ndds_ts_default {
+project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_Sender
   after += Base_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
index 2e862a82198..ff1fff4ae4c 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
@@ -8,6 +8,8 @@ using namespace std;
 #include "Base.h"
 #include "BaseSupport.h"
 
+#include "ace/OS_main.h"
+
 #define LIBRARY_NAME  "QueryCondition_Library"
 #define PROFILE_NAME  "QueryCondition_Profile"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
index 31644caf80e..624f91e0fc7 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
@@ -1,19 +1,10 @@
 // $Id$
 
-project(Base_obo_stub) : taoidldefaults, ndds_ts_defaults, typecode, nddslib {
+project(Base_obo_stub) : ndds_ts_defaults, nddslib {
   sharedname = Base_obo_stub
-  dynamicflags += BASE_OBO_STUB_BUILD_DLL NDDS_USER_DLL_EXPORT
+  dynamicflags += NDDS_USER_DLL_EXPORT
   libout = ../descriptors
 
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_OBO_STUB_Export \
-              -Wb,stub_export_include=Base_obo_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base_ObO.idl
-  }
-
   NDDSTypeSupport_Files {
     Base_ObO.idl
   }
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
index eb96ae7b3ab..856c3d75054 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*qc_receiver) : nddslib, ndds_ts_default {
+project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_ObO_receiver
   after += Base_obo_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
index a4fdc2d7f62..e4c74e6fc6a 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
@@ -5,6 +5,8 @@
 
 using namespace std;
 
+#include "ace/OS_main.h"
+
 #include "Base_ObO.h"
 #include "Base_ObOSupport.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
index 15725b3fcc0..da502e4a8be 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*qc_sender) : nddslib, ndds_ts_default {
+project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
   exename = DDS_ObO_Sender
   after += Base_obo_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
index bcbdeddb1e8..bfcddb3e03b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
@@ -5,6 +5,8 @@
 
 using namespace std;
 
+#include "ace/OS_main.h"
+
 #include "Base_ObO.h"
 #include "Base_ObOSupport.h"