diff options
Diffstat (limited to 'TAO/tests')
62 files changed, 2627 insertions, 196 deletions
diff --git a/TAO/tests/Any/Recursive/Makefile.am b/TAO/tests/Any/Recursive/Makefile.am index c0a9288247e..e421db97822 100644 --- a/TAO/tests/Any/Recursive/Makefile.am +++ b/TAO/tests/Any/Recursive/Makefile.am @@ -16,8 +16,8 @@ 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.RecursiveHello_Idl.am diff --git a/TAO/tests/Bug_1270_Regression/Makefile.am b/TAO/tests/Bug_1270_Regression/Makefile.am index a67aef55f7d..d6755b56405 100644 --- a/TAO/tests/Bug_1270_Regression/Makefile.am +++ b/TAO/tests/Bug_1270_Regression/Makefile.am @@ -133,7 +133,6 @@ shutdown_SOURCES = \ shutdown.cpp \ Echo.h \ Echo_Caller.h \ - ORB_Task.h \ Server_Timer.h shutdown_LDADD = \ diff --git a/TAO/tests/Bug_2084_Regression/Makefile.am b/TAO/tests/Bug_2084_Regression/Makefile.am index 83e03707e35..9a19a32931d 100644 --- a/TAO/tests/Bug_2084_Regression/Makefile.am +++ b/TAO/tests/Bug_2084_Regression/Makefile.am @@ -67,7 +67,8 @@ server_SOURCES = \ TestC.h \ TestC.inl \ TestS.h \ - TestS.inl + TestS.inl \ + tid_to_int.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/Bug_2122_Regression/Makefile.am b/TAO/tests/Bug_2122_Regression/Makefile.am index adc3f2c0a3f..5fce95aa880 100644 --- a/TAO/tests/Bug_2122_Regression/Makefile.am +++ b/TAO/tests/Bug_2122_Regression/Makefile.am @@ -17,14 +17,13 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.Bug_2122_Regression_Test.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2122_Regression_Idl.am BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -33,15 +32,23 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2122_Regression_Test.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -52,11 +59,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + test.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2222_Regression/Makefile.am b/TAO/tests/Bug_2222_Regression/Makefile.am index c7244fa2c38..f0f01af2578 100644 --- a/TAO/tests/Bug_2222_Regression/Makefile.am +++ b/TAO/tests/Bug_2222_Regression/Makefile.am @@ -24,27 +24,6 @@ BUILT_SOURCES = if BUILD_EXCEPTIONS BUILT_SOURCES += \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -CLEANFILES += \ - TestType-stamp \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp - -TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl - @touch $@ - -BUILT_SOURCES += \ TestCaseC.cpp \ TestCaseC.h \ TestCaseC.inl \ @@ -65,6 +44,27 @@ TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl @touch $@ +BUILT_SOURCES += \ + TestTypeC.cpp \ + TestTypeC.h \ + TestTypeC.inl \ + TestTypeS.h \ + TestTypeS.inl + +CLEANFILES += \ + TestType-stamp \ + TestTypeC.cpp \ + TestTypeC.h \ + TestTypeC.inl \ + TestTypeS.h \ + TestTypeS.inl + +TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp + +TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2417_Regression/Makefile.am b/TAO/tests/Bug_2417_Regression/Makefile.am index 22ab045d3ba..de92d5ab5b5 100644 --- a/TAO/tests/Bug_2417_Regression/Makefile.am +++ b/TAO/tests/Bug_2417_Regression/Makefile.am @@ -16,8 +16,8 @@ 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.Bug_2417_Regression_Idl.am diff --git a/TAO/tests/Bug_2503_Regression/Makefile.am b/TAO/tests/Bug_2503_Regression/Makefile.am index 7d93f5365b8..eb9397885b7 100644 --- a/TAO/tests/Bug_2503_Regression/Makefile.am +++ b/TAO/tests/Bug_2503_Regression/Makefile.am @@ -74,10 +74,6 @@ client_SOURCES = \ client.cpp \ common.cpp \ test_i.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ common.h \ test_i.h @@ -115,10 +111,6 @@ server_SOURCES = \ common.cpp \ server.cpp \ test_i.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ common.h \ test_i.h diff --git a/TAO/tests/Bug_2560_Regression/Makefile.am b/TAO/tests/Bug_2560_Regression/Makefile.am index 2f08c943a56..71b77a9aa54 100644 --- a/TAO/tests/Bug_2560_Regression/Makefile.am +++ b/TAO/tests/Bug_2560_Regression/Makefile.am @@ -61,8 +61,8 @@ client_CPPFLAGS = \ client_SOURCES = \ QuoterC.cpp \ client.cpp \ - QuoterC.h \ - QuoterC.inl + Stock_Factory_i.h \ + Stock_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -88,10 +88,6 @@ server_SOURCES = \ Stock_Factory_i.cpp \ Stock_i.cpp \ server.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.h \ - QuoterS.inl \ Stock_Factory_i.h \ Stock_i.h diff --git a/TAO/tests/Bug_2669_Regression/Makefile.am b/TAO/tests/Bug_2669_Regression/Makefile.am index 5794909b1df..d2e38b33d23 100644 --- a/TAO/tests/Bug_2669_Regression/Makefile.am +++ b/TAO/tests/Bug_2669_Regression/Makefile.am @@ -26,29 +26,6 @@ if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS BUILT_SOURCES += \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -CLEANFILES += \ - Child-stamp \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp - -Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl - @touch $@ - -BUILT_SOURCES += \ ParentC.cpp \ ParentC.h \ ParentC.inl \ @@ -71,6 +48,29 @@ Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl @touch $@ +BUILT_SOURCES += \ + ChildC.cpp \ + ChildC.h \ + ChildC.inl \ + ChildS.cpp \ + ChildS.h \ + ChildS.inl + +CLEANFILES += \ + Child-stamp \ + ChildC.cpp \ + ChildC.h \ + ChildC.inl \ + ChildS.cpp \ + ChildS.h \ + ChildS.inl + +ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp + +Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl + @touch $@ + noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/TAO/tests/Bug_2702_Regression/Makefile.am b/TAO/tests/Bug_2702_Regression/Makefile.am index e373be645ba..64fa49d9967 100644 --- a/TAO/tests/Bug_2702_Regression/Makefile.am +++ b/TAO/tests/Bug_2702_Regression/Makefile.am @@ -17,33 +17,42 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.CloseConnection_Client.am - -if BUILD_EXCEPTIONS +## Makefile.CloseConnection_Idl.am BUILT_SOURCES = \ + TestA.cpp \ TestA.h \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl CLEANFILES = \ Test-stamp \ + TestA.cpp \ TestA.h \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestA.h TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestA.cpp TestA.h TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GA $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.CloseConnection_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -54,12 +63,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - client.cpp \ - TestA.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2734_Regression/Makefile.am b/TAO/tests/Bug_2734_Regression/Makefile.am new file mode 100644 index 00000000000..80968060d21 --- /dev/null +++ b/TAO/tests/Bug_2734_Regression/Makefile.am @@ -0,0 +1,113 @@ +## 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_PROGRAMS = + +## Makefile.Bug_2734_Regression_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_2734_Regression_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_2734_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + test_i.h + +server_LDADD = \ + $(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/Bug_2935_Regression/Makefile.am b/TAO/tests/Bug_2935_Regression/Makefile.am new file mode 100644 index 00000000000..dd150134c27 --- /dev/null +++ b/TAO/tests/Bug_2935_Regression/Makefile.am @@ -0,0 +1,133 @@ +## 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_PROGRAMS = + +## Makefile.Bug_2935_Regression_IDL.am + +BUILT_SOURCES = \ + ThreeTierC.cpp \ + ThreeTierC.h \ + ThreeTierC.inl \ + ThreeTierS.cpp \ + ThreeTierS.h \ + ThreeTierS.inl + +CLEANFILES = \ + ThreeTier-stamp \ + ThreeTierC.cpp \ + ThreeTierC.h \ + ThreeTierC.inl \ + ThreeTierS.cpp \ + ThreeTierS.h \ + ThreeTierS.inl + +ThreeTierC.cpp ThreeTierC.h ThreeTierC.inl ThreeTierS.cpp ThreeTierS.h ThreeTierS.inl: ThreeTier-stamp + +ThreeTier-stamp: $(srcdir)/ThreeTier.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ThreeTier.idl + @touch $@ + +noinst_HEADERS = \ + ThreeTier.idl + +## Makefile.Bug_2935_Regression_Middle.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += middle + +middle_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +middle_SOURCES = \ + ThreeTierC.cpp \ + ThreeTierS.cpp \ + middle.cpp \ + middle_i.cpp \ + middle_i.h + +middle_LDADD = \ + $(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.Bug_2935_Regression_Sink.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += sink + +sink_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +sink_SOURCES = \ + ThreeTierC.cpp \ + ThreeTierS.cpp \ + sink.cpp \ + sink_i.cpp \ + sink_i.h + +sink_LDADD = \ + $(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.Bug_2935_Regression_Source.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += source + +source_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +source_SOURCES = \ + ThreeTierC.cpp \ + source.cpp \ + source_i.cpp \ + source_i.h + +source_LDADD = \ + $(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/Bug_3000_Regression/Makefile.am b/TAO/tests/Bug_3000_Regression/Makefile.am index dda16620cfb..22de3314d3d 100644 --- a/TAO/tests/Bug_3000_Regression/Makefile.am +++ b/TAO/tests/Bug_3000_Regression/Makefile.am @@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.CallbackTest_Idl.am +## Makefile.Bug_3000_Regression_Idl.am BUILT_SOURCES = \ TestC.cpp \ @@ -46,7 +46,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ Test.idl -## Makefile.CallbackTest_Client.am +## Makefile.Bug_3000_Regression_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS @@ -79,7 +79,7 @@ client_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING -## Makefile.CallbackTest_Server.am +## Makefile.Bug_3000_Regression_Server.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS diff --git a/TAO/tests/Bug_3042_Regression/Makefile.am b/TAO/tests/Bug_3042_Regression/Makefile.am new file mode 100644 index 00000000000..803a0423e86 --- /dev/null +++ b/TAO/tests/Bug_3042_Regression/Makefile.am @@ -0,0 +1,76 @@ +## 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) + + +## Makefile.Bug_3042_Test_Client.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + testS.cpp \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl + +client_LDADD = \ + $(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/Bug_3108_Regression/Makefile.am b/TAO/tests/Bug_3108_Regression/Makefile.am new file mode 100644 index 00000000000..ad897c6c249 --- /dev/null +++ b/TAO/tests/Bug_3108_Regression/Makefile.am @@ -0,0 +1,105 @@ +## 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_PROGRAMS = + +## Makefile.Bug_3108_Regression_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_3108_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3108_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + test_i.h + +server_LDADD = \ + $(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/Bug_3163_Regression/Makefile.am b/TAO/tests/Bug_3163_Regression/Makefile.am new file mode 100644 index 00000000000..8c3151c1fa1 --- /dev/null +++ b/TAO/tests/Bug_3163_Regression/Makefile.am @@ -0,0 +1,102 @@ +## 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_PROGRAMS = + +## Makefile.Bug_3163_Regression_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_3163_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3163_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp + +server_LDADD = \ + $(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/Bug_3171_Regression/Makefile.am b/TAO/tests/Bug_3171_Regression/Makefile.am new file mode 100644 index 00000000000..46b9bd57450 --- /dev/null +++ b/TAO/tests/Bug_3171_Regression/Makefile.am @@ -0,0 +1,55 @@ +## 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_ROOT = $(top_srcdir) + + +## Makefile.Bug_3171_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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_THREADS +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/Bug_3198_Regression/Makefile.am b/TAO/tests/Bug_3198_Regression/Makefile.am new file mode 100644 index 00000000000..5be85cc8c4e --- /dev/null +++ b/TAO/tests/Bug_3198_Regression/Makefile.am @@ -0,0 +1,44 @@ +## 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_ROOT = $(top_srcdir) + + +## Makefile.Bug_3198_Regression.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + bug_3198_regression.cpp + +client_LDADD = \ + $(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/Bug_3251_Regression/Makefile.am b/TAO/tests/Bug_3251_Regression/Makefile.am new file mode 100644 index 00000000000..1b3f337f1a4 --- /dev/null +++ b/TAO/tests/Bug_3251_Regression/Makefile.am @@ -0,0 +1,76 @@ +## 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_ROOT = $(top_srcdir) + + +## Makefile.Bug_3251_Regression_Lib.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_LTLIBRARIES = libBug_3251.la + +libBug_3251_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DBUG_3251_REGRESSION_BUILD_DLL + +libBug_3251_la_SOURCES = \ + DllOrb.cpp \ + PersistentPoa.cpp + +noinst_HEADERS = \ + DllOrb.h \ + PersistentPoa.h + +endif BUILD_THREADS +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3251_Regression_Server.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + DllOrb.h \ + PersistentPoa.h \ + bug_3251_export.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_THREADS +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/Bug_3276_Regression/Makefile.am b/TAO/tests/Bug_3276_Regression/Makefile.am new file mode 100644 index 00000000000..1615324f14a --- /dev/null +++ b/TAO/tests/Bug_3276_Regression/Makefile.am @@ -0,0 +1,110 @@ +## 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_PROGRAMS = + +## Makefile.Bug_3276_Regression_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_3276_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + Manager.h \ + Servant_Locator.h \ + test_i.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3276_Regression_Manager.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += manager + +manager_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +manager_SOURCES = \ + Manager.cpp \ + Servant_Locator.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + Manager.h \ + Servant_Locator.h \ + test_i.h + +manager_LDADD = \ + $(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/Bug_3299_Regression/Makefile.am b/TAO/tests/Bug_3299_Regression/Makefile.am new file mode 100644 index 00000000000..9dea9880897 --- /dev/null +++ b/TAO/tests/Bug_3299_Regression/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_PROGRAMS = + +## Makefile.Bug_3299_Regression_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_3299_Regression_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + TestC.cpp \ + client.cpp \ + Hello.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3299_Regression_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.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/Bug_3311_Regression/Makefile.am b/TAO/tests/Bug_3311_Regression/Makefile.am new file mode 100644 index 00000000000..29e2192faae --- /dev/null +++ b/TAO/tests/Bug_3311_Regression/Makefile.am @@ -0,0 +1,78 @@ +## 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) + + +## Makefile.Bug_3311_Regression_Test.am + +if BUILD_EXCEPTIONS + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_PROGRAMS = test + +test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +test_SOURCES = \ + test.cpp \ + testC.cpp \ + testS.cpp \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl + +test_LDADD = \ + $(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/Bug_3315_Regression/Makefile.am b/TAO/tests/Bug_3315_Regression/Makefile.am new file mode 100644 index 00000000000..8319643ae0a --- /dev/null +++ b/TAO/tests/Bug_3315_Regression/Makefile.am @@ -0,0 +1,48 @@ +## 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_ROOT = $(top_srcdir) + + +## Makefile.Bug_3315_Regression.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + main.cpp + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_THREADS +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/CSD_Collocation/Makefile.am b/TAO/tests/CSD_Collocation/Makefile.am new file mode 100644 index 00000000000..b9da222a5c3 --- /dev/null +++ b/TAO/tests/CSD_Collocation/Makefile.am @@ -0,0 +1,89 @@ +## 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) + + +## Makefile.CSD_Collocation.am + +if BUILD_EXCEPTIONS +if BUILD_THREADS + +BUILT_SOURCES = \ + DiamondC.cpp \ + DiamondC.h \ + DiamondC.inl \ + DiamondS.cpp \ + DiamondS.h \ + DiamondS.inl + +CLEANFILES = \ + Diamond-stamp \ + DiamondC.cpp \ + DiamondC.h \ + DiamondC.inl \ + DiamondS.cpp \ + DiamondS.h \ + DiamondS.inl + +DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp + +Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Gd -St -Sa $(srcdir)/Diamond.idl + @touch $@ + +noinst_PROGRAMS = Collocation + +Collocation_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +Collocation_SOURCES = \ + Collocation.cpp \ + Collocation_Tester.cpp \ + DiamondC.cpp \ + DiamondS.cpp \ + Diamond_i.cpp \ + Collocation_Tester.h \ + DiamondC.h \ + DiamondC.inl \ + DiamondS.h \ + DiamondS.inl \ + Diamond_i.h + +Collocation_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ + $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ + $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS +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/CodeSets/libs/Makefile.am b/TAO/tests/CodeSets/libs/Makefile.am index e1a65ab4510..2afaafe47a3 100644 --- a/TAO/tests/CodeSets/libs/Makefile.am +++ b/TAO/tests/CodeSets/libs/Makefile.am @@ -10,5 +10,6 @@ SUBDIRS = \ IBM1047_ISO8859 \ - UCS4_UTF16 + UCS4_UTF16 \ + UTF16_UCS2 diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/Makefile.am b/TAO/tests/CodeSets/libs/UTF16_UCS2/Makefile.am new file mode 100644 index 00000000000..5f5c18e5ca4 --- /dev/null +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/Makefile.am @@ -0,0 +1,47 @@ +## 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_ROOT = $(top_srcdir) + + +## Makefile.UTF16_UCS2_Translator.am + +if BUILD_EXCEPTIONS + +noinst_LTLIBRARIES = libUTF16_UCS2.la + +libUTF16_UCS2_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -DUTF16_UCS2_BUILD_DLL + +libUTF16_UCS2_la_SOURCES = \ + UTF16_UCS2_Factory.cpp \ + UTF16_UCS2_Translator.cpp + +noinst_HEADERS = \ + UTF16_UCS2_Factory.h \ + UTF16_UCS2_Translator.h \ + UTF16_UCS2_export.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 diff --git a/TAO/tests/Collocated_Forwarding/Makefile.am b/TAO/tests/Collocated_Forwarding/Makefile.am new file mode 100644 index 00000000000..02014c08d62 --- /dev/null +++ b/TAO/tests/Collocated_Forwarding/Makefile.am @@ -0,0 +1,93 @@ +## 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) + + +## Makefile.Collocated_Forwarding_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gd -Sorb $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Collocated_Forwarding_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS = server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.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 +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/DII_AMI_Forward/Makefile.am b/TAO/tests/DII_AMI_Forward/Makefile.am new file mode 100644 index 00000000000..91402c24826 --- /dev/null +++ b/TAO/tests/DII_AMI_Forward/Makefile.am @@ -0,0 +1,126 @@ +## 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_PROGRAMS = + +## Makefile.DII_AMI_Forward_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.DII_AMI_Forward_Client.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + DII_ReplyHandler.cpp \ + client.cpp \ + testC.cpp \ + DII_ReplyHandler.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.DII_AMI_Forward_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + orb_initializer.cpp \ + server.cpp \ + server_interceptor.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + orb_initializer.h \ + server_interceptor.h \ + test_i.h + +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.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/DLL_ORB/Makefile.am b/TAO/tests/DLL_ORB/Makefile.am index c9bc569b28a..59796900ee1 100644 --- a/TAO/tests/DLL_ORB/Makefile.am +++ b/TAO/tests/DLL_ORB/Makefile.am @@ -16,8 +16,8 @@ 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 = noinst_LTLIBRARIES = +noinst_PROGRAMS = ## Makefile.DLL_ORB_Idl.am diff --git a/TAO/tests/DSI_AMH/Makefile.am b/TAO/tests/DSI_AMH/Makefile.am index 334344208ed..c25e4ea5690 100644 --- a/TAO/tests/DSI_AMH/Makefile.am +++ b/TAO/tests/DSI_AMH/Makefile.am @@ -18,14 +18,13 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.DSI_AMH_Client.am - -if BUILD_EXCEPTIONS +## Makefile.DSI_AMH_Idl.am BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -34,15 +33,23 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.DSI_AMH_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -54,10 +61,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Roundtrip.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ @@ -80,6 +84,8 @@ server_CPPFLAGS = \ server_SOURCES = \ Roundtrip.cpp \ + TestC.cpp \ + TestS.cpp \ server.cpp \ Roundtrip.h diff --git a/TAO/tests/DynUnion_Test/Makefile.am b/TAO/tests/DynUnion_Test/Makefile.am index 9782729fb87..b71786ab726 100644 --- a/TAO/tests/DynUnion_Test/Makefile.am +++ b/TAO/tests/DynUnion_Test/Makefile.am @@ -72,6 +72,9 @@ CLEANFILES += \ dynanyC.cpp dynanyC.h dynanyC.inl dynanyS.h dynanyS.inl: dynany-stamp +dynany-stamp: $(srcdir)/dynany.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/dynany.idl + @touch $@ noinst_PROGRAMS = dynuniontest diff --git a/TAO/tests/FL_Cube/Makefile.am b/TAO/tests/FL_Cube/Makefile.am index 0be89c40cb8..cbba9b84e8c 100644 --- a/TAO/tests/FL_Cube/Makefile.am +++ b/TAO/tests/FL_Cube/Makefile.am @@ -16,9 +16,9 @@ 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 = CLEANFILES = BUILT_SOURCES = -noinst_PROGRAMS = ## Makefile.FL_Cube_Client.am @@ -115,7 +115,11 @@ CLEANFILES += \ testS.h \ testS.inl +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ noinst_PROGRAMS += server diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am index edbf0c80fba..4656aa2acd5 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am @@ -72,28 +72,31 @@ CLEANFILES += \ server.class: $(srcdir)/server.java javac -d . $(srcdir)/server.java -noinst_LTLIBRARIES = libJava_Big_Reply.la +noinst_PROGRAMS = client -libJava_Big_Reply_la_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -libJava_Big_Reply_la_SOURCES = \ +client_SOURCES = \ Client_Task.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp - -noinst_HEADERS = \ + client.cpp \ Client_Task.h \ - Test.idl \ TestC.h \ TestC.inl \ TestS.h \ TestS.inl +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + endif BUILD_JAVA endif BUILD_EXCEPTIONS diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am index 13080efda49..50f8ad9a1fb 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Makefile.am @@ -72,28 +72,31 @@ CLEANFILES += \ client.class: $(srcdir)/client.java javac -d . $(srcdir)/client.java -noinst_LTLIBRARIES = libJava_Big_Request.la +noinst_PROGRAMS = server -libJava_Big_Request_la_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -libJava_Big_Request_la_SOURCES = \ +server_SOURCES = \ Payload_Receiver.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp - -noinst_HEADERS = \ + server.cpp \ Payload_Receiver.h \ - Test.idl \ TestC.h \ TestC.inl \ TestS.h \ TestS.inl +server_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + endif BUILD_JAVA endif BUILD_EXCEPTIONS diff --git a/TAO/tests/HandleExhaustion/Makefile.am b/TAO/tests/HandleExhaustion/Makefile.am index c29da80a90e..65c70caa787 100644 --- a/TAO/tests/HandleExhaustion/Makefile.am +++ b/TAO/tests/HandleExhaustion/Makefile.am @@ -41,7 +41,7 @@ TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch "$@" + @touch $@ noinst_HEADERS = \ Test.idl @@ -93,11 +93,6 @@ client_LDADD = \ endif BUILD_EXCEPTIONS - -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Hello/Makefile.am b/TAO/tests/Hello/Makefile.am index 4ec42f53246..629cbaabeff 100644 --- a/TAO/tests/Hello/Makefile.am +++ b/TAO/tests/Hello/Makefile.am @@ -40,7 +40,7 @@ CLEANFILES = \ TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl @touch $@ noinst_HEADERS = \ diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am index 141c09ed3d4..f82edf80569 100644 --- a/TAO/tests/IDL_Test/Makefile.am +++ b/TAO/tests/IDL_Test/Makefile.am @@ -430,6 +430,222 @@ nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + old_arrayC.cpp \ + old_arrayC.h \ + old_arrayC.inl \ + old_arrayS.cpp \ + old_arrayS.h \ + old_arrayS.inl \ + old_arrayS_T.cpp \ + old_arrayS_T.h + +CLEANFILES += \ + old_array-stamp \ + old_arrayC.cpp \ + old_arrayC.h \ + old_arrayC.inl \ + old_arrayS.cpp \ + old_arrayS.h \ + old_arrayS.inl \ + old_arrayS_T.cpp \ + old_arrayS_T.h + +old_arrayC.cpp old_arrayC.h old_arrayC.inl old_arrayS.cpp old_arrayS.h old_arrayS.inl old_arrayS_T.cpp old_arrayS_T.h: old_array-stamp + +old_array-stamp: $(srcdir)/old_array.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_array.idl + @touch $@ + +BUILT_SOURCES += \ + old_constantsC.cpp \ + old_constantsC.h \ + old_constantsC.inl \ + old_constantsS.cpp \ + old_constantsS.h \ + old_constantsS.inl \ + old_constantsS_T.cpp \ + old_constantsS_T.h + +CLEANFILES += \ + old_constants-stamp \ + old_constantsC.cpp \ + old_constantsC.h \ + old_constantsC.inl \ + old_constantsS.cpp \ + old_constantsS.h \ + old_constantsS.inl \ + old_constantsS_T.cpp \ + old_constantsS_T.h + +old_constantsC.cpp old_constantsC.h old_constantsC.inl old_constantsS.cpp old_constantsS.h old_constantsS.inl old_constantsS_T.cpp old_constantsS_T.h: old_constants-stamp + +old_constants-stamp: $(srcdir)/old_constants.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_constants.idl + @touch $@ + +BUILT_SOURCES += \ + old_sequenceC.cpp \ + old_sequenceC.h \ + old_sequenceC.inl \ + old_sequenceS.cpp \ + old_sequenceS.h \ + old_sequenceS.inl \ + old_sequenceS_T.cpp \ + old_sequenceS_T.h + +CLEANFILES += \ + old_sequence-stamp \ + old_sequenceC.cpp \ + old_sequenceC.h \ + old_sequenceC.inl \ + old_sequenceS.cpp \ + old_sequenceS.h \ + old_sequenceS.inl \ + old_sequenceS_T.cpp \ + old_sequenceS_T.h + +old_sequenceC.cpp old_sequenceC.h old_sequenceC.inl old_sequenceS.cpp old_sequenceS.h old_sequenceS.inl old_sequenceS_T.cpp old_sequenceS_T.h: old_sequence-stamp + +old_sequence-stamp: $(srcdir)/old_sequence.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_sequence.idl + @touch $@ + +BUILT_SOURCES += \ + simpleC.cpp \ + simpleC.h \ + simpleC.inl \ + simpleS.cpp \ + simpleS.h \ + simpleS.inl \ + simpleS_T.cpp \ + simpleS_T.h + +CLEANFILES += \ + simple-stamp \ + simpleC.cpp \ + simpleC.h \ + simpleC.inl \ + simpleS.cpp \ + simpleS.h \ + simpleS.inl \ + simpleS_T.cpp \ + simpleS_T.h + +simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl simpleS_T.cpp simpleS_T.h: simple-stamp + +simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple.idl + @touch $@ + +BUILT_SOURCES += \ + simple2C.cpp \ + simple2C.h \ + simple2C.inl \ + simple2S.cpp \ + simple2S.h \ + simple2S.inl \ + simple2S_T.cpp \ + simple2S_T.h + +CLEANFILES += \ + simple2-stamp \ + simple2C.cpp \ + simple2C.h \ + simple2C.inl \ + simple2S.cpp \ + simple2S.h \ + simple2S.inl \ + simple2S_T.cpp \ + simple2S_T.h + +simple2C.cpp simple2C.h simple2C.inl simple2S.cpp simple2S.h simple2S.inl simple2S_T.cpp simple2S_T.h: simple2-stamp + +simple2-stamp: $(srcdir)/simple2.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple2.idl + @touch $@ + +BUILT_SOURCES += \ + old_structC.cpp \ + old_structC.h \ + old_structC.inl \ + old_structS.cpp \ + old_structS.h \ + old_structS.inl \ + old_structS_T.cpp \ + old_structS_T.h + +CLEANFILES += \ + old_struct-stamp \ + old_structC.cpp \ + old_structC.h \ + old_structC.inl \ + old_structS.cpp \ + old_structS.h \ + old_structS.inl \ + old_structS_T.cpp \ + old_structS_T.h + +old_structC.cpp old_structC.h old_structC.inl old_structS.cpp old_structS.h old_structS.inl old_structS_T.cpp old_structS_T.h: old_struct-stamp + +old_struct-stamp: $(srcdir)/old_struct.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_struct.idl + @touch $@ + +BUILT_SOURCES += \ + old_unionC.cpp \ + old_unionC.h \ + old_unionC.inl \ + old_unionS.cpp \ + old_unionS.h \ + old_unionS.inl \ + old_unionS_T.cpp \ + old_unionS_T.h + +CLEANFILES += \ + old_union-stamp \ + old_unionC.cpp \ + old_unionC.h \ + old_unionC.inl \ + old_unionS.cpp \ + old_unionS.h \ + old_unionS.inl \ + old_unionS_T.cpp \ + old_unionS_T.h + +old_unionC.cpp old_unionC.h old_unionC.inl old_unionS.cpp old_unionS.h old_unionS.inl old_unionS_T.cpp old_unionS_T.h: old_union-stamp + +old_union-stamp: $(srcdir)/old_union.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union.idl + @touch $@ + +BUILT_SOURCES += \ + old_union2C.cpp \ + old_union2C.h \ + old_union2C.inl \ + old_union2S.cpp \ + old_union2S.h \ + old_union2S.inl \ + old_union2S_T.cpp \ + old_union2S_T.h + +CLEANFILES += \ + old_union2-stamp \ + old_union2C.cpp \ + old_union2C.h \ + old_union2C.inl \ + old_union2S.cpp \ + old_union2S.h \ + old_union2S.inl \ + old_union2S_T.cpp \ + old_union2S_T.h + +old_union2C.cpp old_union2C.h old_union2C.inl old_union2S.cpp old_union2S.h old_union2S.inl old_union2S_T.cpp old_union2S_T.h: old_union2-stamp + +old_union2-stamp: $(srcdir)/old_union2.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union2.idl + @touch $@ + +BUILT_SOURCES += \ paramsC.cpp \ paramsC.h \ paramsC.inl \ @@ -801,6 +1017,130 @@ keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) @touch $@ BUILT_SOURCES += \ + dif2A.cpp \ + dif2A.h \ + dif2C.cpp \ + dif2C.h \ + dif2C.inl \ + dif2S.cpp \ + dif2S.h \ + dif2S.inl \ + dif2S_T.cpp \ + dif2S_T.h + +CLEANFILES += \ + dif2-stamp \ + dif2A.cpp \ + dif2A.h \ + dif2C.cpp \ + dif2C.h \ + dif2C.inl \ + dif2S.cpp \ + dif2S.h \ + dif2S.inl \ + dif2S_T.cpp \ + dif2S_T.h + +dif2A.cpp dif2A.h dif2C.cpp dif2C.h dif2C.inl dif2S.cpp dif2S.h dif2S.inl dif2S_T.cpp dif2S_T.h: dif2-stamp + +dif2-stamp: $(srcdir)/dif2.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/dif2.idl + @touch $@ + +BUILT_SOURCES += \ + inheritA.cpp \ + inheritA.h \ + inheritC.cpp \ + inheritC.h \ + inheritC.inl \ + inheritS.cpp \ + inheritS.h \ + inheritS.inl \ + inheritS_T.cpp \ + inheritS_T.h + +CLEANFILES += \ + inherit-stamp \ + inheritA.cpp \ + inheritA.h \ + inheritC.cpp \ + inheritC.h \ + inheritC.inl \ + inheritS.cpp \ + inheritS.h \ + inheritS.inl \ + inheritS_T.cpp \ + inheritS_T.h + +inheritA.cpp inheritA.h inheritC.cpp inheritC.h inheritC.inl inheritS.cpp inheritS.h inheritS.inl inheritS_T.cpp inheritS_T.h: inherit-stamp + +inherit-stamp: $(srcdir)/inherit.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/inherit.idl + @touch $@ + +BUILT_SOURCES += \ + moduleA.cpp \ + moduleA.h \ + moduleC.cpp \ + moduleC.h \ + moduleC.inl \ + moduleS.cpp \ + moduleS.h \ + moduleS.inl \ + moduleS_T.cpp \ + moduleS_T.h + +CLEANFILES += \ + module-stamp \ + moduleA.cpp \ + moduleA.h \ + moduleC.cpp \ + moduleC.h \ + moduleC.inl \ + moduleS.cpp \ + moduleS.h \ + moduleS.inl \ + moduleS_T.cpp \ + moduleS_T.h + +moduleA.cpp moduleA.h moduleC.cpp moduleC.h moduleC.inl moduleS.cpp moduleS.h moduleS.inl moduleS_T.cpp moduleS_T.h: module-stamp + +module-stamp: $(srcdir)/module.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/module.idl + @touch $@ + +BUILT_SOURCES += \ + primtypesA.cpp \ + primtypesA.h \ + primtypesC.cpp \ + primtypesC.h \ + primtypesC.inl \ + primtypesS.cpp \ + primtypesS.h \ + primtypesS.inl \ + primtypesS_T.cpp \ + primtypesS_T.h + +CLEANFILES += \ + primtypes-stamp \ + primtypesA.cpp \ + primtypesA.h \ + primtypesC.cpp \ + primtypesC.h \ + primtypesC.inl \ + primtypesS.cpp \ + primtypesS.h \ + primtypesS.inl \ + primtypesS_T.cpp \ + primtypesS_T.h + +primtypesA.cpp primtypesA.h primtypesC.cpp primtypesC.h primtypesC.inl primtypesS.cpp primtypesS.h primtypesS.inl primtypesS_T.cpp primtypesS_T.h: primtypes-stamp + +primtypes-stamp: $(srcdir)/primtypes.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/primtypes.idl + @touch $@ + +BUILT_SOURCES += \ pragmaA.cpp \ pragmaA.h \ pragmaC.cpp \ @@ -987,6 +1327,9 @@ main_SOURCES = \ constantsA.cpp \ constantsC.cpp \ constantsS.cpp \ + dif2A.cpp \ + dif2C.cpp \ + dif2S.cpp \ enum_in_structC.cpp \ enum_in_structS.cpp \ fullC.cpp \ @@ -1002,19 +1345,40 @@ main_SOURCES = \ includedS.cpp \ includingC.cpp \ includingS.cpp \ + inheritA.cpp \ + inheritC.cpp \ + inheritS.cpp \ interfaceC.cpp \ interfaceS.cpp \ keywordsA.cpp \ keywordsC.cpp \ keywordsS.cpp \ main.cpp \ + moduleA.cpp \ + moduleC.cpp \ + moduleS.cpp \ nested_scopeC.cpp \ nested_scopeS.cpp \ + old_arrayC.cpp \ + old_arrayS.cpp \ + old_constantsC.cpp \ + old_constantsS.cpp \ + old_sequenceC.cpp \ + old_sequenceS.cpp \ + old_structC.cpp \ + old_structS.cpp \ + old_union2C.cpp \ + old_union2S.cpp \ + old_unionC.cpp \ + old_unionS.cpp \ paramsC.cpp \ paramsS.cpp \ pragmaA.cpp \ pragmaC.cpp \ pragmaS.cpp \ + primtypesA.cpp \ + primtypesC.cpp \ + primtypesS.cpp \ reopen_include1C.cpp \ reopen_include1S.cpp \ reopen_include2C.cpp \ @@ -1026,6 +1390,10 @@ main_SOURCES = \ repo_id_modS.cpp \ sequenceC.cpp \ sequenceS.cpp \ + simple2C.cpp \ + simple2S.cpp \ + simpleC.cpp \ + simpleS.cpp \ structC.cpp \ structS.cpp \ typecodeA.cpp \ @@ -1094,6 +1462,12 @@ main_SOURCES = \ constantsS.h \ constantsS.inl \ constantsS_T.h \ + dif2A.h \ + dif2C.h \ + dif2C.inl \ + dif2S.h \ + dif2S.inl \ + dif2S_T.h \ enum_in_structC.h \ enum_in_structC.inl \ enum_in_structS.h \ @@ -1130,6 +1504,12 @@ main_SOURCES = \ includingS.h \ includingS.inl \ includingS_T.h \ + inheritA.h \ + inheritC.h \ + inheritC.inl \ + inheritS.h \ + inheritS.inl \ + inheritS_T.h \ interfaceC.h \ interfaceC.inl \ interfaceS.h \ @@ -1141,11 +1521,47 @@ main_SOURCES = \ keywordsS.h \ keywordsS.inl \ keywordsS_T.h \ + moduleA.h \ + moduleC.h \ + moduleC.inl \ + moduleS.h \ + moduleS.inl \ + moduleS_T.h \ nested_scopeC.h \ nested_scopeC.inl \ nested_scopeS.h \ nested_scopeS.inl \ nested_scopeS_T.h \ + old_arrayC.h \ + old_arrayC.inl \ + old_arrayS.h \ + old_arrayS.inl \ + old_arrayS_T.h \ + old_constantsC.h \ + old_constantsC.inl \ + old_constantsS.h \ + old_constantsS.inl \ + old_constantsS_T.h \ + old_sequenceC.h \ + old_sequenceC.inl \ + old_sequenceS.h \ + old_sequenceS.inl \ + old_sequenceS_T.h \ + old_structC.h \ + old_structC.inl \ + old_structS.h \ + old_structS.inl \ + old_structS_T.h \ + old_union2C.h \ + old_union2C.inl \ + old_union2S.h \ + old_union2S.inl \ + old_union2S_T.h \ + old_unionC.h \ + old_unionC.inl \ + old_unionS.h \ + old_unionS.inl \ + old_unionS_T.h \ paramsC.h \ paramsC.inl \ paramsS.h \ @@ -1157,6 +1573,12 @@ main_SOURCES = \ pragmaS.h \ pragmaS.inl \ pragmaS_T.h \ + primtypesA.h \ + primtypesC.h \ + primtypesC.inl \ + primtypesS.h \ + primtypesS.inl \ + primtypesS_T.h \ reopen_include1C.h \ reopen_include1C.inl \ reopen_include1S.h \ @@ -1183,6 +1605,16 @@ main_SOURCES = \ sequenceS.h \ sequenceS.inl \ sequenceS_T.h \ + simple2C.h \ + simple2C.inl \ + simple2S.h \ + simple2S.inl \ + simple2S_T.h \ + simpleC.h \ + simpleC.inl \ + simpleS.h \ + simpleS.inl \ + simpleS_T.h \ structC.h \ structC.inl \ structS.h \ diff --git a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am index 0b5223e3059..95e426636a4 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am +++ b/TAO/tests/IOR_Endpoint_Hostnames/Makefile.am @@ -16,6 +16,7 @@ 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.generate_ior.am @@ -44,7 +45,7 @@ bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bogus.idl @touch $@ -noinst_PROGRAMS = generate_ior +noinst_PROGRAMS += generate_ior generate_ior_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -73,18 +74,19 @@ endif BUILD_EXCEPTIONS ## Makefile.list_interfaces.am -noinst_LTLIBRARIES = liblist_interfaces.la +noinst_PROGRAMS += list_interfaces -liblist_interfaces_la_CPPFLAGS = \ +list_interfaces_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -liblist_interfaces_la_SOURCES = \ - list_interfaces.cpp - -noinst_HEADERS = \ +list_interfaces_SOURCES = \ + list_interfaces.cpp \ bogus_i.h +list_interfaces_LDADD = \ + $(ACE_BUILDDIR)/ace/libACE.la + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Makefile.am b/TAO/tests/Makefile.am index 91e8a8b1d7f..bfe6ebbeedc 100644 --- a/TAO/tests/Makefile.am +++ b/TAO/tests/Makefile.am @@ -92,6 +92,7 @@ SUBDIRS = \ Bug_2678_Regression \ Bug_2683_Regression \ Bug_2702_Regression \ + Bug_2734_Regression \ Bug_2735_Regression \ Bug_2768_Regression \ Bug_2791_Regression \ @@ -105,19 +106,33 @@ SUBDIRS = \ Bug_2869_Regression \ Bug_2909_Regression \ Bug_2918_Regression \ + Bug_2935_Regression \ Bug_2936_Regression \ Bug_2953_Regression \ Bug_2966_Regression \ + Bug_3000_Regression \ + Bug_3042_Regression \ + Bug_3108_Regression \ + Bug_3163_Regression \ + Bug_3171_Regression \ + Bug_3198_Regression \ + Bug_3251_Regression \ + Bug_3276_Regression \ + Bug_3299_Regression \ + Bug_3311_Regression \ + Bug_3315_Regression \ Bug_933_Regression \ CDR \ COIOP \ CORBA_e_Implicit_Activation \ + CSD_Collocation \ CSD_Strategy_Tests \ Cache_Growth_Test \ CallbackTest \ Client_Leaks \ CodeSets \ Codec \ + Collocated_Forwarding \ Collocation \ CollocationLockup \ Collocation_Exception_Test \ @@ -131,6 +146,7 @@ SUBDIRS = \ Connection_Timeout \ Crash_On_Write \ Crashed_Callback \ + DII_AMI_Forward \ DII_Collocation_Tests \ DIOP \ DLL_ORB \ @@ -166,6 +182,7 @@ SUBDIRS = \ MT_Client \ MT_Server \ MT_Timeout \ + Monitor \ Multiple \ Multiple_Inheritance \ Muxed_GIOP_Versions \ @@ -186,6 +203,7 @@ SUBDIRS = \ OctetSeq \ Ondemand_Write \ Oneway_Buffering \ + Oneway_Send_Timeouts \ Oneway_Timeouts \ Oneways_Invoking_Twoways \ Optimized_Connection \ diff --git a/TAO/tests/Monitor/Makefile.am b/TAO/tests/Monitor/Makefile.am new file mode 100644 index 00000000000..7c75b0fba7f --- /dev/null +++ b/TAO/tests/Monitor/Makefile.am @@ -0,0 +1,13 @@ +## 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 = \ + Marshal_Buffer + diff --git a/TAO/tests/Monitor/Marshal_Buffer/Makefile.am b/TAO/tests/Monitor/Marshal_Buffer/Makefile.am new file mode 100644 index 00000000000..92d7abc11f0 --- /dev/null +++ b/TAO/tests/Monitor/Marshal_Buffer/Makefile.am @@ -0,0 +1,123 @@ +## 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_PROGRAMS = + +## Makefile.marshal_buffer_idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.marshal_buffer_client.am + +if BUILD_EXCEPTIONS +if !BUILD_WINCE + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) \ + -I$(ACE_ROOT)/ETCL \ + -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ + -I$(ACE_ROOT)/ace/ETCL/ETCL_include + +client_SOURCES = \ + client.cpp \ + testC.cpp \ + testC.h \ + testC.inl + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ + $(ACE_BUILDDIR)/ace/MonitorControl/libACE_MonitorControl.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL_Parser.la \ + $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ + $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.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_WINCE +endif BUILD_EXCEPTIONS + +## Makefile.marshal_buffer_server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + testC.h \ + testC.inl \ + testS.h \ + testS.inl \ + test_i.h + +server_LDADD = \ + $(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/OBV/Collocated/Forward/Makefile.am b/TAO/tests/OBV/Collocated/Forward/Makefile.am index 4dbe912c3ea..3342f2616ea 100644 --- a/TAO/tests/OBV/Collocated/Forward/Makefile.am +++ b/TAO/tests/OBV/Collocated/Forward/Makefile.am @@ -24,29 +24,6 @@ BUILT_SOURCES = if BUILD_EXCEPTIONS BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - -BUILT_SOURCES += \ TreeBaseC.cpp \ TreeBaseC.h \ TreeBaseC.inl \ @@ -92,6 +69,29 @@ TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl @touch $@ +BUILT_SOURCES += \ + TreeNodeC.cpp \ + TreeNodeC.h \ + TreeNodeC.inl \ + TreeNodeS.cpp \ + TreeNodeS.h \ + TreeNodeS.inl + +CLEANFILES += \ + TreeNode-stamp \ + TreeNodeC.cpp \ + TreeNodeC.h \ + TreeNodeC.inl \ + TreeNodeS.cpp \ + TreeNodeS.h \ + TreeNodeS.inl + +TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp + +TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl + @touch $@ + noinst_PROGRAMS = collocated collocated_CPPFLAGS = \ diff --git a/TAO/tests/OBV/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am index 2d1c345ac29..97419be5cb3 100644 --- a/TAO/tests/OBV/Forward/Makefile.am +++ b/TAO/tests/OBV/Forward/Makefile.am @@ -16,8 +16,8 @@ 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.OBV_Forward_Idl.am diff --git a/TAO/tests/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am index 5976e7c8e0f..cb8849b4a9f 100644 --- a/TAO/tests/OBV/Truncatable/Makefile.am +++ b/TAO/tests/OBV/Truncatable/Makefile.am @@ -16,8 +16,8 @@ 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.OBV_Truncatable_Idl.am diff --git a/TAO/tests/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am index 17a61f1758b..998de5d784c 100644 --- a/TAO/tests/OBV/ValueBox/Makefile.am +++ b/TAO/tests/OBV/ValueBox/Makefile.am @@ -16,8 +16,8 @@ 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.valuebox_idl.am diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am index 72fd0343b1c..5c0e2c64f4d 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am @@ -76,6 +76,7 @@ endif BUILD_EXCEPTIONS ## Makefile.ORB_DLL_Server.am +if BUILD_EXCEPTIONS if BUILD_THREADS noinst_LTLIBRARIES += libORB_DLL_Server.la @@ -101,6 +102,7 @@ noinst_HEADERS += \ Test_i.h endif BUILD_THREADS +endif BUILD_EXCEPTIONS ## Makefile.Two_DLL_ORB.am @@ -123,7 +125,11 @@ CLEANFILES += \ TestS.h \ TestS.inl +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + @touch $@ noinst_PROGRAMS = Test diff --git a/TAO/tests/Object_Loader/Makefile.am b/TAO/tests/Object_Loader/Makefile.am index 35f2d39d0d1..be1484cb691 100644 --- a/TAO/tests/Object_Loader/Makefile.am +++ b/TAO/tests/Object_Loader/Makefile.am @@ -66,7 +66,11 @@ CLEANFILES += \ TestS.h \ TestS.inl +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + @touch $@ noinst_LTLIBRARIES = libTest_DLL.la @@ -115,6 +119,9 @@ CLEANFILES += \ TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + @touch $@ noinst_PROGRAMS = driver diff --git a/TAO/tests/Oneway_Send_Timeouts/Makefile.am b/TAO/tests/Oneway_Send_Timeouts/Makefile.am new file mode 100644 index 00000000000..7eb82c493fc --- /dev/null +++ b/TAO/tests/Oneway_Send_Timeouts/Makefile.am @@ -0,0 +1,119 @@ +## 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) + + +## Makefile.Oneway_Scenarios_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Oneway_Scenarios_Oneway_Test.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +BUILT_SOURCES += \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES += \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl + @touch $@ + +noinst_PROGRAMS = oneway_test + +oneway_test_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +oneway_test_SOURCES = \ + Client.cpp \ + Server.cpp \ + TestC.cpp \ + TestS.cpp \ + Test_i.cpp \ + main.cpp \ + Client.h \ + Server.h \ + TestC.h \ + TestC.inl \ + TestS.h \ + TestS.inl \ + Test_i.h + +oneway_test_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.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/Oneway_Timeouts/Makefile.am b/TAO/tests/Oneway_Timeouts/Makefile.am index 0395827f4c3..b340d6f070e 100644 --- a/TAO/tests/Oneway_Timeouts/Makefile.am +++ b/TAO/tests/Oneway_Timeouts/Makefile.am @@ -93,8 +93,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl + TestC.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/Optimized_Connection/Makefile.am b/TAO/tests/Optimized_Connection/Makefile.am index 777e9c18d89..f417da1826e 100644 --- a/TAO/tests/Optimized_Connection/Makefile.am +++ b/TAO/tests/Optimized_Connection/Makefile.am @@ -17,14 +17,13 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) -## Makefile.Optimized_Connection_Client.am - -if BUILD_EXCEPTIONS +## Makefile.Optimized_Connection_Idl.am BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl @@ -33,15 +32,23 @@ CLEANFILES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Test.idl @touch $@ +noinst_HEADERS = \ + Test.idl + +## Makefile.Optimized_Connection_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -52,11 +59,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - oc_client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + oc_client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ diff --git a/TAO/tests/POA/Adapter_Activator/Makefile.am b/TAO/tests/POA/Adapter_Activator/Makefile.am index c49a73bab2f..d5a77b47773 100644 --- a/TAO/tests/POA/Adapter_Activator/Makefile.am +++ b/TAO/tests/POA/Adapter_Activator/Makefile.am @@ -31,6 +31,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/POA/Explicit_Activation/Makefile.am b/TAO/tests/POA/Explicit_Activation/Makefile.am index f2f94386aba..abe2e08e73e 100644 --- a/TAO/tests/POA/Explicit_Activation/Makefile.am +++ b/TAO/tests/POA/Explicit_Activation/Makefile.am @@ -35,6 +35,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/POA/Makefile.am b/TAO/tests/POA/Makefile.am index bce8ddb2b0e..bcbf18f8568 100644 --- a/TAO/tests/POA/Makefile.am +++ b/TAO/tests/POA/Makefile.am @@ -12,36 +12,36 @@ SUBDIRS = \ Bug_1592_Regression \ Bug_2511_Regression \ Current \ + DSI \ Deactivate_Object \ Default_Servant \ + Default_Servant2 \ EndpointPolicy \ Etherealization \ Excessive_Object_Deactivations \ - Identity \ - Forwarding \ - MT_Servant_Locator \ - Nested_Non_Servant_Upcalls \ - Non_Servant_Upcalls \ - Object_Reactivation \ - POAManagerFactory \ - POA_Destruction \ - Persistent_ID \ - Policies \ - Reference_Counting \ - Single_Threaded_POA \ - wait_for_completion \ - DSI \ - Default_Servant \ FindPOA \ + Forwarding \ Generic_Servant \ Explicit_Activation \ Adapter_Activator \ + Identity \ Loader \ + MT_Servant_Locator \ + Nested_Non_Servant_Upcalls \ NewPOA \ + Non_Servant_Upcalls \ + Object_Reactivation \ On_Demand_Activation \ On_Demand_Loading \ + POAManagerFactory \ POA_BiDir \ + POA_Destruction \ + Persistent_ID \ + Policies \ Reference_Counted_Servant \ + Reference_Counting \ RootPOA \ - TIE + Single_Threaded_POA \ + TIE \ + wait_for_completion diff --git a/TAO/tests/POA/On_Demand_Activation/Makefile.am b/TAO/tests/POA/On_Demand_Activation/Makefile.am index be208a9b4a4..8e1a4025c78 100644 --- a/TAO/tests/POA/On_Demand_Activation/Makefile.am +++ b/TAO/tests/POA/On_Demand_Activation/Makefile.am @@ -35,6 +35,16 @@ server_SOURCES = \ Servant_Activator.h \ Servant_Locator.h +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/POA/Reference_Counted_Servant/Makefile.am b/TAO/tests/POA/Reference_Counted_Servant/Makefile.am index 18d04dafa82..0d6bb6cc4e1 100644 --- a/TAO/tests/POA/Reference_Counted_Servant/Makefile.am +++ b/TAO/tests/POA/Reference_Counted_Servant/Makefile.am @@ -31,6 +31,16 @@ server_CPPFLAGS = \ server_SOURCES = \ server.cpp +../Generic_Servant: + mkdir -p ../Generic_Servant + + +server_DEPENDENCIES = \ + ../Generic_Servant + +server_LDFLAGS = \ + -L../Generic_Servant + server_LDADD = \ $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_2133/Makefile.am new file mode 100644 index 00000000000..8ddaaaf6177 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_2133/Makefile.am @@ -0,0 +1,111 @@ +## 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_PROGRAMS = + +## Makefile.Bug_2133_Idl.am + +BUILT_SOURCES = \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +CLEANFILES = \ + Test-stamp \ + TestC.cpp \ + TestC.h \ + TestC.inl \ + TestS.cpp \ + TestS.h \ + TestS.inl + +TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp + +Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp $(srcdir)/Test.idl + @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2133_Client.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + ClientORBInitializer.cpp \ + ClientRequest_Interceptor.cpp \ + TestC.cpp \ + client.cpp \ + ClientORBInitializer.h \ + ClientRequest_Interceptor.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_EXCEPTIONS + +## Makefile.Bug_2133_Server.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + Hello.cpp \ + TestC.cpp \ + TestS.cpp \ + server.cpp \ + Hello.h + +server_LDADD = \ + $(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/Portable_Interceptors/Bug_3079/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_3079/Makefile.am new file mode 100644 index 00000000000..ff6940d67e7 --- /dev/null +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Makefile.am @@ -0,0 +1,128 @@ +## 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_PROGRAMS = + +## Makefile.Bug_3079_Idl.am + +BUILT_SOURCES = \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +CLEANFILES = \ + test-stamp \ + testC.cpp \ + testC.h \ + testC.inl \ + testS.cpp \ + testS.h \ + testS.inl + +testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp + +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_3079_Client.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +noinst_PROGRAMS += client + +client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +client_SOURCES = \ + Client_ORBInitializer.cpp \ + Client_Request_Interceptor.cpp \ + client.cpp \ + testC.cpp \ + Client_ORBInitializer.h \ + Client_Request_Interceptor.h + +client_LDADD = \ + $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_PI.la \ + $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +endif BUILD_INTERCEPTORS +endif BUILD_EXCEPTIONS + +## Makefile.Bug_3079_Server.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +server_SOURCES = \ + CrashPoint.cpp \ + Server_ORBInitializer.cpp \ + Server_Request_Interceptor.cpp \ + server.cpp \ + testC.cpp \ + testS.cpp \ + test_i.cpp \ + CrashPoint.h \ + Server_ORBInitializer.h \ + Server_Request_Interceptor.h \ + test_i.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_Valuetype.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_INTERCEPTORS +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/Portable_Interceptors/Bug_3080/Makefile.am b/TAO/tests/Portable_Interceptors/Bug_3080/Makefile.am index 658dfa945ad..23225cbb9a5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Makefile.am @@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -## Makefile.PI_Redirection_Idl.am +## Makefile.Bug_3080_Idl.am BUILT_SOURCES = \ testC.cpp \ @@ -46,7 +46,7 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) noinst_HEADERS = \ test.idl -## Makefile.PI_Redirection_Client.am +## Makefile.Bug_3080_Client.am if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS @@ -68,8 +68,6 @@ client_SOURCES = \ Client_Request_Interceptor.h client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_PI.la \ $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -80,10 +78,9 @@ client_LDADD = \ endif BUILD_INTERCEPTORS endif BUILD_EXCEPTIONS -## Makefile.PI_Redirection_Server.am +## Makefile.Bug_3080_Server.am if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS noinst_PROGRAMS += server @@ -94,29 +91,18 @@ server_CPPFLAGS = \ -I$(TAO_BUILDDIR) server_SOURCES = \ - CrashPoint.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ server.cpp \ testC.cpp \ testS.cpp \ test_i.cpp \ - CrashPoint.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ test_i.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_Valuetype.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_INTERCEPTORS endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/tests/Portable_Interceptors/Makefile.am b/TAO/tests/Portable_Interceptors/Makefile.am index bd17fa3898d..4d9f7debe66 100644 --- a/TAO/tests/Portable_Interceptors/Makefile.am +++ b/TAO/tests/Portable_Interceptors/Makefile.am @@ -16,7 +16,10 @@ SUBDIRS = \ Benchmark \ Bug_1559 \ Bug_2088 \ + Bug_2133 \ Bug_2510_Regression \ + Bug_3079 \ + Bug_3080 \ Collocated \ Dynamic \ ForwardRequest \ diff --git a/TAO/tests/QtTests/Makefile.am b/TAO/tests/QtTests/Makefile.am index 289727bfdcf..3396b311848 100644 --- a/TAO/tests/QtTests/Makefile.am +++ b/TAO/tests/QtTests/Makefile.am @@ -17,8 +17,8 @@ TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROO TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -BUILT_SOURCES = CLEANFILES = +BUILT_SOURCES = ## Makefile.QtTests_Server.am @@ -121,6 +121,9 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl + @touch $@ BUILT_SOURCES += \ client_moc.cpp diff --git a/TAO/tests/Server_Connection_Purging/Makefile.am b/TAO/tests/Server_Connection_Purging/Makefile.am index cec675dfbe2..79ceb9e1d19 100644 --- a/TAO/tests/Server_Connection_Purging/Makefile.am +++ b/TAO/tests/Server_Connection_Purging/Makefile.am @@ -97,6 +97,30 @@ server_LDADD = \ endif BUILD_EXCEPTIONS +## Makefile.Server_Connection_Purging_ShutCl.am + +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += shutdown_client + +shutdown_client_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + -I$(TAO_ROOT) \ + -I$(TAO_BUILDDIR) + +shutdown_client_SOURCES = \ + TestC.cpp \ + client2.cpp \ + Test_i.h + +shutdown_client_LDADD = \ + $(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.* diff --git a/TAO/tests/Xt_Stopwatch/Makefile.am b/TAO/tests/Xt_Stopwatch/Makefile.am index 0a3471274b5..5c2d9fca533 100644 --- a/TAO/tests/Xt_Stopwatch/Makefile.am +++ b/TAO/tests/Xt_Stopwatch/Makefile.am @@ -16,8 +16,8 @@ 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) -CLEANFILES = noinst_PROGRAMS = +CLEANFILES = BUILT_SOURCES = ## Makefile.Xt_Stopwatch_Server.am @@ -124,6 +124,9 @@ CLEANFILES += \ testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp +test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl + @touch $@ noinst_PROGRAMS += client |