Tue Nov 7 19:23:15 UTC 2006 Nishanth Shankaran <nshankar@nospam.com>

18 files changed, 422 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 7675c9f5933..eb9e1070426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+Tue Nov  7 19:23:15 UTC 2006  Nishanth Shankaran  <nshankar@nospam.com>
+
+        * SA_POP/Builder.h:
+        * SA_POP/LogScreenOut.h:
+        * SA_POP/LogScreenOut_Export.h:
+
+        * SA_POP/SANet/SANetFileIn.h:
+        * SA_POP/SANet/SANetFileIn_Export.h:
+
+        * SA_POP/SA_Builder.h:
+        * SA_POP/SA_Builder.cpp:
+        * SA_POP/SA_Builder_Export.h:
+        * SA_POP/SA_POP.mpc:
+        * SA_POP/TaskMapFileIn.h:
+        * SA_POP/TaskMapFileIn_Export.h:
+
+        * SA_POP/server/Driver.h:
+        * SA_POP/server/Driver.cpp:
+        * SA_POP/server/Driver.idl:
+        * SA_POP/server/Driver.mpc:
+        * SA_POP/server/Driver_stub_export.h:
+        * SA_POP/server/Driver_svnt_export.h: Fixed problems related to
+          "export macros" on windows.
+
 Mon Nov  6 22:37:28 UTC 2006  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * SA_POP/server/Driver.mpc:
diff --git a/SA_POP/Builder.h b/SA_POP/Builder.h
index 9097115887d..2462c70134c 100644
--- a/SA_POP/Builder.h
+++ b/SA_POP/Builder.h
@@ -19,6 +19,7 @@
 #include "SA_POP_Types.h"
 #include "Planner.h"
 
+
 namespace SA_POP {
 
   /**
diff --git a/SA_POP/LogScreenOut.h b/SA_POP/LogScreenOut.h
index 9ae7322e0ab..b81a2467f50 100644
--- a/SA_POP/LogScreenOut.h
+++ b/SA_POP/LogScreenOut.h
@@ -17,6 +17,7 @@
 
 #include <iostream>
 #include "OutAdapter.h"
+#include "LogScreenOut_Export.h"
 
 namespace SA_POP {
 
@@ -26,7 +27,7 @@ namespace SA_POP {
    * @brief Output adapter that displays plan changes on the screen as they
    *        occur.
    */
-  class LogScreenOut : public OutAdapter {
+  class LOGSCREENOUT_Export LogScreenOut : public OutAdapter {
   public:
     /// Constructor.
     /**
diff --git a/SA_POP/LogScreenOut_Export.h b/SA_POP/LogScreenOut_Export.h
new file mode 100644
index 00000000000..193ad4fd124
--- /dev/null
+++ b/SA_POP/LogScreenOut_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl LOGSCREENOUT
+// ------------------------------
+#ifndef LOGSCREENOUT_EXPORT_H
+#define LOGSCREENOUT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (LOGSCREENOUT_HAS_DLL)
+#  define LOGSCREENOUT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && LOGSCREENOUT_HAS_DLL */
+
+#if !defined (LOGSCREENOUT_HAS_DLL)
+#  define LOGSCREENOUT_HAS_DLL 1
+#endif /* ! LOGSCREENOUT_HAS_DLL */
+
+#if defined (LOGSCREENOUT_HAS_DLL) && (LOGSCREENOUT_HAS_DLL == 1)
+#  if defined (LOGSCREENOUT_BUILD_DLL)
+#    define LOGSCREENOUT_Export ACE_Proper_Export_Flag
+#    define LOGSCREENOUT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define LOGSCREENOUT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* LOGSCREENOUT_BUILD_DLL */
+#    define LOGSCREENOUT_Export ACE_Proper_Import_Flag
+#    define LOGSCREENOUT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define LOGSCREENOUT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* LOGSCREENOUT_BUILD_DLL */
+#else /* LOGSCREENOUT_HAS_DLL == 1 */
+#  define LOGSCREENOUT_Export
+#  define LOGSCREENOUT_SINGLETON_DECLARATION(T)
+#  define LOGSCREENOUT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* LOGSCREENOUT_HAS_DLL == 1 */
+
+// Set LOGSCREENOUT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (LOGSCREENOUT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define LOGSCREENOUT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define LOGSCREENOUT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !LOGSCREENOUT_NTRACE */
+
+#if (LOGSCREENOUT_NTRACE == 1)
+#  define LOGSCREENOUT_TRACE(X)
+#else /* (LOGSCREENOUT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define LOGSCREENOUT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (LOGSCREENOUT_NTRACE == 1) */
+
+#endif /* LOGSCREENOUT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/SA_POP/SANet/SANetFileIn.h b/SA_POP/SANet/SANetFileIn.h
index 4e27d05840d..6049712a641 100644
--- a/SA_POP/SANet/SANetFileIn.h
+++ b/SA_POP/SANet/SANetFileIn.h
@@ -17,6 +17,7 @@
 
 #include "SANet_Types.h"
 #include "SANet.h"
+#include "SANetFileIn_Export.h"
 
 #if !defined (SANET_STANDALONE)
 #include "Builder.h"
@@ -30,7 +31,8 @@ namespace SANet {
    * @brief Input adapter that initializes a SANet object using an XML
    *        SANet file.
    */
-  class SANetFileIn {
+  class SANETFILEIN_Export SANetFileIn {
+//class SANetFileIn {
   public:
     /// Constructor.
     SANetFileIn (void);
diff --git a/SA_POP/SANet/SANetFileIn_Export.h b/SA_POP/SANet/SANetFileIn_Export.h
new file mode 100644
index 00000000000..395cddbae2e
--- /dev/null
+++ b/SA_POP/SANet/SANetFileIn_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SANETFILEIN
+// ------------------------------
+#ifndef SANETFILEIN_EXPORT_H
+#define SANETFILEIN_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SANETFILEIN_HAS_DLL)
+#  define SANETFILEIN_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SANETFILEIN_HAS_DLL */
+
+#if !defined (SANETFILEIN_HAS_DLL)
+#  define SANETFILEIN_HAS_DLL 1
+#endif /* ! SANETFILEIN_HAS_DLL */
+
+#if defined (SANETFILEIN_HAS_DLL) && (SANETFILEIN_HAS_DLL == 1)
+#  if defined (SANETFILEIN_BUILD_DLL)
+#    define SANETFILEIN_Export ACE_Proper_Export_Flag
+#    define SANETFILEIN_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SANETFILEIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SANETFILEIN_BUILD_DLL */
+#    define SANETFILEIN_Export ACE_Proper_Import_Flag
+#    define SANETFILEIN_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SANETFILEIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SANETFILEIN_BUILD_DLL */
+#else /* SANETFILEIN_HAS_DLL == 1 */
+#  define SANETFILEIN_Export
+#  define SANETFILEIN_SINGLETON_DECLARATION(T)
+#  define SANETFILEIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SANETFILEIN_HAS_DLL == 1 */
+
+// Set SANETFILEIN_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SANETFILEIN_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SANETFILEIN_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SANETFILEIN_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SANETFILEIN_NTRACE */
+
+#if (SANETFILEIN_NTRACE == 1)
+#  define SANETFILEIN_TRACE(X)
+#else /* (SANETFILEIN_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SANETFILEIN_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SANETFILEIN_NTRACE == 1) */
+
+#endif /* SANETFILEIN_EXPORT_H */
+
+// End of auto generated file.
diff --git a/SA_POP/SA_Builder.cpp b/SA_POP/SA_Builder.cpp
index de79b7d0ee4..e02fda91ebe 100644
--- a/SA_POP/SA_Builder.cpp
+++ b/SA_POP/SA_Builder.cpp
@@ -14,6 +14,7 @@
  */
 //=============================================================================
 
+
 #include "SA_POP_Types.h"
 #include "SA_Builder.h"
 #include "Planner.h"
diff --git a/SA_POP/SA_Builder.h b/SA_POP/SA_Builder.h
index db77243a441..59d769deb7e 100644
--- a/SA_POP/SA_Builder.h
+++ b/SA_POP/SA_Builder.h
@@ -17,6 +17,10 @@
 #ifndef SA_POP_SA_BUILDER_H_
 #define SA_POP_SA_BUILDER_H_
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "SA_POP_Types.h"
 #include "Builder.h"
 #include "Planner.h"
@@ -26,7 +30,7 @@
 #include "SA_SchedStrategy.h"
 #include "SA_WorkingPlan.h"
 #include "TaskMap.h"
-
+#include "SA_Builder_Export.h"
 
 namespace SA_POP {
 
@@ -37,7 +41,8 @@ namespace SA_POP {
    *        associated objects for planning with spreading activation networks
    *        and scheduling with precedence graphs.
    */
-  class SA_Builder : public Builder {
+  class SA_BUILDER_Export SA_Builder : public Builder {
+//  class SA_Builder : public Builder {
   public:
     /// Constructor.
     SA_Builder (void);
diff --git a/SA_POP/SA_Builder_Export.h b/SA_POP/SA_Builder_Export.h
new file mode 100644
index 00000000000..822d06bbfa7
--- /dev/null
+++ b/SA_POP/SA_Builder_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SA_BUILDER
+// ------------------------------
+#ifndef SA_BUILDER_EXPORT_H
+#define SA_BUILDER_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SA_BUILDER_HAS_DLL)
+#  define SA_BUILDER_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SA_BUILDER_HAS_DLL */
+
+#if !defined (SA_BUILDER_HAS_DLL)
+#  define SA_BUILDER_HAS_DLL 1
+#endif /* ! SA_BUILDER_HAS_DLL */
+
+#if defined (SA_BUILDER_HAS_DLL) && (SA_BUILDER_HAS_DLL == 1)
+#  if defined (SA_BUILDER_BUILD_DLL)
+#    define SA_BUILDER_Export ACE_Proper_Export_Flag
+#    define SA_BUILDER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SA_BUILDER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SA_BUILDER_BUILD_DLL */
+#    define SA_BUILDER_Export ACE_Proper_Import_Flag
+#    define SA_BUILDER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SA_BUILDER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SA_BUILDER_BUILD_DLL */
+#else /* SA_BUILDER_HAS_DLL == 1 */
+#  define SA_BUILDER_Export
+#  define SA_BUILDER_SINGLETON_DECLARATION(T)
+#  define SA_BUILDER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SA_BUILDER_HAS_DLL == 1 */
+
+// Set SA_BUILDER_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SA_BUILDER_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SA_BUILDER_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SA_BUILDER_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SA_BUILDER_NTRACE */
+
+#if (SA_BUILDER_NTRACE == 1)
+#  define SA_BUILDER_TRACE(X)
+#else /* (SA_BUILDER_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SA_BUILDER_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SA_BUILDER_NTRACE == 1) */
+
+#endif /* SA_BUILDER_EXPORT_H */
+
+// End of auto generated file.
diff --git a/SA_POP/SA_POP.mpc b/SA_POP/SA_POP.mpc
index 116be7a2800..9dddc41c5ea 100644
--- a/SA_POP/SA_POP.mpc
+++ b/SA_POP/SA_POP.mpc
@@ -1,4 +1,4 @@
-project(SA_POP) : ciao_config_handlers, xerces {
+project(SA_POP) : ciao_config_handlers, xerces, taolib {
 
    after += XSC_Config_Handlers
    sharedname   = SA_POP
@@ -8,6 +8,11 @@ project(SA_POP) : ciao_config_handlers, xerces {
 
    macros = SA_POP_HAS_ACE SA_POP_HAS_CIAO
 
+   dynamicflags   = SANETFILEIN_BUILD_DLL \
+                    TASKMAPFILEIN_BUILD_DLL \
+                    SA_BUILDER_BUILD_DLL \
+                    LOGSCREENOUT_BUILD_DLL
+
 
    IDL_Files {
    }
diff --git a/SA_POP/TaskMapFileIn.h b/SA_POP/TaskMapFileIn.h
index 4b962f20955..8870bfd8859 100644
--- a/SA_POP/TaskMapFileIn.h
+++ b/SA_POP/TaskMapFileIn.h
@@ -17,7 +17,7 @@
 
 #include "SA_POP_Types.h"
 #include "Builder.h"
-
+#include "TaskMapFileIn_Export.h"
 
 namespace SA_POP {
 
@@ -27,7 +27,8 @@ namespace SA_POP {
    * @brief Input adapter that initializes a TaskMap object using an XML
    *        TaskMap file.
    */
-  class TaskMapFileIn {
+  class TASKMAPFILEIN_Export TaskMapFileIn {
+    //  class TaskMapFileIn {
   public:
     /// Constructor.
     TaskMapFileIn (void);
diff --git a/SA_POP/TaskMapFileIn_Export.h b/SA_POP/TaskMapFileIn_Export.h
new file mode 100644
index 00000000000..7ee551cab8a
--- /dev/null
+++ b/SA_POP/TaskMapFileIn_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl TASKMAPFILEIN
+// ------------------------------
+#ifndef TASKMAPFILEIN_EXPORT_H
+#define TASKMAPFILEIN_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TASKMAPFILEIN_HAS_DLL)
+#  define TASKMAPFILEIN_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TASKMAPFILEIN_HAS_DLL */
+
+#if !defined (TASKMAPFILEIN_HAS_DLL)
+#  define TASKMAPFILEIN_HAS_DLL 1
+#endif /* ! TASKMAPFILEIN_HAS_DLL */
+
+#if defined (TASKMAPFILEIN_HAS_DLL) && (TASKMAPFILEIN_HAS_DLL == 1)
+#  if defined (TASKMAPFILEIN_BUILD_DLL)
+#    define TASKMAPFILEIN_Export ACE_Proper_Export_Flag
+#    define TASKMAPFILEIN_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TASKMAPFILEIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TASKMAPFILEIN_BUILD_DLL */
+#    define TASKMAPFILEIN_Export ACE_Proper_Import_Flag
+#    define TASKMAPFILEIN_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TASKMAPFILEIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TASKMAPFILEIN_BUILD_DLL */
+#else /* TASKMAPFILEIN_HAS_DLL == 1 */
+#  define TASKMAPFILEIN_Export
+#  define TASKMAPFILEIN_SINGLETON_DECLARATION(T)
+#  define TASKMAPFILEIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TASKMAPFILEIN_HAS_DLL == 1 */
+
+// Set TASKMAPFILEIN_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TASKMAPFILEIN_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TASKMAPFILEIN_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TASKMAPFILEIN_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TASKMAPFILEIN_NTRACE */
+
+#if (TASKMAPFILEIN_NTRACE == 1)
+#  define TASKMAPFILEIN_TRACE(X)
+#else /* (TASKMAPFILEIN_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TASKMAPFILEIN_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TASKMAPFILEIN_NTRACE == 1) */
+
+#endif /* TASKMAPFILEIN_EXPORT_H */
+
+// End of auto generated file.
diff --git a/SA_POP/server/Driver.cpp b/SA_POP/server/Driver.cpp
index 1492b272c5d..6b0919e65fe 100644
--- a/SA_POP/server/Driver.cpp
+++ b/SA_POP/server/Driver.cpp
@@ -7,9 +7,6 @@
 #include "SA_Builder.h"
 #include "TaskMapFileIn.h"
 #include "SANet/SANetFileIn.h"
-#include "Planner.h"
-#include "LogScreenOut.h"
-
 
 namespace CIAO
 {
@@ -32,7 +29,9 @@ namespace CIAO
       }
 
       int
-      Driver_i::init (const char *RM_name, const char *sanet_str, const char *taskmap_str)
+      Driver_i::init (const char *RM_name,
+                      const char *sanet_str,
+                      const char *taskmap_str)
       {
         try
           {
@@ -510,7 +509,7 @@ namespace CIAO
           goal.abs_times.insert (std::make_pair (abs_times[i].condID,
                                  abs_times[i].constraint.sec));
         }
-        
+
       };
 
       int
diff --git a/SA_POP/server/Driver.h b/SA_POP/server/Driver.h
index 9db618d4862..b0a5107a95b 100644
--- a/SA_POP/server/Driver.h
+++ b/SA_POP/server/Driver.h
@@ -9,7 +9,6 @@
 #include "RACE/common/OpStringC.h"
 #include "Plan_Generator_Impl.h"
 
-#include "SA_POP_Types.h"
 #include "Planner.h"
 #include "LogScreenOut.h"
 
@@ -32,7 +31,9 @@ namespace CIAO
         virtual ~Driver_i (void);
 
         virtual
-        int init (const char *RM_name, const char *sanet_str, const char *taskmap_str);
+        int init (const char *RM_name,
+                  const char *sanet_str,
+                  const char *taskmap_str);
 
         virtual
         void deploy_plan (const char * plan_uri)
@@ -43,8 +44,9 @@ namespace CIAO
           throw (::CORBA::SystemException);
 
       protected:
-        virtual int opstring_to_dplan (::CIAO::RACE::OperationalString &op_string,
-                                       ::Deployment::DeploymentPlan &plan);
+        virtual int opstring_to_dplan
+        (::CIAO::RACE::OperationalString &op_string,
+         ::Deployment::DeploymentPlan &plan);
 
         /// Convert SA-POP operational string to IDL operational string.
         /**
diff --git a/SA_POP/server/Driver.idl b/SA_POP/server/Driver.idl
index a4a6cc17315..b6eb8de6f36 100644
--- a/SA_POP/server/Driver.idl
+++ b/SA_POP/server/Driver.idl
@@ -1,4 +1,4 @@
-#include "common/OpString.idl"
+#include "RACE/common/OpString.idl"
 
 module CIAO
 {
diff --git a/SA_POP/server/Driver.mpc b/SA_POP/server/Driver.mpc
index 2e4a96ae7cb..caffb8a574f 100644
--- a/SA_POP/server/Driver.mpc
+++ b/SA_POP/server/Driver.mpc
@@ -1,45 +1,31 @@
-//project(Driver_stub): taolib_with_idl, ciao_race_default {
-project(Driver_stub): taolib_with_idl, ciao_component_dnc, ciao_race_default {
-
+project(Driver_stub): ciao_client_dnc, ciao_race_component {
   sharedname = Driver_stub
+  idlflags += -Wb,stub_export_macro=DRIVER_STUB_Export \
+              -Wb,stub_export_include=Driver_stub_export.h \
+              -Wb,skel_export_macro=DRIVER_SVNT_Export \
+              -Wb,skel_export_include=Driver_svnt_export.h
+
   after += OpString_stub
   libs += OpString_stub
-  	
+  dynamicflags   = DRIVER_STUB_BUILD_DLL
 
   IDL_Files {
     Driver.idl
   }
 
-  Header_Files {
-    DriverC.h
-  }
-
-  Inline_Files {
-    DriverC.inl
-  }
-
   Source_Files {
     DriverC.cpp
   }
 }
 
-// project(Driver_svnt): ciao_servant_dnc, ciao_race_default {
-
-project(Driver_svnt): ciao_component_dnc, ciao_race_default {
-  after += Driver_stub
-  libs += OpString_stub \
-          Driver_stub
+project(Driver_svnt) : ciao_servant_dnc, ciao_race_component {
+  after +=  Driver_stub
+  sharedname  = Driver_svnt
+  libs    += Driver_stub \
+             OpString_stub
+  dynamicflags = DRIVER_SVNT_BUILD_DLL
 
   IDL_Files {
-    Driver.idl
-  }
-
-  Header_Files {
-    DriverS.h
-  }
-
-  Inline_Files {
-    DriverS.inl
   }
 
   Source_Files {
@@ -47,7 +33,7 @@ project(Driver_svnt): ciao_component_dnc, ciao_race_default {
   }
 }
 
-project(Server): ciao_component_dnc, ciao_race_component, ciao_config_handlers, taoexe, ciao_plan_generator {
+project(Server): ciao_component_dnc, ciao_race_component, ciao_config_handlers, ciao_plan_generator {
 
   exename = server
 
@@ -81,13 +67,10 @@ project(Server): ciao_component_dnc, ciao_race_component, ciao_config_handlers,
 project(client): taoclient, ciao_race_component, ciao_component_dnc, ciao_plan_generator {
 
   exename = client
-
   after += Driver_stub SA_POP
-
-  includes += $(CIAO_ROOT)/RACE/SA_POP
-
   libs += Driver_stub \
-          SA_POP
+          OpString_stub
+  includes += $(CIAO_ROOT)/RACE/SA_POP
 
   IDL_Files {
   }
diff --git a/SA_POP/server/Driver_stub_export.h b/SA_POP/server/Driver_stub_export.h
new file mode 100644
index 00000000000..53208288d74
--- /dev/null
+++ b/SA_POP/server/Driver_stub_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DRIVER_STUB
+// ------------------------------
+#ifndef DRIVER_STUB_EXPORT_H
+#define DRIVER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DRIVER_STUB_HAS_DLL)
+#  define DRIVER_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DRIVER_STUB_HAS_DLL */
+
+#if !defined (DRIVER_STUB_HAS_DLL)
+#  define DRIVER_STUB_HAS_DLL 1
+#endif /* ! DRIVER_STUB_HAS_DLL */
+
+#if defined (DRIVER_STUB_HAS_DLL) && (DRIVER_STUB_HAS_DLL == 1)
+#  if defined (DRIVER_STUB_BUILD_DLL)
+#    define DRIVER_STUB_Export ACE_Proper_Export_Flag
+#    define DRIVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DRIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DRIVER_STUB_BUILD_DLL */
+#    define DRIVER_STUB_Export ACE_Proper_Import_Flag
+#    define DRIVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DRIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DRIVER_STUB_BUILD_DLL */
+#else /* DRIVER_STUB_HAS_DLL == 1 */
+#  define DRIVER_STUB_Export
+#  define DRIVER_STUB_SINGLETON_DECLARATION(T)
+#  define DRIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DRIVER_STUB_HAS_DLL == 1 */
+
+// Set DRIVER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DRIVER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DRIVER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DRIVER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DRIVER_STUB_NTRACE */
+
+#if (DRIVER_STUB_NTRACE == 1)
+#  define DRIVER_STUB_TRACE(X)
+#else /* (DRIVER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DRIVER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DRIVER_STUB_NTRACE == 1) */
+
+#endif /* DRIVER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/SA_POP/server/Driver_svnt_export.h b/SA_POP/server/Driver_svnt_export.h
new file mode 100644
index 00000000000..e3a37084701
--- /dev/null
+++ b/SA_POP/server/Driver_svnt_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DRIVER_SVNT
+// ------------------------------
+#ifndef DRIVER_SVNT_EXPORT_H
+#define DRIVER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DRIVER_SVNT_HAS_DLL)
+#  define DRIVER_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DRIVER_SVNT_HAS_DLL */
+
+#if !defined (DRIVER_SVNT_HAS_DLL)
+#  define DRIVER_SVNT_HAS_DLL 1
+#endif /* ! DRIVER_SVNT_HAS_DLL */
+
+#if defined (DRIVER_SVNT_HAS_DLL) && (DRIVER_SVNT_HAS_DLL == 1)
+#  if defined (DRIVER_SVNT_BUILD_DLL)
+#    define DRIVER_SVNT_Export ACE_Proper_Export_Flag
+#    define DRIVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DRIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DRIVER_SVNT_BUILD_DLL */
+#    define DRIVER_SVNT_Export ACE_Proper_Import_Flag
+#    define DRIVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DRIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DRIVER_SVNT_BUILD_DLL */
+#else /* DRIVER_SVNT_HAS_DLL == 1 */
+#  define DRIVER_SVNT_Export
+#  define DRIVER_SVNT_SINGLETON_DECLARATION(T)
+#  define DRIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DRIVER_SVNT_HAS_DLL == 1 */
+
+// Set DRIVER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DRIVER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DRIVER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DRIVER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DRIVER_SVNT_NTRACE */
+
+#if (DRIVER_SVNT_NTRACE == 1)
+#  define DRIVER_SVNT_TRACE(X)
+#else /* (DRIVER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DRIVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DRIVER_SVNT_NTRACE == 1) */
+
+#endif /* DRIVER_SVNT_EXPORT_H */
+
+// End of auto generated file.