Tue Jul 14 11:11:57 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

7 files changed, 14 insertions, 211 deletions

diff --git a/CIAO/tests/Minimum/Receiver/Receiver.cidl b/CIAO/tests/Minimum/Receiver/Receiver.cidl
deleted file mode 100644
index 89ae29a86e2..00000000000
--- a/CIAO/tests/Minimum/Receiver/Receiver.cidl
+++ /dev/null
@@ -1,17 +0,0 @@
-//$Id$
-
-#ifndef SENDER_CIDL
-#define SENDER_CIDL
-
-#include "Receiver.idl"
-
-composition session Receiver_Impl
-{
-  home executor ReceiverHome_Exec
-  {
-    implements Minimum::ReceiverHome;
-    manages    Receiver_Exec;
-  };
-};
-
-#endif /* SENDER_CIDL */
diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 3c3ed01d829..3c035c1b858 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -1,35 +1,32 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Minimum_Base Receiver"
 
-project(Minimum_Base_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Minimum_Base_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h
+              -Wb,skel_export_include=Receiver_svnt_export.h \
+              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Receiver_exec_export.h
 
   IDL_Files {
     Receiver.idl
   }
 }
 
-project(Minimum_Base_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Minimum_Base_Receiver_lem_gen) : ciaoidldefaults {
   custom_only = 1
-  cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
-               --svnt-export-include Receiver_svnt_export.h
-
-  cidlflags += -I$(CIAO_ROOT)/ccm
-
-  CIDL_Files {
-    Receiver.cidl
-  }
+  after += Minimum_Base_Receiver_idl_gen
+  idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \
+              -Wb,export_include=Receiver_exec_export.h
 
   IDL_Files {
     ReceiverE.idl
   }
 }
 
-project(Minimum_Base_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
+project(Minimum_Base_Receiver_stub) : ccm_stub {
   after += Minimum_Base_Receiver_idl_gen Minimum_Base_stub
   libs  += Minimum_Base_stub
   libpaths += ../Minimum_Base
@@ -54,8 +51,8 @@ project(Minimum_Base_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
   }
 }
 
-project(Minimum_Base_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Minimum_Base_Receiver_cidl_gen Minimum_Base_Receiver_stub
+project(Minimum_Base_Receiver_exec) : ciao_executor {
+  after   += Minimum_Base_Receiver_lem_gen Minimum_Base_Receiver_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Minimum_Base_stub
   libpaths += ../Minimum_Base
@@ -82,7 +79,7 @@ project(Minimum_Base_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
 }
 
 
-project(Minimum_Base_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
+project(Minimum_Base_Receiver_svnt) : ciao_servant {
   after      += Minimum_Base_skel Minimum_Base_Receiver_exec
   sharedname  = Receiver_svnt
   libs       += Minimum_Base_stub \
@@ -92,9 +89,6 @@ project(Minimum_Base_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
index 2a3f5522ea0..3e3f9a66040 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
@@ -21,7 +21,7 @@
 #include "Receiver_exec.h"
 #include "ciao/CIAO_common.h"
 
-namespace CIDL_Receiver_Impl
+namespace CIAO_Minimum_Receiver_Impl
 {
   //==================================================================
   // Component Executor Implementation Class:   Receiver_exec_i
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
index 458321260bd..b8e7b3fae39 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
@@ -32,7 +32,7 @@
 #include "Receiver_exec_export.h"
 #include "tao/LocalObject.h"
 
-namespace CIDL_Receiver_Impl
+namespace CIAO_Minimum_Receiver_Impl
 {
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h b/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h
deleted file mode 100644
index 9ae7b9ce799..00000000000
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_EXEC
-// ------------------------------
-#ifndef RECEIVER_EXEC_EXPORT_H
-#define RECEIVER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_EXEC_HAS_DLL)
-#  define RECEIVER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RECEIVER_EXEC_HAS_DLL */
-
-#if !defined (RECEIVER_EXEC_HAS_DLL)
-#  define RECEIVER_EXEC_HAS_DLL 1
-#endif /* ! RECEIVER_EXEC_HAS_DLL */
-
-#if defined (RECEIVER_EXEC_HAS_DLL) && (RECEIVER_EXEC_HAS_DLL == 1)
-#  if defined (RECEIVER_EXEC_BUILD_DLL)
-#    define RECEIVER_EXEC_Export ACE_Proper_Export_Flag
-#    define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_EXEC_BUILD_DLL */
-#    define RECEIVER_EXEC_Export ACE_Proper_Import_Flag
-#    define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_EXEC_BUILD_DLL */
-#else /* RECEIVER_EXEC_HAS_DLL == 1 */
-#  define RECEIVER_EXEC_Export
-#  define RECEIVER_EXEC_SINGLETON_DECLARATION(T)
-#  define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_EXEC_HAS_DLL == 1 */
-
-// Set RECEIVER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_EXEC_NTRACE */
-
-#if (RECEIVER_EXEC_NTRACE == 1)
-#  define RECEIVER_EXEC_TRACE(X)
-#else /* (RECEIVER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_EXEC_NTRACE == 1) */
-
-#endif /* RECEIVER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h b/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h
deleted file mode 100644
index ad411db973f..00000000000
--- a/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_STUB
-// ------------------------------
-#ifndef RECEIVER_STUB_EXPORT_H
-#define RECEIVER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_STUB_HAS_DLL)
-#  define RECEIVER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RECEIVER_STUB_HAS_DLL */
-
-#if !defined (RECEIVER_STUB_HAS_DLL)
-#  define RECEIVER_STUB_HAS_DLL 1
-#endif /* ! RECEIVER_STUB_HAS_DLL */
-
-#if defined (RECEIVER_STUB_HAS_DLL) && (RECEIVER_STUB_HAS_DLL == 1)
-#  if defined (RECEIVER_STUB_BUILD_DLL)
-#    define RECEIVER_STUB_Export ACE_Proper_Export_Flag
-#    define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_STUB_BUILD_DLL */
-#    define RECEIVER_STUB_Export ACE_Proper_Import_Flag
-#    define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_STUB_BUILD_DLL */
-#else /* RECEIVER_STUB_HAS_DLL == 1 */
-#  define RECEIVER_STUB_Export
-#  define RECEIVER_STUB_SINGLETON_DECLARATION(T)
-#  define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_STUB_HAS_DLL == 1 */
-
-// Set RECEIVER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_STUB_NTRACE */
-
-#if (RECEIVER_STUB_NTRACE == 1)
-#  define RECEIVER_STUB_TRACE(X)
-#else /* (RECEIVER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_STUB_NTRACE == 1) */
-
-#endif /* RECEIVER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h b/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h
deleted file mode 100644
index 51ed45dc299..00000000000
--- a/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_SVNT
-// ------------------------------
-#ifndef RECEIVER_SVNT_EXPORT_H
-#define RECEIVER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_SVNT_HAS_DLL)
-#  define RECEIVER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RECEIVER_SVNT_HAS_DLL */
-
-#if !defined (RECEIVER_SVNT_HAS_DLL)
-#  define RECEIVER_SVNT_HAS_DLL 1
-#endif /* ! RECEIVER_SVNT_HAS_DLL */
-
-#if defined (RECEIVER_SVNT_HAS_DLL) && (RECEIVER_SVNT_HAS_DLL == 1)
-#  if defined (RECEIVER_SVNT_BUILD_DLL)
-#    define RECEIVER_SVNT_Export ACE_Proper_Export_Flag
-#    define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_SVNT_BUILD_DLL */
-#    define RECEIVER_SVNT_Export ACE_Proper_Import_Flag
-#    define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_SVNT_BUILD_DLL */
-#else /* RECEIVER_SVNT_HAS_DLL == 1 */
-#  define RECEIVER_SVNT_Export
-#  define RECEIVER_SVNT_SINGLETON_DECLARATION(T)
-#  define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_SVNT_HAS_DLL == 1 */
-
-// Set RECEIVER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_SVNT_NTRACE */
-
-#if (RECEIVER_SVNT_NTRACE == 1)
-#  define RECEIVER_SVNT_TRACE(X)
-#else /* (RECEIVER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_SVNT_NTRACE == 1) */
-
-#endif /* RECEIVER_SVNT_EXPORT_H */
-
-// End of auto generated file.