ChangeLogTag: Wed Sep 8 11:03:47 2004 J.T. Conklin <jtc@acorntoolworks.com>

9 files changed, 187 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 437cd82bcf3..69ace8d59b2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Wed Sep  8 11:03:47 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/CosEvent/event_skel_export.h:
+	* orbsvcs/orbsvcs/Naming/naming_skel_export.h:
+	* orbsvcs/orbsvcs/Notify/notify_skel_export.h:
+	* orbsvcs/orbsvcs/Trader/trading_skel_export.h:
+
+	  New files.
+
+	* orbsvcs/orbsvcs/CosEvent.mpc:
+	* orbsvcs/orbsvcs/CosNaming.mpc:
+	* orbsvcs/orbsvcs/CosNotification.mpc:
+	* orbsvcs/orbsvcs/CosTrading.mpc:
+
+	  Changed to use different export macros and export includes for
+	  stub and skeleton libraries.
+
 Wed Sep  8 12:55:30 2004  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/orbsvcs/CosTrading.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index a4fed889823..37aa928c936 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -4,7 +4,7 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
   sharedname   = TAO_CosEvent
   dynamicflags = TAO_EVENT_BUILD_DLL
 
-  idlflags    += -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h
+  idlflags    += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
 
   IDL_Files {
     CosEventComm.idl
@@ -35,7 +35,7 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
 
 project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel {
   sharedname   = TAO_CosEvent_Skel
-  dynamicflags = TAO_EVENT_BUILD_DLL
+  dynamicflags = TAO_EVENT_SKEL_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
new file mode 100644
index 00000000000..f5194fa05a9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_EVENT_SKEL_EXPORT_H
+#define TAO_EVENT_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_EVENT_SKEL_HAS_DLL)
+#    define TAO_EVENT_SKEL_HAS_DLL 0
+#  endif /* ! TAO_EVENT_SKEL_HAS_DLL */
+#else
+#  if !defined (TAO_EVENT_SKEL_HAS_DLL)
+#    define TAO_EVENT_SKEL_HAS_DLL 1
+#  endif /* ! TAO_EVENT_SKEL_HAS_DLL */
+#endif
+
+#if defined (TAO_EVENT_SKEL_HAS_DLL) && (TAO_EVENT_SKEL_HAS_DLL == 1)
+#  if defined (TAO_EVENT_SKEL_BUILD_DLL)
+#    define TAO_Event_Skel_Export ACE_Proper_Export_Flag
+#    define TAO_EVENT_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_EVENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_EVENT_SKEL_BUILD_DLL */
+#    define TAO_Event_Skel_Export ACE_Proper_Import_Flag
+#    define TAO_EVENT_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_EVENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_EVENT_SKEL_BUILD_DLL */
+#else /* TAO_EVENT_SKEL_HAS_DLL == 1 */
+#  define TAO_Event_Skel_Export
+#  define TAO_EVENT_SKEL_SINGLETON_DECLARATION(T)
+#  define TAO_EVENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_EVENT_SKEL_HAS_DLL == 1 */
+
+#endif /* TAO_EVENT_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 311635d1e9a..c1701b88b70 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -4,7 +4,8 @@
 project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
-  idlflags    += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/Naming/naming_export.h
+
+  idlflags    += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
 
   IDL_Files {
     CosNaming.idl
@@ -33,7 +34,7 @@ project(CosNaming) : orbsvcslib, core {
 
 project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver {
   sharedname   = TAO_CosNaming_Skel
-  dynamicflags = TAO_NAMING_BUILD_DLL
+  dynamicflags = TAO_NAMING_SKEL_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 5e97b6b2470..e2dea5735b3 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -5,7 +5,7 @@ project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
 
-  idlflags    += -Wb,export_macro=TAO_Notify_Export -Wb,export_include=orbsvcs/Notify/notify_export.h
+  idlflags    += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
 
   IDL_Files {
     CosNotification.idl
@@ -54,7 +54,7 @@ project(CosNotification) : orbsvcslib, core, event {
 
 project(CosNotification_Skel) : orbsvcslib, core, notification, portableserver {
   sharedname   = TAO_CosNotification_Skel
-  dynamicflags = TAO_NOTIFY_BUILD_DLL
+  dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 721d6837144..35d0e61ca17 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -4,7 +4,8 @@
 project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
-  idlflags    += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h
+
+  idlflags    += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
 
   IDL_Files {
     CosTrading.idl
@@ -40,7 +41,7 @@ project(CosTrading) : orbsvcslib, core {
 
 project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
   sharedname   = TAO_CosTrading_Skel
-  dynamicflags = TAO_TRADING_BUILD_DLL
+  dynamicflags = TAO_TRADING_SKEL_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
new file mode 100644
index 00000000000..aef94b094c2
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_NAMING_SKEL_EXPORT_H
+#define TAO_NAMING_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_NAMING_SKEL_HAS_DLL)
+#    define TAO_NAMING_SKEL_HAS_DLL 0
+#  endif /* ! TAO_NAMING_SKEL_HAS_DLL */
+#else
+#  if !defined (TAO_NAMING_SKEL_HAS_DLL)
+#    define TAO_NAMING_SKEL_HAS_DLL 1
+#  endif /* ! TAO_NAMING_SKEL_HAS_DLL */
+#endif
+
+#if defined (TAO_NAMING_SKEL_HAS_DLL) && (TAO_NAMING_SKEL_HAS_DLL == 1)
+#  if defined (TAO_NAMING_SKEL_BUILD_DLL)
+#    define TAO_Naming_Skel_Export ACE_Proper_Export_Flag
+#    define TAO_NAMING_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_NAMING_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_NAMING_SKEL_BUILD_DLL */
+#    define TAO_Naming_Skel_Export ACE_Proper_Import_Flag
+#    define TAO_NAMING_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_NAMING_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_NAMING_SKEL_BUILD_DLL */
+#else /* TAO_NAMING_SKEL_HAS_DLL == 1 */
+#  define TAO_Naming_Skel_Export
+#  define TAO_NAMING_SKEL_SINGLETON_DECLARATION(T)
+#  define TAO_NAMING_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_NAMING_SKEL_HAS_DLL == 1 */
+
+#endif /* TAO_NAMING_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
new file mode 100644
index 00000000000..52b01d16fd6
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_NOTIFY_SKEL_EXPORT_H
+#define TAO_NOTIFY_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_NOTIFY_SKEL_HAS_DLL)
+#    define TAO_NOTIFY_SKEL_HAS_DLL 0
+#  endif /* ! TAO_NOTIFY_SKEL_HAS_DLL */
+#else
+#  if !defined (TAO_NOTIFY_SKEL_HAS_DLL)
+#    define TAO_NOTIFY_SKEL_HAS_DLL 1
+#  endif /* ! TAO_NOTIFY_SKEL_HAS_DLL */
+#endif
+
+#if defined (TAO_NOTIFY_SKEL_HAS_DLL) && (TAO_NOTIFY_SKEL_HAS_DLL == 1)
+#  if defined (TAO_NOTIFY_SKEL_BUILD_DLL)
+#    define TAO_Notify_Skel_Export ACE_Proper_Export_Flag
+#    define TAO_NOTIFY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_NOTIFY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_NOTIFY_SKEL_BUILD_DLL */
+#    define TAO_Notify_Skel_Export ACE_Proper_Import_Flag
+#    define TAO_NOTIFY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_NOTIFY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_NOTIFY_SKEL_BUILD_DLL */
+#else /* TAO_NOTIFY_SKEL_HAS_DLL == 1 */
+#  define TAO_Notify_Skel_Export
+#  define TAO_NOTIFY_SKEL_SINGLETON_DECLARATION(T)
+#  define TAO_NOTIFY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_NOTIFY_SKEL_HAS_DLL == 1 */
+
+#endif /* TAO_NOTIFY_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
new file mode 100644
index 00000000000..3b0f399cef9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_TRADING_SKEL_EXPORT_H
+#define TAO_TRADING_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_TRADING_SKEL_HAS_DLL)
+#    define TAO_TRADING_SKEL_HAS_DLL 0
+#  endif /* ! TAO_TRADING_SKEL_HAS_DLL */
+#else
+#  if !defined (TAO_TRADING_SKEL_HAS_DLL)
+#    define TAO_TRADING_SKEL_HAS_DLL 1
+#  endif /* ! TAO_TRADING_SKEL_HAS_DLL */
+#endif
+
+#if defined (TAO_TRADING_SKEL_HAS_DLL) && (TAO_TRADING_SKEL_HAS_DLL == 1)
+#  if defined (TAO_TRADING_SKEL_BUILD_DLL)
+#    define TAO_Trading_Skel_Export ACE_Proper_Export_Flag
+#    define TAO_TRADING_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_TRADING_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_TRADING_SKEL_BUILD_DLL */
+#    define TAO_Trading_Skel_Export ACE_Proper_Import_Flag
+#    define TAO_TRADING_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_TRADING_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_TRADING_SKEL_BUILD_DLL */
+#else /* TAO_TRADING_SKEL_HAS_DLL == 1 */
+#  define TAO_Trading_Skel_Export
+#  define TAO_TRADING_SKEL_SINGLETON_DECLARATION(T)
+#  define TAO_TRADING_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_TRADING_SKEL_HAS_DLL == 1 */
+
+#endif /* TAO_TRADING_SKEL_EXPORT_H */
+
+// End of auto generated file.