ChangeLogTag: Mon Aug 1 19:39:30 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 88 insertions, 8 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 79a61a49493..b84f52896af 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Aug  1 19:39:30 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
+        
+          Removed duplicate 'after' and 'libs' items, and added the
+          new export macro definition file (see below) to
+          Header_Files.
+          
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
+        
+          Added export macro to class declaration and include of export
+          macro definitin file.
+          
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h:
+        
+          New file to define the export macro for the Plan_Launcher_Impl
+          library.
+
 Fri Jul 31 21:56:43 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
 
         * DAnCE/new_RepositoryManager/Options.h
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
index e8eb5719b1b..a16c7be1c2a 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -8,7 +8,6 @@ project(Plan_Launcher_Impl) : naming, ciao_server_dnc, xerces {
   after += XSC_Config_Handlers ExecutionManager_stub NodeDaemon_stub
   libs     += XSC_Config_Handlers
   libs     += ExecutionManager_stub
-  after    += XSC_Config_Handlers
   
   dynamicflags = PLAN_LAUNCHER_IMPL_BUILD_DLL
   
@@ -16,16 +15,18 @@ project(Plan_Launcher_Impl) : naming, ciao_server_dnc, xerces {
     Plan_Launcher_Impl.cpp
     DAM_Map.cpp
   }
+
+  Header_Files {
+    Plan_Launcher_Impl_Export.h
+  }
 }
 
 project(Plan_Launcher) : ciao_server_dnc, taoexe  {
   exename = plan_launcher
 
 
-  after += XSC_Config_Handlers ExecutionManager_stub NodeDaemon_stub
-  libs     += XSC_Config_Handlers Plan_Launcher_Impl
-  libs     += ExecutionManager_stub
-  after    += XSC_Config_Handlers Plan_Launcher_Impl
+  after += Plan_Launcher_Impl
+  libs  += XSC_Config_Handlers Plan_Launcher_Impl ExecutionManager_stub
 
   Source_Files {
     Plan_Launcher.cpp
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 1c1ec86896a..68f0f65d13e 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -8,10 +8,13 @@
  */
 #ifndef PLAN_LAUNCHER_IMPL_H
 #define PLAN_LAUNCHER_IMPL_H
-#include "DeploymentS.h"
-#include "CIAO_common.h"
+
+#include "Plan_Launcher_Impl_Export.h"
+#include "ciao/DeploymentS.h"
+#include "ciao/CIAO_common.h"
 #include "ExecutionManager/DAM_Map.h"
 #include "ExecutionManager/ExecutionManagerC.h"
+
 namespace CIAO
 {
   namespace Plan_Launcher
@@ -21,7 +24,7 @@ namespace CIAO
      * @class Plan_Launcher_i
      * @brief This class launches and manages deployment plans.
      */
-    class Plan_Launcher_i
+    class Plan_Launcher_Impl_Export Plan_Launcher_i
     {
     public:
       Plan_Launcher_i ();
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h
new file mode 100644
index 00000000000..1c85d1b98c9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s Config_Handlers
+// ------------------------------
+#ifndef PLAN_LAUNCHER_IMPL_EXPORT_H
+#define PLAN_LAUNCHER_IMPL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (PLAN_LAUNCHER_IMPL_HAS_DLL)
+#  define PLAN_LAUNCHER_IMPL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && PLAN_LAUNCHER_IMPL_HAS_DLL */
+
+#if !defined (PLAN_LAUNCHER_IMPL_HAS_DLL)
+#  define PLAN_LAUNCHER_IMPL_HAS_DLL 1
+#endif /* ! PLAN_LAUNCHER_IMPL_HAS_DLL */
+
+#if defined (PLAN_LAUNCHER_IMPL_HAS_DLL) && (PLAN_LAUNCHER_IMPL_HAS_DLL == 1)
+#  if defined (PLAN_LAUNCHER_IMPL_BUILD_DLL)
+#    define Plan_Launcher_Impl_Export ACE_Proper_Export_Flag
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_LAUNCHER_IMPL_BUILD_DLL */
+#    define Plan_Launcher_Impl_Export ACE_Proper_Import_Flag
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_LAUNCHER_IMPL_BUILD_DLL */
+#else /* PLAN_LAUNCHER_IMPL_HAS_DLL == 1 */
+#  define Plan_Launcher_Impl_Export
+#  define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARATION(T)
+#  define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_LAUNCHER_IMPL_HAS_DLL == 1 */
+
+// Set PLAN_LAUNCHER_IMPL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_LAUNCHER_IMPL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_LAUNCHER_IMPL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_LAUNCHER_IMPL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_LAUNCHER_IMPL_NTRACE */
+
+#if (PLAN_LAUNCHER_IMPL_NTRACE == 1)
+#  define PLAN_LAUNCHER_IMPL_TRACE(X)
+#else /* (PLAN_LAUNCHER_IMPL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_LAUNCHER_IMPL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_LAUNCHER_IMPL_NTRACE == 1) */
+
+#endif /* PLAN_LAUNCHER_IMPL_EXPORT_H */
+
+// End of auto generated file.