ChangeLogTag: Mon Nov 8 11:30:24 2004 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 66 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5af69b0edbe..624cc7526e1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,8 +1,25 @@
+Mon Nov  8 11:30:24 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/FTORB.mpc:
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+        * orbsvcs/orbsvcs/PortableGroup_Simple_export.h:
+
+          The FT_ClientORB library requires CDR insertion operators that are
+          generated as part of the PortableGroup_Simple_DS.idl generation.
+          In order for Windows to be able to find these symbols, they must
+          be exported.  Now, the idl file is generated with an export macro
+          (for use within the PortableGroup library).  But for the
+          FTORB_Utils and FTRT_EventChannel libraries we do not want to
+          export any of the PortableGroup_Simple_DS symbols, so we explicitly
+          set the TAO_PORTABLEGROUP_SIMPLE_HAS_DLL macro to zero.  Thus, the
+          symbols are exported from the PortableGroup library and no other.
+
 Sat Nov  6 06:54:16 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * tao/DynamicInterface/DII_Arguments.cpp:
 
-          Changed ACE_TRY_NEW_ENV to ACE_DECLARE_NEW_CORBA_ENV and ACE_TRY. 
+          Changed ACE_TRY_NEW_ENV to ACE_DECLARE_NEW_CORBA_ENV and ACE_TRY.
           The CORBA environment is used outside the scope of the try/catch.
 
 Fri Nov  5 13:33:36 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index bed25b3ac14..32d91812a15 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -7,7 +7,13 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
   tagchecks   += FTORB_Utils
 
+  // Since the PortableGroup_Simple_DS.idl file is shared between 3 libraries,
+  // we must generate using an export (for the PortableGroup library).
+  // However, we don't want to export it from this library or
+  // FTRT_EventChannel.
+  macros += TAO_PORTABLEGROUP_SIMPLE_HAS_DLL=0
   IDL_Files {
+    idlflags += -Wb,export_macro=TAO_PortableGroup_Simple_Export -Wb,export_include=orbsvcs/PortableGroup_Simple_export.h
     PortableGroup_Simple_DS.idl
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 4b2c6020f5c..ab302ce4716 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -66,6 +66,10 @@ project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, utils, corba_messagi
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
   after       += FTORB_Utils
 
+  // We don't want to export symbols from PortableGroup_Simple_DSC.cpp
+  // from this library or FTORB_Utils.
+  macros += TAO_PORTABLEGROUP_SIMPLE_HAS_DLL=0
+
   IDL_Files {
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 10ec64d0361..113a2b774aa 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -4,7 +4,7 @@
 project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
-  dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
+  dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL TAO_PORTABLEGROUP_SIMPLE_BUILD_DLL
   tagchecks   += PortableGroup
   after       += FTORB_Utils
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_export.h b/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_export.h
new file mode 100644
index 00000000000..0fe346e70b9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_export.h
@@ -0,0 +1,37 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -d -s TAO_PortableGroup_Simple
+// ------------------------------
+#ifndef TAO_PORTABLEGROUP_SIMPLE_EXPORT_H
+#define TAO_PORTABLEGROUP_SIMPLE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS) && !defined (TAO_PORTABLEGROUP_SIMPLE_HAS_DLL)
+#  define TAO_PORTABLEGROUP_SIMPLE_HAS_DLL 0
+#endif /* TAO_AS_STATIC_LIBS && TAO_PORTABLEGROUP_SIMPLE_HAS_DLL */
+
+#if !defined (TAO_PORTABLEGROUP_SIMPLE_HAS_DLL)
+#  define TAO_PORTABLEGROUP_SIMPLE_HAS_DLL 1
+#endif /* ! TAO_PORTABLEGROUP_SIMPLE_HAS_DLL */
+
+#if defined (TAO_PORTABLEGROUP_SIMPLE_HAS_DLL) && (TAO_PORTABLEGROUP_SIMPLE_HAS_DLL == 1)
+#  if defined (TAO_PORTABLEGROUP_SIMPLE_BUILD_DLL)
+#    define TAO_PortableGroup_Simple_Export ACE_Proper_Export_Flag
+#    define TAO_PORTABLEGROUP_SIMPLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_PORTABLEGROUP_SIMPLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_PORTABLEGROUP_SIMPLE_BUILD_DLL */
+#    define TAO_PortableGroup_Simple_Export ACE_Proper_Import_Flag
+#    define TAO_PORTABLEGROUP_SIMPLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_PORTABLEGROUP_SIMPLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_PORTABLEGROUP_SIMPLE_BUILD_DLL */
+#else /* TAO_PORTABLEGROUP_SIMPLE_HAS_DLL == 1 */
+#  define TAO_PortableGroup_Simple_Export
+#  define TAO_PORTABLEGROUP_SIMPLE_SINGLETON_DECLARATION(T)
+#  define TAO_PORTABLEGROUP_SIMPLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_PORTABLEGROUP_SIMPLE_HAS_DLL == 1 */
+
+#endif /* TAO_PORTABLEGROUP_SIMPLE_EXPORT_H */
+
+// End of auto generated file.