diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-09 23:25:21 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-09 23:25:21 +0000 |
| commit | ea1a85584f47325b6be5b2b907497d8396b9d42b (patch) | |
| tree | ce9eb0cb42b3afae6f7bd7bf816a1a2a641bd621 /TAO | |
| parent | f5215d28e1c11daa938076e82a4114479beae5e7 (diff) | |
| download | ATCD-ea1a85584f47325b6be5b2b907497d8396b9d42b.tar.gz | |
ChangeLogTag: Sat Dec 9 23:18:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
35 files changed, 653 insertions, 735 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aa83da76b62..1ce39839863 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,45 @@ +Sat Dec 9 23:18:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/Bug_1495_Regression/Makefile.am: + * tests/Bug_1551_Regression/Makefile.am: + * tests/Bug_1568_Regression/Makefile.am: + * tests/Bug_1627_Regression/Makefile.am: + * tests/Bug_1670_Regression/Makefile.am: + * tests/Bug_1676_Regression/Makefile.am: + * tests/Bug_1869_Regression/Makefile.am: + * tests/Bug_2174_Regression/Makefile.am: + * tests/Bug_2183_Regression/Makefile.am: + * tests/Bug_2186_Regression/Makefile.am: + * tests/Bug_2188_Regression/Makefile.am: + * tests/Bug_2234_Regression/Makefile.am: + * tests/Bug_2289_Regression/Makefile.am: + * tests/Bug_2328_Regression/Makefile.am: + * tests/Bug_2349_Regression/Makefile.am: + * tests/Bug_2429_Regression/Makefile.am: + * tests/Bug_2494_Regression/Makefile.am: + + Regenerated. + + * tests/Bug_1495_Regression/Bug_1495.mpc: + * tests/Bug_1551_Regression/Bug_1551_Regression.mpc: + * tests/Bug_1568_Regression/Bug_1568_Regression.mpc: + * tests/Bug_1627_Regression/Bug_1627_Regression.mpc: + * tests/Bug_1670_Regression/Bug_1670_Regression.mpc: + * tests/Bug_1676_Regression/Bug_1676_Regression.mpc: + * tests/Bug_1869_Regression/Bug_1869_Regression.mpc: + * tests/Bug_2174_Regression/Bug_2174_Regression.mpc: + * tests/Bug_2183_Regression/Bug_2183_Regression.mpc: + * tests/Bug_2186_Regression/Bug_2186_Regression.mpc: + * tests/Bug_2188_Regression/broken.mpc: + * tests/Bug_2234_Regression/Bug_2234_Regression.mpc: + * tests/Bug_2289_Regression/Bug_2289_Regression.mpc: + * tests/Bug_2328_Regression/Bug_2328_Regression.mpc: + * tests/Bug_2349_Regression/Bug_2349_Regression.mpc: + * tests/Bug_2429_Regression/Bug_2429_Regression.mpc: + * tests/Bug_2494_Regression/Bug_2494_Regression.mpc: + + Split out IDL compilation into separate MPC project. + Fri Dec 8 22:30:46 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/IDL_Test/included.idl: diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc index 7e7cfd67199..15cb99367e1 100644 --- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc +++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc @@ -1,17 +1,30 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver, pi_server, interceptors { + after += *idl Source_Files { test_i.cpp + testC.cpp + testS.cpp Server_ORBInitializer.cpp server_interceptor.cpp Threaded_Server.cpp } + IDL_Files { + } } project(*Client): taoserver, pi, interceptors { exename = client + after += *idl after += *Server Source_Files { test_i.cpp @@ -23,5 +36,7 @@ project(*Client): taoserver, pi, interceptors { Server_Task.cpp Client_Task.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_1495_Regression/Makefile.am b/TAO/tests/Bug_1495_Regression/Makefile.am index 98f01476ecc..0a154f238e5 100644 --- a/TAO/tests/Bug_1495_Regression/Makefile.am +++ b/TAO/tests/Bug_1495_Regression/Makefile.am @@ -17,15 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1495_Server.am +## Makefile.Bug_1495_Idl.am -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -33,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -45,9 +40,18 @@ 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) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_1495_Server.am + +if BUILD_EXCEPTIONS +if BUILD_INTERCEPTORS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -65,10 +69,6 @@ server_SOURCES = \ test_i.cpp \ Server_ORBInitializer.h \ server_interceptor.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h server_LDADD = \ @@ -88,29 +88,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS if BUILD_INTERCEPTORS -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 += client client_CPPFLAGS = \ @@ -130,10 +107,6 @@ client_SOURCES = \ Client_Task.h \ Server_Task.h \ client_interceptor.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h client_LDADD = \ diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc index 96a4dfabd63..676093874cc 100644 --- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc +++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc @@ -1,20 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, ami { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, ami, iortable { + after += *idl Source_Files { Hello.cpp Server_Task.cpp server.cpp + TestC.cpp + TestS.cpp + } + IDL_Files { } } project(*Client): taoserver, ami { exename = client + after += *idl after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp client.cpp + TestC.cpp + TestS.cpp + } + IDL_Files { } } diff --git a/TAO/tests/Bug_1551_Regression/Makefile.am b/TAO/tests/Bug_1551_Regression/Makefile.am index 9c57e835fbf..c8498bf91d8 100644 --- a/TAO/tests/Bug_1551_Regression/Makefile.am +++ b/TAO/tests/Bug_1551_Regression/Makefile.am @@ -17,16 +17,14 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1551_Regression_Server.am +## Makefile.Bug_1551_Regression_Idl.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -34,7 +32,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -49,6 +47,20 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.Bug_1551_Regression_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -64,11 +76,7 @@ server_SOURCES = \ TestS.cpp \ server.cpp \ Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Server_Task.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -91,29 +99,6 @@ if BUILD_AMI 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) -GC $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -129,11 +114,7 @@ client_SOURCES = \ TestS.cpp \ client.cpp \ Client_Task.h \ - Reply_Handler.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Reply_Handler.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc index d6430831e00..579c46280fa 100644 --- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc +++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc @@ -1,16 +1,35 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, amh { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, amh { + after += *idl Source_Files { server.cpp + + TestC.cpp + TestS.cpp + } + IDL_Files { } } project(*Client): taoserver, amh { + after += *idl after += *Server exename = client Source_Files { client.cpp + + TestC.cpp + TestS.cpp + } + IDL_Files { } } diff --git a/TAO/tests/Bug_1568_Regression/Makefile.am b/TAO/tests/Bug_1568_Regression/Makefile.am index 39951381865..9e831b02a8d 100644 --- a/TAO/tests/Bug_1568_Regression/Makefile.am +++ b/TAO/tests/Bug_1568_Regression/Makefile.am @@ -17,15 +17,13 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1568_Regression_Server.am +## Makefile.Bug_1568_Regression_Idl.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -33,7 +31,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -48,6 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_1568_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -59,11 +69,7 @@ server_CPPFLAGS = \ server_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -83,29 +89,6 @@ endif BUILD_CORBA_MESSAGING 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) -GH $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -117,11 +100,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ TestS.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc index 93a6bb0d168..19a373b79c9 100644 --- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc +++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc @@ -1,17 +1,32 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, iortable { + after += *idl Source_Files { Test_i.cpp + TestC.cpp + TestS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_1627_Regression/Makefile.am b/TAO/tests/Bug_1627_Regression/Makefile.am index 7d52b8d9582..f47d990a0e5 100644 --- a/TAO/tests/Bug_1627_Regression/Makefile.am +++ b/TAO/tests/Bug_1627_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1627_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_1627_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -44,9 +40,17 @@ 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) $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_1627_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ TestS.cpp \ Test_i.cpp \ server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ Test_i.h server_LDADD = \ @@ -79,27 +79,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -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 $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc index 5e8364ab993..5b118bd19b7 100644 --- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc +++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc @@ -1,16 +1,29 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, amh { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, amh { + after += *idl Source_Files { server.cpp } + IDL_Files { + } } project(*Client): taoserver, amh { exename = client + after += *idl after += *Server Source_Files { client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_1670_Regression/Makefile.am b/TAO/tests/Bug_1670_Regression/Makefile.am index 722bf651557..3e49be439bc 100644 --- a/TAO/tests/Bug_1670_Regression/Makefile.am +++ b/TAO/tests/Bug_1670_Regression/Makefile.am @@ -17,15 +17,13 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1670_Regression_Server.am +## Makefile.Bug_1670_Regression_Idl.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -33,7 +31,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -48,6 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_1670_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -57,13 +67,7 @@ server_CPPFLAGS = \ -I$(TAO_BUILDDIR) server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -83,29 +87,6 @@ endif BUILD_CORBA_MESSAGING 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) -GH $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -115,13 +96,7 @@ client_CPPFLAGS = \ -I$(TAO_BUILDDIR) client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc index 9a1892855d9..a2357ad295c 100644 --- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc +++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc @@ -1,19 +1,32 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver { - idlflags += -Sa -St + after += *idl Source_Files { Hello.cpp + TestC.cpp + TestS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_1676_Regression/Makefile.am b/TAO/tests/Bug_1676_Regression/Makefile.am index d5716441863..a98be2a1091 100644 --- a/TAO/tests/Bug_1676_Regression/Makefile.am +++ b/TAO/tests/Bug_1676_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1676_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_1676_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_1676_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -78,27 +78,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -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 client_CPPFLAGS = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc index f4f21ac3fb7..7bb66c7b450 100644 --- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc +++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc @@ -1,14 +1,32 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, ami { + IDL_Files { + AMI.idl + } + custom_only = 1 +} + project(*Server): taoserver, iortable, ami { + after += *idl Source_Files { server.cpp + AMIC.cpp + AMIS.cpp + } + IDL_Files { } } project(*Client): taoclient, ami { + after += *idl + after += *Server Source_Files { client.cpp + AMIC.cpp + AMIS.cpp + } + IDL_Files { } } diff --git a/TAO/tests/Bug_1869_Regression/Makefile.am b/TAO/tests/Bug_1869_Regression/Makefile.am index d8edbfc872e..fbc0f98c13f 100644 --- a/TAO/tests/Bug_1869_Regression/Makefile.am +++ b/TAO/tests/Bug_1869_Regression/Makefile.am @@ -17,16 +17,14 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1869_Regression_Client.am +## Makefile.Bug_1869_Regression_Idl.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ AMIC.cpp \ AMIC.h \ AMIC.inl \ @@ -34,7 +32,7 @@ BUILT_SOURCES += \ AMIS.h \ AMIS.inl -CLEANFILES += \ +CLEANFILES = \ AMI-stamp \ AMIC.cpp \ AMIC.h \ @@ -49,29 +47,40 @@ AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl @touch $@ -noinst_PROGRAMS += client -client_CPPFLAGS = \ +noinst_HEADERS = \ + AMI.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING +endif BUILD_AMI + +## Makefile.Bug_1869_Regression_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + +noinst_PROGRAMS += server + +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ AMIC.cpp \ AMIS.cpp \ - client.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.h \ - AMIS.inl + server.cpp -client_LDADD = \ +server_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_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -80,59 +89,31 @@ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI -## Makefile.Bug_1869_Regression_Server.am +## Makefile.Bug_1869_Regression_Client.am if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - AMIC.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.cpp \ - AMIS.h \ - AMIS.inl - -CLEANFILES += \ - AMI-stamp \ - AMIC.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.cpp \ - AMIS.h \ - AMIS.inl - -AMIC.cpp AMIC.h AMIC.inl AMIS.cpp AMIS.h AMIS.inl: AMI-stamp - -AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl - @touch $@ - -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ AMIC.cpp \ AMIS.cpp \ - server.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.h \ - AMIS.inl + client.cpp -server_LDADD = \ +client_LDADD = \ $(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_IORTable.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 diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc index 93c036d2ec2..fed64e9b29a 100644 --- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc +++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc @@ -1,18 +1,33 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { test_i.cpp + testC.cpp + testS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { + after += *idl after += *Server Source_Files { testC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2174_Regression/Makefile.am b/TAO/tests/Bug_2174_Regression/Makefile.am index 91b5a217d05..f8debc03ea2 100644 --- a/TAO/tests/Bug_2174_Regression/Makefile.am +++ b/TAO/tests/Bug_2174_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2174_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2174_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -44,9 +40,17 @@ 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) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_2174_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ testC.cpp \ testS.cpp \ test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h server_LDADD = \ @@ -78,27 +78,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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 $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index ff28e59983f..d4c612baee2 100644 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc @@ -1,18 +1,33 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, strategies { + after += *idl Source_Files { Hello.cpp + TestC.cpp + TestS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2183_Regression/Makefile.am b/TAO/tests/Bug_2183_Regression/Makefile.am index f57a9351097..9a30e5737ff 100644 --- a/TAO/tests/Bug_2183_Regression/Makefile.am +++ b/TAO/tests/Bug_2183_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2183_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2183_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -44,9 +40,17 @@ 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) $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2183_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ @@ -79,27 +79,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -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 $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc index 0f6d8164108..8bbb6c81cd3 100644 --- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc +++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc @@ -1,17 +1,31 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, strategies { + after += *idl Source_Files { Hello.cpp + TestC.cpp + TestS.cpp server.cpp } } project(*Client): taoserver, strategies { + after += *idl + after += *Server exename = client Source_Files { Hello.cpp + TestC.cpp + TestS.cpp client.cpp } } diff --git a/TAO/tests/Bug_2186_Regression/Makefile.am b/TAO/tests/Bug_2186_Regression/Makefile.am index f23988a2e8d..0d6be7f42ef 100644 --- a/TAO/tests/Bug_2186_Regression/Makefile.am +++ b/TAO/tests/Bug_2186_Regression/Makefile.am @@ -17,10 +17,37 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2186_Regression_Client.am +## Makefile.Bug_2186_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_2186_Regression_Server.am if BUILD_EXCEPTIONS @@ -47,26 +74,26 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @touch $@ -noinst_PROGRAMS += client +noinst_PROGRAMS += server -client_CPPFLAGS = \ +server_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -client_SOURCES = \ +server_SOURCES = \ Hello.cpp \ TestC.cpp \ TestS.cpp \ - client.cpp \ + server.cpp \ Hello.h \ TestC.h \ TestC.inl \ TestS.h \ TestS.inl -client_LDADD = \ +server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -75,7 +102,7 @@ client_LDADD = \ endif BUILD_EXCEPTIONS -## Makefile.Bug_2186_Regression_Server.am +## Makefile.Bug_2186_Regression_Client.am if BUILD_EXCEPTIONS @@ -102,26 +129,26 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl @touch $@ -noinst_PROGRAMS += server +noinst_PROGRAMS += client -server_CPPFLAGS = \ +client_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) -server_SOURCES = \ +client_SOURCES = \ Hello.cpp \ TestC.cpp \ TestS.cpp \ - server.cpp \ + client.cpp \ Hello.h \ TestC.h \ TestC.inl \ TestS.h \ TestS.inl -server_LDADD = \ +client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Bug_2188_Regression/Makefile.am b/TAO/tests/Bug_2188_Regression/Makefile.am index 25a1c074db0..b584b16863e 100644 --- a/TAO/tests/Bug_2188_Regression/Makefile.am +++ b/TAO/tests/Bug_2188_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Broken_Server.am - -if BUILD_EXCEPTIONS +## Makefile.broken_idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ brokenC.cpp \ brokenC.h \ brokenC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ brokenS.h \ brokenS.inl -CLEANFILES += \ +CLEANFILES = \ broken-stamp \ brokenC.cpp \ brokenC.h \ @@ -47,6 +43,14 @@ broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/broken.idl @touch $@ + +noinst_HEADERS = \ + broken.idl + +## Makefile.Broken_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ brokenS.cpp \ broken_i.cpp \ server.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.h \ - brokenS.inl \ broken_i.h server_LDADD = \ @@ -78,27 +78,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - brokenC.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.h \ - brokenS.inl - -CLEANFILES += \ - broken-stamp \ - brokenC.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.h \ - brokenS.inl - -brokenC.cpp brokenC.h brokenC.inl brokenS.h brokenS.inl: broken-stamp - -broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/broken.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ brokenC.cpp \ client.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.h \ - brokenS.inl + broken_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc index 184d57d6c73..dbcd24841bb 100644 --- a/TAO/tests/Bug_2188_Regression/broken.mpc +++ b/TAO/tests/Bug_2188_Regression/broken.mpc @@ -1,20 +1,32 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver { - idlflags += -Sa -St +project(*idl): taoidldefaults { + IDL_Files { + broken.idl + } + custom_only = 1 +} +project(*Server): taoserver { + after += *idl Source_Files { broken_i.cpp + brokenC.cpp + brokenS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server - Source_Files { brokenC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc index 26c4972e1db..adf7dec096c 100644 --- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc +++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc @@ -1,25 +1,33 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} project (*client) : taoclient,anytypecode { - IDL_Files { - Test.idl - } - - Source_Files { - TestC.cpp - client.cpp - } + after += *idl + + Source_Files { + TestC.cpp + client.cpp + } + IDL_Files { + } } project (*server) : taoserver,pi_server { + after += *idl after += *client - IDL_Files { - Test.idl - } - Source_Files { - server.cpp - } + Source_Files { + TestC.cpp + TestS.cpp + server.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2234_Regression/Makefile.am b/TAO/tests/Bug_2234_Regression/Makefile.am index e10b156eaa8..e79c0124f89 100644 --- a/TAO/tests/Bug_2234_Regression/Makefile.am +++ b/TAO/tests/Bug_2234_Regression/Makefile.am @@ -17,34 +17,40 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2234_Regression_Client.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2234_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ + TestS.cpp \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ 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) $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2234_Regression_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -55,11 +61,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ @@ -72,29 +74,6 @@ endif BUILD_EXCEPTIONS 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 += server server_CPPFLAGS = \ @@ -106,11 +85,7 @@ server_CPPFLAGS = \ server_SOURCES = \ TestC.cpp \ TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc index bf8946a0384..e2d0b8a08cc 100644 --- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc +++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc @@ -1,21 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + idlflags += -Gp -Gd -Sa -St + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, iortable { exename = server - idlflags += -Gp -Gd -Sa -St + after += *idl Source_Files { server.cpp + TestC.cpp + TestS.cpp MyInterfaceImpl.cpp } + IDL_Files { + } } project(*Client): taoserver, iortable { exename = client - idlflags += -Gp -Gd -Sa -St + after += *idl after += *Server Source_Files { client.cpp + TestC.cpp + TestS.cpp MyInterfaceImpl.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2289_Regression/Makefile.am b/TAO/tests/Bug_2289_Regression/Makefile.am index 8378354b686..b30d79274cf 100644 --- a/TAO/tests/Bug_2289_Regression/Makefile.am +++ b/TAO/tests/Bug_2289_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2289_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2289_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -44,9 +40,17 @@ 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) -Gp -Gd -Sa -St $(srcdir)/Test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gp -Gd -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2289_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - MyInterfaceImpl.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + MyInterfaceImpl.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ @@ -79,29 +79,6 @@ endif BUILD_EXCEPTIONS 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) -Gp -Gd -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -115,11 +92,7 @@ client_SOURCES = \ TestC.cpp \ TestS.cpp \ client.cpp \ - MyInterfaceImpl.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + MyInterfaceImpl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc index 5fce9b69306..9fdbd894b7d 100644 --- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc +++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc @@ -1,19 +1,32 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, codeset { - idlflags += -Sa -St + after += *idl Source_Files { Hello.cpp + TestC.cpp + TestS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_2328_Regression/Makefile.am b/TAO/tests/Bug_2328_Regression/Makefile.am index c12544c5887..750ba2181eb 100644 --- a/TAO/tests/Bug_2328_Regression/Makefile.am +++ b/TAO/tests/Bug_2328_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2328_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2328_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2328_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ @@ -79,27 +79,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -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 client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc index 723340dc4b8..c01afd5aedd 100644 --- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc +++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc @@ -1,17 +1,31 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + foo.idl + } + custom_only = 1 +} + project(*server): taoserver { - idlflags += -Sa -St + after += *idl Source_Files { + fooC.cpp + fooS.cpp server.cpp } + IDL_Files { + } } project(*client): taoclient { + after += *idl after += *Server Source_Files { fooC.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2349_Regression/Makefile.am b/TAO/tests/Bug_2349_Regression/Makefile.am index c7daf5c0f35..57090314072 100644 --- a/TAO/tests/Bug_2349_Regression/Makefile.am +++ b/TAO/tests/Bug_2349_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2349_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2349_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ fooC.cpp \ fooC.h \ fooC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ fooS.h \ fooS.inl -CLEANFILES += \ +CLEANFILES = \ foo-stamp \ fooC.cpp \ fooC.h \ @@ -47,6 +43,14 @@ foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl @touch $@ + +noinst_HEADERS = \ + foo.idl + +## Makefile.Bug_2349_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -58,11 +62,7 @@ server_CPPFLAGS = \ server_SOURCES = \ fooC.cpp \ fooS.cpp \ - server.cpp \ - fooC.h \ - fooC.inl \ - fooS.h \ - fooS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ @@ -76,27 +76,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.h \ - fooS.inl - -CLEANFILES += \ - foo-stamp \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.h \ - fooS.inl - -fooC.cpp fooC.h fooC.inl fooS.h fooS.inl: foo-stamp - -foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -107,11 +86,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.h \ - fooS.inl + fooC.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc index 27af500c3e6..75a1887f88a 100644 --- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc +++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc @@ -1,21 +1,46 @@ // -*- MPC -*- // $Id$ -project(*Server) : taoserver, messaging { - exename = server +project(*idl): taoidldefaults { idlflags += -Ge 1 -GC + IDL_Files { + Child.idl + Parent.idl + } + custom_only = 1 +} + +project(*Server) : taoserver, messaging { + exename = server + after += *idl Source_Files { server.cpp ChildServant.cpp } + Source_Files { + ChildC.cpp + ChildS.cpp + ParentC.cpp + ParentS.cpp + } + IDL_Files { + } } project(*Client) : taoclient, messaging { exename = client - idlflags += -Ge 1 -GC - + after += *idl + after += *Server Source_Files { client.cpp } + Source_Files { + ChildC.cpp + ChildS.cpp + ParentC.cpp + ParentS.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2429_Regression/Makefile.am b/TAO/tests/Bug_2429_Regression/Makefile.am index 9252cae80bf..6c656078d90 100644 --- a/TAO/tests/Bug_2429_Regression/Makefile.am +++ b/TAO/tests/Bug_2429_Regression/Makefile.am @@ -17,38 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2429_Regression_Client.am +## Makefile.Bug_2429_Regression_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -CLEANFILES += \ - Parent-stamp \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp - -Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -GC $(srcdir)/Parent.idl - @touch $@ - -BUILT_SOURCES += \ +BUILT_SOURCES = \ ChildC.cpp \ ChildC.h \ ChildC.inl \ @@ -56,7 +28,7 @@ BUILT_SOURCES += \ ChildS.h \ ChildS.inl -CLEANFILES += \ +CLEANFILES = \ Child-stamp \ ChildC.cpp \ ChildC.h \ @@ -68,50 +40,9 @@ CLEANFILES += \ 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) -Ge 1 -GC $(srcdir)/Child.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Ge 1 -GC $(srcdir)/Child.idl @touch $@ -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ChildC.cpp \ - ChildS.cpp \ - ParentC.cpp \ - ParentS.cpp \ - client.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.h \ - ChildS.inl \ - ParentC.h \ - ParentC.inl \ - ParentS.h \ - ParentS.inl - -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_2429_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - BUILT_SOURCES += \ ParentC.cpp \ ParentC.h \ @@ -132,31 +63,18 @@ CLEANFILES += \ ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -GC $(srcdir)/Parent.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Ge 1 -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 +noinst_HEADERS = \ + Child.idl \ + Parent.idl -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp +## Makefile.Bug_2429_Regression_Server.am -Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Ge 1 -GC $(srcdir)/Child.idl - @touch $@ +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -173,15 +91,7 @@ server_SOURCES = \ ParentC.cpp \ ParentS.cpp \ server.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.h \ - ChildS.inl \ - ChildServant.h \ - ParentC.h \ - ParentC.inl \ - ParentS.h \ - ParentS.inl + ChildServant.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -196,6 +106,40 @@ server_LDADD = \ endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING +## Makefile.Bug_2429_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 = \ + ChildC.cpp \ + ChildS.cpp \ + ParentC.cpp \ + ParentS.cpp \ + client.cpp \ + ChildServant.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 + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc index 0049fc035e7..1214006b391 100644 --- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc +++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc @@ -1,19 +1,37 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver { +project(*idl): taoidldefaults { idlflags += -St + IDL_Files { + test.idl + } + custom_only = 1 +} + +project(*Server): taoserver { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient { - idlflags += -St + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/Bug_2494_Regression/Makefile.am b/TAO/tests/Bug_2494_Regression/Makefile.am index 17454bbea5d..6d0e5aef61d 100644 --- a/TAO/tests/Bug_2494_Regression/Makefile.am +++ b/TAO/tests/Bug_2494_Regression/Makefile.am @@ -17,14 +17,10 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_2494_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2494_Regression_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -44,9 +40,17 @@ 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) -St $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Bug_2494_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ testC.cpp \ testS.cpp \ test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h \ test_i.inl @@ -79,27 +79,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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 -St $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,8 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h \ + test_i.inl client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ |