Tue May 18 12:10:06 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/OneFile:
        * connectors/dds4ccm/tests/OneFile/Multiple:
        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl:
        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc:
        * connectors/dds4ccm/tests/OneFile/Single:
        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl:
        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc:
          Added compilation tests which tests whether the declaration of a
          topic and a connector in one single IDL file compiles correctly.

2 files changed, 162 insertions, 0 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
new file mode 100644
index 00000000000..495eba2eac6
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
@@ -0,0 +1,31 @@
+// $Id$
+
+/**
+ * @file TwoTopics_Connector.idl
+ * @author Marcel Smit <msmit@remedy.nl>
+ */
+
+#ifndef ONEFILE_CONNECTOR_IDL_
+#define ONEFILE_CONNECTOR_IDL_
+
+#if defined __TAO_IDL
+#include "connectors/dds4ccm/idl/ccm_dds.idl"
+#endif
+
+#pragma ndds typesupport "OneFile_ConnectorSupport.h"
+#pragma ciao lem "OneFile_ConnectorE.idl"
+
+struct OneFileTopic {
+  string hello; //@key
+  long iteration;
+};
+typedef sequence<OneFileTopic> OneFileTopicSeq;
+
+module OneFile_Connector
+{
+  module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
+};
+
+module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
+
+#endif /* ONEFILE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
new file mode 100755
index 00000000000..1078b9d1641
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
@@ -0,0 +1,131 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -b dds4ccm_base OneFile_Connector"
+
+project(OneFile_Connector_idl_gen) : connectoridldefaults, taoidldefaults, \
+                                 dds4ccm, anytypecode, dds4ccm_ts_default {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_STUB_Export \
+              -Wb,stub_export_include=OneFile_Connector_stub_export.h \
+              -Wb,skel_export_macro=ONEFILE_CONNECTOR_SVNT_Export \
+              -Wb,skel_export_include=OneFile_Connector_svnt_export.h \
+              -Wb,conn_export_macro=ONEFILE_CONNECTOR_CONN_Export \
+              -Wb,conn_export_include=OneFile_Connector_conn_export.h \
+              -Gxhex -Gxhsk -Gxhst
+  IDL_Files {
+    OneFile_Connector.idl
+  }
+
+  DDSGenerator_Files {
+    OneFile_Connector.idl
+  }
+}
+
+project(OneFile_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+  after    += OneFile_Connector_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_LEM_STUB_Export \
+              -Wb,stub_export_include=OneFile_Connector_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    OneFile_ConnectorE.idl
+  }
+}
+
+project(OneFile_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
+  after    += OneFile_Connector_lem_gen OneFile_Connector_stub
+  libs     += OneFile_Connector_stub
+
+  sharedname = OneFile_Connector_lem_stub
+  dynamicflags = ONEFILE_CONNECTOR_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    OneFile_ConnectorEC.cpp
+  }
+
+  Header_Files {
+    OneFile_ConnectorEC.h
+    OneFile_Connector_lem_stub_export.h
+  }
+
+  Inline_Files {
+    OneFile_ConnectorEC.inl
+  }
+}
+
+project(OneFile_Connector_stub) : ccm_stub, dds4ccm_base {
+  after    += OneFile_Connector_idl_gen
+  sharedname = OneFile_Connector_stub
+  dynamicflags = ONEFILE_CONNECTOR_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    OneFile_ConnectorC.cpp
+  }
+
+  Header_Files {
+    OneFile_ConnectorC.h
+    OneFile_Connector_stub_export.h
+  }
+
+  Inline_Files {
+    OneFile_ConnectorC.inl
+  }
+}
+
+project(OneFile_Connector_exec) : ciao_executor, dds4ccm_impl, dds4ccm_lem_stub  {
+  after    += OneFile_Connector_lem_stub OneFile_Connector_stub
+  sharedname = OneFile_Connector_exec
+  libs     += OneFile_Connector_stub OneFile_Connector_lem_stub
+
+  dynamicflags = ONEFILE_CONNECTOR_CONN_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    OneFile_Connector_conn.cpp
+  }
+
+  Header_Files {
+    OneFile_Connector_conn.h
+    OneFile_Connector_conn_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub  {
+  after      += OneFile_Connector_lem_stub
+  sharedname  = OneFile_Connector_svnt
+  libs       += OneFile_Connector_stub OneFile_Connector_lem_stub
+
+  dynamicflags = ONEFILE_CONNECTOR_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    OneFile_ConnectorS.cpp
+    OneFile_Connector_svnt.cpp
+  }
+
+  Header_Files {
+    OneFile_ConnectorS.h
+    OneFile_Connector_svnt.h
+    OneFile_Connector_svnt_export.h
+  }
+
+  Inline_Files {
+    OneFile_ConnectorS.inl
+  }
+}
+
+