ChangeLogTag: Fri Jan 5 06:42:17 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>

7 files changed, 196 insertions, 90 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b795ed7cf88..6a7925d1cca 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Fri Jan  5 06:42:17 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tests/TransportCurrent/Framework/Makefile.am
+
+          Regenerate.
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * tests/TransportCurrent/Makefile.am:
+
+          Regenerate to descend into lib subdirectory.
+
+        * tests/TransportCurrent/lib/Makefile.am:
+
+          New Makefile.am for library of common code for TransportCurrent
+          tests.
+
+        * tests/TransportCurrent/Framework/Framework.mpc
+
 Fri Jan  5 04:09:08 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * tests/TransportCurrent/lib/Client_ORBInitializer.h:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 81379250e11..cdf8a39372a 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -853,9 +853,10 @@ if test $tao_build_tests = yes; then
     tests/Strategies/Makefile
     tests/Timed_Buffered_Oneways/Makefile
     tests/Timeout/Makefile
-    tests/TransportCurrent/Makefile
-    tests/TransportCurrent/IIOP/Makefile
     tests/TransportCurrent/Framework/Makefile
+    tests/TransportCurrent/IIOP/Makefile
+    tests/TransportCurrent/Makefile
+    tests/TransportCurrent/lib/Makefile
     tests/Two_Objects/Makefile
     tests/Typedef_String_Array/Makefile
     tests/UNKNOWN_Exception/Makefile
diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc
index c2077db199e..b5c32ef4444 100644
--- a/TAO/tests/TransportCurrent/Framework/Framework.mpc
+++ b/TAO/tests/TransportCurrent/Framework/Framework.mpc
@@ -3,7 +3,7 @@
 
 project(*Server): taoserver, tc, interceptors, pi_server {
 
-  after += Curren_Test_Lib_Client Current_Test_Lib_Server
+  after += Current_Test_Lib_Client Current_Test_Lib_Server
   includes += .
   includes += ../lib
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
diff --git a/TAO/tests/TransportCurrent/Framework/Makefile.am b/TAO/tests/TransportCurrent/Framework/Makefile.am
index d054a3eba01..1e83dc49b65 100644
--- a/TAO/tests/TransportCurrent/Framework/Makefile.am
+++ b/TAO/tests/TransportCurrent/Framework/Makefile.am
@@ -11,41 +11,10 @@
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
-## Makefile.Framework_Idl.am
-
-BUILT_SOURCES = \
-  Current_TestC.cpp \
-  Current_TestC.h \
-  Current_TestC.inl \
-  Current_TestS.cpp \
-  Current_TestS.h \
-  Current_TestS.inl
-
-CLEANFILES = \
-  Current_Test-stamp \
-  Current_TestC.cpp \
-  Current_TestC.h \
-  Current_TestC.inl \
-  Current_TestS.cpp \
-  Current_TestS.h \
-  Current_TestS.inl
-
-Current_TestC.cpp Current_TestC.h Current_TestC.inl Current_TestS.cpp Current_TestS.h Current_TestS.inl: Current_Test-stamp
-
-Current_Test-stamp: $(srcdir)/Current_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Current_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  Current_Test.idl
-
 ## Makefile.Framework_Server.am
 
 if BUILD_EXCEPTIONS
@@ -58,20 +27,28 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I.
+  -I. \
+  -I../lib
 
 server_SOURCES = \
-  Current_TestC.cpp \
-  Current_TestS.cpp \
   Current_Test_Impl.cpp \
   Server_Main.cpp \
-  Server_Request_Interceptor.cpp \
   Tester.cpp \
-  server.cpp \
-  Current_Test_Impl.h \
-  Server_Request_Interceptor.h
+  server.cpp
+
+../lib:
+	mkdir -p ../lib
+
+
+server_DEPENDENCIES = \
+ ../lib
+
+server_LDFLAGS = \
+  -L../lib
 
 server_LDADD = \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
@@ -97,16 +74,26 @@ client_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I.
+  -I. \
+  -I../lib
 
 client_SOURCES = \
-  Client_Request_Interceptor.cpp \
-  Current_TestC.cpp \
   Tester.cpp \
-  client.cpp \
-  Client_Request_Interceptor.h
+  client.cpp
+
+../lib:
+	mkdir -p ../lib
+
+
+client_DEPENDENCIES = \
+ ../lib
+
+client_LDFLAGS = \
+  -L../lib
 
 client_LDADD = \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
diff --git a/TAO/tests/TransportCurrent/IIOP/Makefile.am b/TAO/tests/TransportCurrent/IIOP/Makefile.am
index ba7e07db31c..d6307796c55 100644
--- a/TAO/tests/TransportCurrent/IIOP/Makefile.am
+++ b/TAO/tests/TransportCurrent/IIOP/Makefile.am
@@ -11,41 +11,10 @@
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
-## Makefile.IIOP_Idl.am
-
-BUILT_SOURCES = \
-  ../Framework/Current_TestC.cpp \
-  ../Framework/Current_TestC.h \
-  ../Framework/Current_TestC.inl \
-  ../Framework/Current_TestS.cpp \
-  ../Framework/Current_TestS.h \
-  ../Framework/Current_TestS.inl
-
-CLEANFILES = \
-  ../Framework/Current_Test-stamp \
-  ../Framework/Current_TestC.cpp \
-  ../Framework/Current_TestC.h \
-  ../Framework/Current_TestC.inl \
-  ../Framework/Current_TestS.cpp \
-  ../Framework/Current_TestS.h \
-  ../Framework/Current_TestS.inl
-
-../Framework/Current_TestC.cpp ../Framework/Current_TestC.h ../Framework/Current_TestC.inl ../Framework/Current_TestS.cpp ../Framework/Current_TestS.h ../Framework/Current_TestS.inl: ../Framework/Current_Test-stamp
-
-../Framework/Current_Test-stamp: $(srcdir)/../Framework/Current_Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -o ../Framework $(srcdir)/../Framework/Current_Test.idl
-	@touch $@
-
-noinst_HEADERS = \
-  ../Framework/Current_Test.idl
-
 ## Makefile.IIOP_Server.am
 
 if BUILD_EXCEPTIONS
@@ -58,21 +27,30 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I../Framework
+  -I. \
+  -I../lib
 
 server_SOURCES = \
-  ../Framework/Current_TestC.cpp \
-  ../Framework/Current_TestS.cpp \
-  ../Framework/Server_Request_Interceptor.cpp \
-  ../Framework/server.cpp \
   Current_Test_Impl.cpp \
   IIOP_Server_Main.cpp \
   IIOP_Server_Request_Interceptor.cpp \
   IIOP_Tester.cpp \
-  ../Framework/Server_Request_Interceptor.h \
+  server.cpp \
   IIOP_Server_Request_Interceptor.h
 
+../lib:
+	mkdir -p ../lib
+
+
+server_DEPENDENCIES = \
+ ../lib
+
+server_LDFLAGS = \
+  -L../lib
+
 server_LDADD = \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
@@ -99,16 +77,27 @@ client_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I../Framework
+  -I. \
+  -I../lib
 
 client_SOURCES = \
-  ../Framework/Client_Request_Interceptor.cpp \
-  ../Framework/Current_TestC.cpp \
-  ../Framework/client.cpp \
   IIOP_Tester.cpp \
-  ../Framework/Client_Request_Interceptor.h
+  client.cpp \
+  IIOP_Server_Request_Interceptor.h
+
+../lib:
+	mkdir -p ../lib
+
+
+client_DEPENDENCIES = \
+ ../lib
+
+client_LDFLAGS = \
+  -L../lib
 
 client_LDADD = \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \
+  $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
diff --git a/TAO/tests/TransportCurrent/Makefile.am b/TAO/tests/TransportCurrent/Makefile.am
index 791806f58c0..31b17045a69 100644
--- a/TAO/tests/TransportCurrent/Makefile.am
+++ b/TAO/tests/TransportCurrent/Makefile.am
@@ -9,6 +9,7 @@
 ## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
-        Framework \
-        IIOP
+        lib \
+        IIOP \
+        Framework
 
diff --git a/TAO/tests/TransportCurrent/lib/Makefile.am b/TAO/tests/TransportCurrent/lib/Makefile.am
new file mode 100644
index 00000000000..8bd002e5a05
--- /dev/null
+++ b/TAO/tests/TransportCurrent/lib/Makefile.am
@@ -0,0 +1,106 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_LTLIBRARIES =
+
+## Makefile.Current_Test_Lib_Idl.am
+
+BUILT_SOURCES = \
+  Current_TestC.cpp \
+  Current_TestC.h \
+  Current_TestC.inl \
+  Current_TestS.cpp \
+  Current_TestS.h \
+  Current_TestS.inl
+
+CLEANFILES = \
+  Current_Test-stamp \
+  Current_TestC.cpp \
+  Current_TestC.h \
+  Current_TestC.inl \
+  Current_TestS.cpp \
+  Current_TestS.h \
+  Current_TestS.inl
+
+Current_TestC.cpp Current_TestC.h Current_TestC.inl Current_TestS.cpp Current_TestS.h Current_TestS.inl: Current_Test-stamp
+
+Current_Test-stamp: $(srcdir)/Current_Test.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_include=Current_Test_Export.h -Wb,export_macro=Current_Test_Export $(srcdir)/Current_Test.idl
+	@touch $@
+
+noinst_HEADERS = \
+  Current_Test.idl
+
+## Makefile.Current_Test_Lib_Client.am
+
+if BUILD_EXCEPTIONS
+
+noinst_LTLIBRARIES += libCurrent_Test_Lib_Client.la
+
+libCurrent_Test_Lib_Client_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I. \
+  -DCURRENT_TEST_BUILD_DLL
+
+libCurrent_Test_Lib_Client_la_SOURCES = \
+  Client_ORBInitializer.cpp \
+  Client_Request_Interceptor.cpp \
+  Current_TestC.cpp
+
+noinst_HEADERS += \
+  Client_ORBInitializer.h \
+  Client_Request_Interceptor.h
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.Current_Test_Lib_Server.am
+
+if BUILD_EXCEPTIONS
+
+noinst_LTLIBRARIES += libCurrent_Test_Lib_Server.la
+
+libCurrent_Test_Lib_Server_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I. \
+  -DCURRENT_TEST_BUILD_DLL
+
+libCurrent_Test_Lib_Server_la_SOURCES = \
+  Current_TestC.cpp \
+  Current_TestS.cpp \
+  Server_ORBInitializer.cpp \
+  Server_Request_Interceptor.cpp
+
+noinst_HEADERS += \
+  Server_ORBInitializer.h \
+  Server_Request_Interceptor.h
+
+endif BUILD_EXCEPTIONS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB