ChangeLogTag: Thu Nov 16 14:41:24 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 85 insertions, 61 deletions

diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 41501f86b1e..1cd931b2d71 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -6,7 +6,12 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
   libpaths += ../interfaces
   libs     += ENW_stub
   sharedname = TSEC_CheckPoint_stub
-  idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \
+              -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h \
+              -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \
+              -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h
   dynamicflags   = TSEC_CHECKPOINT_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,13 +26,16 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
 project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
   avoids += ace_for_tao
   after +=  TSEC_CheckPoint_stub
-  after +=  ENW_svnt ENW_stub
+  after +=  ENW_skel ENW_stub
   sharedname  = TSEC_CheckPoint_svnt
   libpaths += ../interfaces
   libs     += TSEC_CheckPoint_stub
-  libs     += ENW_stub ENW_svnt
+  libs     += ENW_stub ENW_skel
 
-  idlflags  +=  -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,export_include=TSEC_CheckPoint_svnt_export.h
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export \
+                -Wb,export_include=TSEC_CheckPoint_svnt_export.h
   dynamicflags = TSEC_CHECKPOINT_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -49,16 +57,19 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
 project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
   avoids += ace_for_tao
   after   += TSEC_CheckPoint_svnt
-  after   += ENW_svnt ENW_stub
+  after   += ENW_skel ENW_stub
 
   includes   += ../interfaces 
 
   sharedname = TSEC_CheckPoint_exec
   libpaths  += ../interfaces 
   libs      += TSEC_CheckPoint_stub TSEC_CheckPoint_svnt
-  libs      += ENW_stub ENW_svnt CIAO_DnC_Server TAO_CosNaming
+  libs      += ENW_stub ENW_skel CIAO_DnC_Server TAO_CosNaming
 
-  idlflags  +=  -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export -Wb,export_include=TSEC_CheckPoint_exec_export.h
+  idlflags  -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export \
+                -Wb,export_include=TSEC_CheckPoint_exec_export.h
   dynamicflags   = TSEC_CHECKPOINT_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
index 606ec1a67c9..22227109f39 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
@@ -3,7 +3,11 @@
 project(ENW_stub): ciao_client_dnc, event {
 
   sharedname = ENW_stub
-  idlflags += -Wb,stub_export_macro=ENW_STUB_Export -Wb,stub_export_include=ENW_stub_export.h -Wb,skel_export_macro=ENW_SVNT_Export -Wb,skel_export_include=ENW_svnt_export.h
+  idlflags -= -GT
+  idlflags += -Wb,stub_export_macro=ENW_STUB_Export \
+              -Wb,stub_export_include=ENW_stub_export.h \
+              -Wb,skel_export_macro=ENW_SKEL_Export \
+              -Wb,skel_export_include=ENW_skel_export.h
   dynamicflags   = ENW_STUB_BUILD_DLL
 
   IDL_Files {
@@ -15,12 +19,21 @@ project(ENW_stub): ciao_client_dnc, event {
   }
 }
 
-project(ENW_svnt) : ciao_servant_dnc, event {
+project(ENW_skel) : ciao_servant_dnc, event {
   after +=  ENW_stub
-  sharedname  = ENW_svnt
+  sharedname  = ENW_skel
   libs    += ENW_stub
+  idlflags -= -GT
+  idlflags += -Wb,stub_export_macro=ENW_STUB_Export \
+              -Wb,stub_export_include=ENW_stub_export.h \
+              -Wb,skel_export_macro=ENW_SKEL_Export \
+              -Wb,skel_export_include=ENW_skel_export.h
 
-  dynamicflags = ENW_SVNT_BUILD_DLL
+  dynamicflags = ENW_SKEL_BUILD_DLL
+
+  IDL_Files {
+    ENW.idl
+  }
 
   Source_Files {
     ENWS.cpp
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
new file mode 100644
index 00000000000..05e87fade4b
--- /dev/null
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl ENW_SVNT
+// ------------------------------
+#ifndef ENW_SKEL_EXPORT_H
+#define ENW_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (ENW_SKEL_HAS_DLL)
+#  define ENW_SKEL_HAS_DLL 1
+#endif /* ! ENW_SKEL_HAS_DLL */
+
+#if defined (ENW_SKEL_HAS_DLL) && (ENW_SKEL_HAS_DLL == 1)
+#  if defined (ENW_SKEL_BUILD_DLL)
+#    define ENW_SKEL_Export ACE_Proper_Export_Flag
+#    define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ENW_SKEL_BUILD_DLL */
+#    define ENW_SKEL_Export ACE_Proper_Import_Flag
+#    define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ENW_SKEL_BUILD_DLL */
+#else /* ENW_SKEL_HAS_DLL == 1 */
+#  define ENW_SKEL_Export
+#  define ENW_SKEL_SINGLETON_DECLARATION(T)
+#  define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ENW_SKEL_HAS_DLL == 1 */
+
+// Set ENW_SKEL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ENW_SKEL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ENW_SKEL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ENW_SKEL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ENW_SKEL_NTRACE */
+
+#if (ENW_SKEL_NTRACE == 1)
+#  define ENW_SKEL_TRACE(X)
+#else /* (ENW_SKEL_NTRACE == 1) */
+#  define ENW_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (ENW_SKEL_NTRACE == 1) */
+
+#endif /* ENW_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
deleted file mode 100644
index 2e4b7580702..00000000000
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ENW_SVNT
-// ------------------------------
-#ifndef ENW_SVNT_EXPORT_H
-#define ENW_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (ENW_SVNT_HAS_DLL)
-#  define ENW_SVNT_HAS_DLL 1
-#endif /* ! ENW_SVNT_HAS_DLL */
-
-#if defined (ENW_SVNT_HAS_DLL) && (ENW_SVNT_HAS_DLL == 1)
-#  if defined (ENW_SVNT_BUILD_DLL)
-#    define ENW_SVNT_Export ACE_Proper_Export_Flag
-#    define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ENW_SVNT_BUILD_DLL */
-#    define ENW_SVNT_Export ACE_Proper_Import_Flag
-#    define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ENW_SVNT_BUILD_DLL */
-#else /* ENW_SVNT_HAS_DLL == 1 */
-#  define ENW_SVNT_Export
-#  define ENW_SVNT_SINGLETON_DECLARATION(T)
-#  define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ENW_SVNT_HAS_DLL == 1 */
-
-// Set ENW_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ENW_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ENW_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ENW_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ENW_SVNT_NTRACE */
-
-#if (ENW_SVNT_NTRACE == 1)
-#  define ENW_SVNT_TRACE(X)
-#else /* (ENW_SVNT_NTRACE == 1) */
-#  define ENW_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (ENW_SVNT_NTRACE == 1) */
-
-#endif /* ENW_SVNT_EXPORT_H */
-
-// End of auto generated file.