ChangeLogTag: Fri Nov 17 16:08:43 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 134 insertions, 80 deletions

diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
index b00e844cbe2..ca2ed444513 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.idl
@@ -1,5 +1,6 @@
 // $Id$
 
+#include <Components.idl>
 #include "../common/Protocols.idl"
 
 module Protocols
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 1cbf85b801a..873f0ea404c 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -6,7 +6,12 @@ project(Protocols_Receiver_stub): ciao_client_dnc, exceptions {
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Receiver_stub
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=RECEIVER_STUB_Export \
+              -Wb,stub_export_include=Receiver_stub_export.h \
+              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
+              -Wb,skel_export_include=Receiver_svnt_export.h
   dynamicflags   = RECEIVER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -16,14 +21,21 @@ project(Protocols_Receiver_stub): ciao_client_dnc, exceptions {
   Source_Files {
     ReceiverC.cpp
   }
+
+  Header_Files {
+    Receiver_stub_export.h
+  }
 }
 
 project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions {
   avoids += ace_for_tao
-  after += Protocols_svnt Protocols_Receiver_stub
+  after += Protocols_skel Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
-  libs    += Protocols_Receiver_stub Protocols_stub Protocols_svnt
-  idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
+  libs    += Protocols_Receiver_stub Protocols_stub Protocols_skel
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=RECEIVER_SVNT_Export \
+                -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -39,6 +51,10 @@ project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions {
     ReceiverS.cpp
     Receiver_svnt.cpp
   }
+
+  Header_Files {
+    Receiver_svnt_export.h
+  }
 }
 
 
@@ -46,8 +62,7 @@ project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions {
   avoids += ace_for_tao
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
-  libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt
-  idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
+  libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_skel
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -56,6 +71,10 @@ project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions {
   Source_Files {
     Receiver_exec.cpp
   }
+
+  Header_Files {
+    Receiver_exec_export.h
+  }
 }
 
 
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.idl b/CIAO/performance-tests/Protocols/Sender/Sender.idl
index e76f0922215..200eaa0350a 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.idl
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.idl
@@ -1,5 +1,6 @@
 // $Id$
 
+#include <Components.idl>
 #include "../common/Protocols.idl"
 
 module Protocols
@@ -12,8 +13,8 @@ module Protocols
         THROUGHPUT,
         LATENCY
       };
-    
-    void start (in unsigned long iterations, 
+
+    void start (in unsigned long iterations,
                 in unsigned long invocation_rate,
                 in boolean count_missed_end_deadlines,
                 in boolean do_dump_history,
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 9382dd63289..a4b3cdf3aa1 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -6,7 +6,12 @@ project(Protocols_Sender_stub): ciao_client_dnc, exceptions {
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Sender_stub
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
+  idlflags -= -GT
+  idlflags += -St \
+              -Wb,stub_export_macro=SENDER_STUB_Export \
+              -Wb,stub_export_include=Sender_stub_export.h \
+              -Wb,skel_export_macro=SENDER_SVNT_Export \
+              -Wb,skel_export_include=Sender_svnt_export.h
   dynamicflags   = SENDER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -16,14 +21,21 @@ project(Protocols_Sender_stub): ciao_client_dnc, exceptions {
   Source_Files {
     SenderC.cpp
   }
+
+  Header_Files {
+    Sender_stub_export.h
+  }
 }
 
 project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions {
   avoids += ace_for_tao
-  after += Protocols_svnt Protocols_Sender_stub
+  after += Protocols_skel Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
-  libs    += Protocols_Sender_stub Protocols_stub Protocols_svnt
-  idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h
+  libs    += Protocols_Sender_stub Protocols_stub Protocols_skel
+  idlflags -= -GT
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=SENDER_SVNT_Export \
+                -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -39,6 +51,10 @@ project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions {
     SenderS.cpp
     Sender_svnt.cpp
   }
+
+  Header_Files {
+    Sender_svnt_export.h
+  }
 }
 
 
@@ -46,9 +62,8 @@ project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions {
   avoids += ace_for_tao
   after   += Protocols_Sender_svnt
   sharedname = Protocols_Sender_exec
-  libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt
-  includes += ../../../../tests/RTCORBA/Diffserv
-  idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h
+  libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_skel
+  includes += $(TAO_ROOT)/tests/RTCORBA/Diffserv
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -57,6 +72,10 @@ project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions {
   Source_Files {
     Sender_exec.cpp
   }
+
+  Header_Files {
+    Sender_exec_export.h
+  }
 }
 
 
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.idl b/CIAO/performance-tests/Protocols/common/Protocols.idl
index 580167f57b3..f7f584e9fff 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.idl
+++ b/CIAO/performance-tests/Protocols/common/Protocols.idl
@@ -1,7 +1,5 @@
 // $Id$
 
-#include <Components.idl>
-
 module Protocols
 {
   interface test
@@ -17,15 +15,15 @@ module Protocols
     oneway void oneway_sync ();
 
     void twoway_sync ();
-  
+
     typedef sequence<octet> octets;
 
     oneway void oneway_method (in long session_id,
                                in unsigned long iteration,
                                in octets payload);
-  
+
     void twoway_method (inout long session_id,
                         inout unsigned long iteration,
-                        inout octets payload);  
+                        inout octets payload);
   };
 };
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 1b3b8957da1..e7dc5609bc2 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,10 +1,14 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_stub): ciao_client_dnc {
+project(Protocols_stub): taolib_with_idl {
 
   sharedname = Protocols_stub
-  idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export -Wb,stub_export_include=Protocols_stub_export.h -Wb,skel_export_macro=PROTOCOLS_SVNT_Export -Wb,skel_export_include=Protocols_svnt_export.h
+  idlflags += -St \
+              -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
+              -Wb,stub_export_include=Protocols_stub_export.h \
+              -Wb,skel_export_macro=PROTOCOLS_SKEL_Export \
+              -Wb,skel_export_include=Protocols_skel_export.h
   dynamicflags   = PROTOCOLS_STUB_BUILD_DLL
 
   IDL_Files {
@@ -14,15 +18,23 @@ project(Protocols_stub): ciao_client_dnc {
   Source_Files {
     ProtocolsC.cpp
   }
+
+  Header_Files {
+    Protocols_stub_export.h
+  }
 }
 
-project(Protocols_svnt) : ciao_servant_dnc {
+project(Protocols_skel) : portableserver {
   after +=  Protocols_stub
-  sharedname  = Protocols_svnt
+  sharedname  = Protocols_skel
   libs    += Protocols_stub
 
-  idlflags  +=  -Wb,export_macro=PROTOCOLS_SVNT_Export -Wb,export_include=Protocols_svnt_export.h
-  dynamicflags = PROTOCOLS_SVNT_BUILD_DLL
+  idlflags += -St \
+              -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
+              -Wb,stub_export_include=Protocols_stub_export.h \
+              -Wb,skel_export_macro=PROTOCOLS_SKEL_Export \
+              -Wb,skel_export_include=Protocols_skel_export.h
+  dynamicflags = PROTOCOLS_SKEL_BUILD_DLL
 
   IDL_Files {
     Protocols.idl
@@ -31,6 +43,10 @@ project(Protocols_svnt) : ciao_servant_dnc {
   Source_Files {
     ProtocolsS.cpp
   }
+
+  Header_Files {
+    Protocols_skel_export.h
+  }
 }
 
 
diff --git a/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h b/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h
new file mode 100644
index 00000000000..38692d63f09
--- /dev/null
+++ b/CIAO/performance-tests/Protocols/common/Protocols_skel_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PROTOCOLS_SVNT
+// ------------------------------
+#ifndef PROTOCOLS_SKEL_EXPORT_H
+#define PROTOCOLS_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PROTOCOLS_SKEL_HAS_DLL)
+#  define PROTOCOLS_SKEL_HAS_DLL 1
+#endif /* ! PROTOCOLS_SKEL_HAS_DLL */
+
+#if defined (PROTOCOLS_SKEL_HAS_DLL) && (PROTOCOLS_SKEL_HAS_DLL == 1)
+#  if defined (PROTOCOLS_SKEL_BUILD_DLL)
+#    define PROTOCOLS_SKEL_Export ACE_Proper_Export_Flag
+#    define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PROTOCOLS_SKEL_BUILD_DLL */
+#    define PROTOCOLS_SKEL_Export ACE_Proper_Import_Flag
+#    define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PROTOCOLS_SKEL_BUILD_DLL */
+#else /* PROTOCOLS_SKEL_HAS_DLL == 1 */
+#  define PROTOCOLS_SKEL_Export
+#  define PROTOCOLS_SKEL_SINGLETON_DECLARATION(T)
+#  define PROTOCOLS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PROTOCOLS_SKEL_HAS_DLL == 1 */
+
+// Set PROTOCOLS_SKEL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PROTOCOLS_SKEL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PROTOCOLS_SKEL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PROTOCOLS_SKEL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PROTOCOLS_SKEL_NTRACE */
+
+#if (PROTOCOLS_SKEL_NTRACE == 1)
+#  define PROTOCOLS_SKEL_TRACE(X)
+#else /* (PROTOCOLS_SKEL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PROTOCOLS_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PROTOCOLS_SKEL_NTRACE == 1) */
+
+#endif /* PROTOCOLS_SKEL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h b/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h
deleted file mode 100644
index 4e64a47f821..00000000000
--- a/CIAO/performance-tests/Protocols/common/Protocols_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl PROTOCOLS_SVNT
-// ------------------------------
-#ifndef PROTOCOLS_SVNT_EXPORT_H
-#define PROTOCOLS_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (PROTOCOLS_SVNT_HAS_DLL)
-#  define PROTOCOLS_SVNT_HAS_DLL 1
-#endif /* ! PROTOCOLS_SVNT_HAS_DLL */
-
-#if defined (PROTOCOLS_SVNT_HAS_DLL) && (PROTOCOLS_SVNT_HAS_DLL == 1)
-#  if defined (PROTOCOLS_SVNT_BUILD_DLL)
-#    define PROTOCOLS_SVNT_Export ACE_Proper_Export_Flag
-#    define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROTOCOLS_SVNT_BUILD_DLL */
-#    define PROTOCOLS_SVNT_Export ACE_Proper_Import_Flag
-#    define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROTOCOLS_SVNT_BUILD_DLL */
-#else /* PROTOCOLS_SVNT_HAS_DLL == 1 */
-#  define PROTOCOLS_SVNT_Export
-#  define PROTOCOLS_SVNT_SINGLETON_DECLARATION(T)
-#  define PROTOCOLS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROTOCOLS_SVNT_HAS_DLL == 1 */
-
-// Set PROTOCOLS_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROTOCOLS_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROTOCOLS_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROTOCOLS_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROTOCOLS_SVNT_NTRACE */
-
-#if (PROTOCOLS_SVNT_NTRACE == 1)
-#  define PROTOCOLS_SVNT_TRACE(X)
-#else /* (PROTOCOLS_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROTOCOLS_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROTOCOLS_SVNT_NTRACE == 1) */
-
-#endif /* PROTOCOLS_SVNT_EXPORT_H */
-
-// End of auto generated file.