diff options
| -rw-r--r-- | TAO/ChangeLog | 36 | ||||
| -rw-r--r-- | TAO/configure.ac | 3 | ||||
| -rw-r--r-- | TAO/tao/Makefile.am | 139 | ||||
| -rw-r--r-- | TAO/tao/TC.mpc | 42 | ||||
| -rw-r--r-- | TAO/tao/TC_IIOP.mpc (renamed from TAO/tao/TransportCurrent/TC_IIOP.mpc) | 26 | ||||
| -rw-r--r-- | TAO/tao/TransportCurrent/TC.mpc | 33 | ||||
| -rw-r--r-- | TAO/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/Framework/Makefile.am | 154 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/IIOP/Makefile.am | 159 | ||||
| -rw-r--r-- | TAO/tests/TransportCurrent/Makefile.am | 14 |
10 files changed, 566 insertions, 41 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c7f00be8ec2..5353929bc47 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,35 @@ +Wed Dec 20 17:34:07 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Configure Makefiles for new subdirectories. + + * orbsvcs/tests/Makefile.am: + + Regenerate to descend into TransportCurrent subdirectory. + + * tests/TransportCurrent/Makefile.am: + * tests/TransportCurrent/IIOP/Makefile.am: + * tests/TransportCurrent/Framework/Makefile.am: + + New Makefile.am's for TransportCurrent unit tests. + + * tao/Makefile.am: + + Regenerated. + + * tao/TC.mpc: + * tao/TC_IIOP.mpc: + + ...to here, to match convention established by other core TAO + library projects. This also makes the generated Makefile.am + for the autoconf build a little more sane. + + * tao/TransportCurrent/TC.mpc: + * tao/TransportCurrent/TC_IIOP.mpc: + + Move TransportCurrent *.mpc projects from here... + Wed Dec 20 16:22:29 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> These are fixes correcting scoreboard issues pertaining to the @@ -735,7 +767,9 @@ Tue Dec 12 17:34:25 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> Tue Dec 12 17:28:14 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * Configure Makefiles for new subdirectories. + * configure.ac: + + Configure Makefiles for new subdirectories. * orbsvcs/tests/Makefile.am: diff --git a/TAO/configure.ac b/TAO/configure.ac index 316795e9339..24d64ce050f 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -850,6 +850,9 @@ 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/Two_Objects/Makefile tests/Typedef_String_Array/Makefile tests/UNKNOWN_Exception/Makefile diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index cb5a5a9b63e..24e70d81b94 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -926,6 +926,7 @@ libTAO_la_SOURCES = \ Transport_Descriptor_Interface.cpp \ Transport_Mux_Strategy.cpp \ Transport_Queueing_Strategies.cpp \ + Transport_Selection_Guard.cpp \ Transport_Timer.cpp \ TypeCodeFactory_Adapter.cpp \ Typecode_typesC.cpp \ @@ -1406,6 +1407,7 @@ nobase_include_HEADERS = \ Transport_Descriptor_Interface.inl \ Transport_Mux_Strategy.h \ Transport_Queueing_Strategies.h \ + Transport_Selection_Guard.h \ Transport_Timer.h \ TypeCodeFactory_Adapter.h \ Typecode_types.pidl \ @@ -5726,6 +5728,143 @@ endif BUILD_X11 endif BUILD_EXCEPTIONS endif BUILD_ACE_XTREACTOR +## Makefile.TC.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +BUILT_SOURCES += \ + TransportCurrent/TCC.cpp \ + TransportCurrent/TCC.h \ + TransportCurrent/TCC.inl \ + TransportCurrent/TCS.cpp \ + TransportCurrent/TCS.h \ + TransportCurrent/TCS.inl + +CLEANFILES += \ + TransportCurrent/TC-stamp \ + TransportCurrent/TCC.cpp \ + TransportCurrent/TCC.h \ + TransportCurrent/TCC.inl \ + TransportCurrent/TCS.cpp \ + TransportCurrent/TCS.h \ + TransportCurrent/TCS.inl + +TransportCurrent/TCC.cpp TransportCurrent/TCC.h TransportCurrent/TCC.inl TransportCurrent/TCS.cpp TransportCurrent/TCS.h TransportCurrent/TCS.inl: TransportCurrent/TC-stamp + +TransportCurrent/TC-stamp: $(srcdir)/TransportCurrent/TC.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export $(srcdir)/TransportCurrent/TC.idl + @touch $@ + +lib_LTLIBRARIES += libTAO_TC.la + +libTAO_TC_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_TRANSPORT_CURRENT_BUILD_DLL + +libTAO_TC_la_SOURCES = \ + TransportCurrent/Current_Impl.cpp \ + TransportCurrent/Current_Loader.cpp \ + TransportCurrent/Current_ORBInitializer_Base.cpp \ + TransportCurrent/TCC.cpp \ + TransportCurrent/TCS.cpp + +libTAO_TC_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_TC_la_LIBADD = \ + libTAO_PI.la \ + libTAO_CodecFactory.la \ + libTAO_AnyTypeCode.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + TransportCurrent/Current_Impl.h \ + TransportCurrent/Current_Loader.h \ + TransportCurrent/Current_ORBInitializer.cpp \ + TransportCurrent/Current_ORBInitializer.h \ + TransportCurrent/Current_ORBInitializer_Base.h \ + TransportCurrent/TC.idl \ + TransportCurrent/TCC.h \ + TransportCurrent/TCC.inl \ + TransportCurrent/TCS.h \ + TransportCurrent/TCS.inl \ + TransportCurrent/Transport_Current.h + +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS + +## Makefile.TC_IIOP.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +BUILT_SOURCES += \ + TransportCurrent/TC_IIOPC.cpp \ + TransportCurrent/TC_IIOPC.h \ + TransportCurrent/TC_IIOPC.inl \ + TransportCurrent/TC_IIOPS.cpp \ + TransportCurrent/TC_IIOPS.h \ + TransportCurrent/TC_IIOPS.inl + +CLEANFILES += \ + TransportCurrent/TC_IIOP-stamp \ + TransportCurrent/TC_IIOPC.cpp \ + TransportCurrent/TC_IIOPC.h \ + TransportCurrent/TC_IIOPC.inl \ + TransportCurrent/TC_IIOPS.cpp \ + TransportCurrent/TC_IIOPS.h \ + TransportCurrent/TC_IIOPS.inl + +TransportCurrent/TC_IIOPC.cpp TransportCurrent/TC_IIOPC.h TransportCurrent/TC_IIOPC.inl TransportCurrent/TC_IIOPS.cpp TransportCurrent/TC_IIOPS.h TransportCurrent/TC_IIOPS.inl: TransportCurrent/TC_IIOP-stamp + +TransportCurrent/TC_IIOP-stamp: $(srcdir)/TransportCurrent/TC_IIOP.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export $(srcdir)/TransportCurrent/TC_IIOP.idl + @touch $@ + +lib_LTLIBRARIES += libTAO_TC_IIOP.la + +libTAO_TC_IIOP_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DTAO_TRANSPORT_CURRENT_BUILD_DLL + +libTAO_TC_IIOP_la_SOURCES = \ + TransportCurrent/IIOP_Current_Impl.cpp \ + TransportCurrent/IIOP_Current_Loader.cpp \ + TransportCurrent/TC_IIOPC.cpp \ + TransportCurrent/TC_IIOPS.cpp + +libTAO_TC_IIOP_la_LDFLAGS = \ + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + +libTAO_TC_IIOP_la_LIBADD = \ + libTAO_TC.la \ + libTAO_PI.la \ + libTAO_CodecFactory.la \ + libTAO_AnyTypeCode.la \ + libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +nobase_include_HEADERS += \ + TransportCurrent/IIOP_Current_Impl.h \ + TransportCurrent/IIOP_Current_Loader.h \ + TransportCurrent/IIOP_Transport_Current.h \ + TransportCurrent/TC_IIOP.idl \ + TransportCurrent/TC_IIOPC.h \ + TransportCurrent/TC_IIOPC.inl \ + TransportCurrent/TC_IIOPS.h \ + TransportCurrent/TC_IIOPS.inl + +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS + ## Makefile.TypeCodeFactory.am if BUILD_EXCEPTIONS diff --git a/TAO/tao/TC.mpc b/TAO/tao/TC.mpc new file mode 100644 index 00000000000..1e7dd691e0f --- /dev/null +++ b/TAO/tao/TC.mpc @@ -0,0 +1,42 @@ +//$Id$ + +project(*) : taolib_with_idl, tao_versioning_idl_defaults, core, interceptors, pi { + + sharedname = TAO_TC + dynamicflags = TAO_TRANSPORT_CURRENT_BUILD_DLL + + Source_Files { + TransportCurrent/Current_Impl.cpp + TransportCurrent/Current_Loader.cpp + TransportCurrent/Current_ORBInitializer_Base.cpp + } + + Header_Files { + TransportCurrent/Current_Impl.h + TransportCurrent/Current_Loader.h + TransportCurrent/Current_ORBInitializer.h + TransportCurrent/Current_ORBInitializer_Base.h + TransportCurrent/Transport_Current.h + } + + Inline_Files { + } + + Template_Files { + TransportCurrent/Current_ORBInitializer.cpp + } + + idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h + idlflags += -Wb,export_macro=TAO_Transport_Current_Export + + IDL_Files { + TransportCurrent/TC.idl + } + + Resource_Files { + } + + PIDL_Files { + } +} + diff --git a/TAO/tao/TransportCurrent/TC_IIOP.mpc b/TAO/tao/TC_IIOP.mpc index 1f28ceb549a..3d00cd9c8d2 100644 --- a/TAO/tao/TransportCurrent/TC_IIOP.mpc +++ b/TAO/tao/TC_IIOP.mpc @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ project(*) : taolib_with_idl, tao_versioning_idl_defaults, core, interceptors, pi, tc { @@ -8,20 +8,32 @@ project(*) : taolib_with_idl, tao_versioning_idl_defaults, core, interceptors, p libs += TAO_TC Source_Files { - IIOP_Current_Impl.cpp - IIOP_Current_Loader.cpp + TransportCurrent/IIOP_Current_Impl.cpp + TransportCurrent/IIOP_Current_Loader.cpp } Header_Files { - IIOP_Current_Impl.h - IIOP_Current_Loader.h - IIOP_Transport_Current.h + TransportCurrent/IIOP_Current_Impl.h + TransportCurrent/IIOP_Current_Loader.h + TransportCurrent/IIOP_Transport_Current.h + } + + Inline_Files { + } + + Template_Files { } idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h idlflags += -Wb,export_macro=TAO_Transport_Current_Export IDL_Files { - TC_IIOP.idl + TransportCurrent/TC_IIOP.idl + } + + Resource_Files { + } + + PIDL_Files { } } diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc deleted file mode 100644 index 95a392e060b..00000000000 --- a/TAO/tao/TransportCurrent/TC.mpc +++ /dev/null @@ -1,33 +0,0 @@ -//$Id:$ - -project(*) : taolib_with_idl, tao_versioning_idl_defaults, core, interceptors, pi { - - sharedname = TAO_TC - dynamicflags = TAO_TRANSPORT_CURRENT_BUILD_DLL - - Source_Files { - Current_Impl.cpp - Current_Loader.cpp - Current_ORBInitializer_Base.cpp - } - - Header_Files { - Current_Impl.h - Current_Loader.h - Current_ORBInitializer.h - Current_ORBInitializer_Base.h - Transport_Current.h - } - - Template_Files { - Current_ORBInitializer.cpp - } - - idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h - idlflags += -Wb,export_macro=TAO_Transport_Current_Export - - IDL_Files { - TC.idl - } -} - diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am index bfdf95c3913..6697754c0c0 100644 --- a/TAO/tests/Makefile.am +++ b/TAO/tests/Makefile.am @@ -178,6 +178,7 @@ SUBDIRS = \ Strategies \ Timed_Buffered_Oneways \ Timeout \ + TransportCurrent \ Two_Objects \ Typedef_String_Array \ UNKNOWN_Exception \ diff --git a/TAO/tests/TransportCurrent/Framework/Makefile.am b/TAO/tests/TransportCurrent/Framework/Makefile.am new file mode 100644 index 00000000000..c1d19666eb0 --- /dev/null +++ b/TAO/tests/TransportCurrent/Framework/Makefile.am @@ -0,0 +1,154 @@ +## 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 = -Ge 1 -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 = +CLEANFILES = +BUILT_SOURCES = + +## Makefile.Framework_Server.am + +if BUILD_EXCEPTIONS + +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) $(srcdir)/Current_Test.idl + @touch $@ + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Current_TestC.cpp \ + Current_TestS.cpp \ + Current_Test_Impl.cpp \ + Server_Main.cpp \ + Server_Request_Interceptor.cpp \ + Tester.cpp \ + server.cpp \ + Current_TestC.h \ + Current_TestC.inl \ + Current_TestS.h \ + Current_TestS.inl \ + Current_Test_Impl.h \ + Server_Request_Interceptor.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_TC.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Framework_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +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) $(srcdir)/Current_Test.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + Client_Request_Interceptor.cpp \ + Current_TestC.cpp \ + Current_TestS.cpp \ + Tester.cpp \ + client.cpp \ + Client_Request_Interceptor.h \ + Current_TestC.h \ + Current_TestC.inl \ + Current_TestS.h \ + Current_TestS.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO_TC.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## 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 diff --git a/TAO/tests/TransportCurrent/IIOP/Makefile.am b/TAO/tests/TransportCurrent/IIOP/Makefile.am new file mode 100644 index 00000000000..5660465b642 --- /dev/null +++ b/TAO/tests/TransportCurrent/IIOP/Makefile.am @@ -0,0 +1,159 @@ +## 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 = -Ge 1 -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 = +CLEANFILES = +BUILT_SOURCES = + +## Makefile.IIOP_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +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) -o ../Framework $(srcdir)/../Framework/Current_Test.idl + @touch $@ + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I../Framework + +client_SOURCES = \ + ../Framework/Client_Request_Interceptor.cpp \ + ../Framework/Current_TestC.cpp \ + ../Framework/Current_TestS.cpp \ + ../Framework/client.cpp \ + IIOP_Tester.cpp \ + ../Framework/Client_Request_Interceptor.h \ + ../Framework/Current_TestC.h \ + ../Framework/Current_TestC.inl \ + ../Framework/Current_TestS.h \ + ../Framework/Current_TestS.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO_TC.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.IIOP_Server.am + +if BUILD_EXCEPTIONS + +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) -o ../Framework $(srcdir)/../Framework/Current_Test.idl + @touch $@ + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I../Framework + +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/Current_TestC.h \ + ../Framework/Current_TestC.inl \ + ../Framework/Current_TestS.h \ + ../Framework/Current_TestS.inl \ + ../Framework/Server_Request_Interceptor.h \ + IIOP_Server_Request_Interceptor.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_TC.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +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 diff --git a/TAO/tests/TransportCurrent/Makefile.am b/TAO/tests/TransportCurrent/Makefile.am new file mode 100644 index 00000000000..791806f58c0 --- /dev/null +++ b/TAO/tests/TransportCurrent/Makefile.am @@ -0,0 +1,14 @@ +## 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 + +SUBDIRS = \ + Framework \ + IIOP + |