diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-14 07:10:12 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-14 07:10:12 +0000 |
| commit | 15b8a2bf46f6d073f105aa6c7d81ad2aff39b464 (patch) | |
| tree | 7aacb02a9548a70182dcfdbc5a0b91dd284f3a31 | |
| parent | cbfcacfe8e7553aa2b5b0e37af4b72b541576161 (diff) | |
| download | ATCD-15b8a2bf46f6d073f105aa6c7d81ad2aff39b464.tar.gz | |
ChangeLogTag: Thu Dec 14 07:01:51 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
20 files changed, 635 insertions, 673 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 82cd22d5465..cd0fa0c8ab1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,7 +1,37 @@ +Thu Dec 14 07:01:51 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/MProfile/Makefile.am: + * tests/MProfile_Connection_Timeout/Makefile.am: + * tests/No_Server_MT_Connect_Test/Makefile.am: + * tests/OBV/Any/Makefile.am: + * tests/OBV/Factory/Makefile.am: + * tests/OBV/Forward/Makefile.am: + * tests/OBV/TC_Alignment/Makefile.am: + * tests/OBV/Truncatable/Makefile.am: + * tests/OBV/ValueBox/Makefile.am: + + Regenerated. + + * tests/MProfile/MProfile.mpc: + * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc: + * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc: + * tests/OBV/Any/OBV_Any.mpc: + * tests/OBV/Factory/OBV_Factory.mpc: + * tests/OBV/Forward/OBV_Forward.mpc: + * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc: + * tests/OBV/Truncatable/OBV_Truncatable.mpc: + * tests/OBV/ValueBox/valuebox.mpc: + + Split out IDL compilation into separate MPC project. + + * tests/IDL_Test/Makefile.am: + + Regenerated. + Wed Dec 13 18:16:28 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/IDL_Test/IDL_Test.mpc: - + Added -GT to all IDL compiler command lines, since generation of tie classes is no longer the default behavior, and we want this test to cover it. Also added a block for @@ -14,7 +44,7 @@ Wed Dec 13 16:49:05 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_operation/arglist.cpp: * TAO_IDL/be/be_visitor_operation/tie_sh.cpp: * TAO_IDL/be_include/be_codegen.h: - + Changed code generation for operation parameters in tie class declarations to omit the parameter name. If this name happened to be "T", some HP compilers would diff --git a/TAO/tests/IDL_Test/Makefile.am b/TAO/tests/IDL_Test/Makefile.am index 606c3c82bcc..b149c212e83 100644 --- a/TAO/tests/IDL_Test/Makefile.am +++ b/TAO/tests/IDL_Test/Makefile.am @@ -30,7 +30,9 @@ BUILT_SOURCES += \ arrayC.inl \ arrayS.cpp \ arrayS.h \ - arrayS.inl + arrayS.inl \ + arrayS_T.cpp \ + arrayS_T.h CLEANFILES += \ array-stamp \ @@ -39,12 +41,14 @@ CLEANFILES += \ arrayC.inl \ arrayS.cpp \ arrayS.h \ - arrayS.inl + arrayS.inl \ + arrayS_T.cpp \ + arrayS_T.h -arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl: array-stamp +arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/array.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl @touch $@ BUILT_SOURCES += \ @@ -53,7 +57,9 @@ BUILT_SOURCES += \ Bug_2577_RegressionC.inl \ Bug_2577_RegressionS.cpp \ Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl + Bug_2577_RegressionS.inl \ + Bug_2577_RegressionS_T.cpp \ + Bug_2577_RegressionS_T.h CLEANFILES += \ Bug_2577_Regression-stamp \ @@ -62,12 +68,14 @@ CLEANFILES += \ Bug_2577_RegressionC.inl \ Bug_2577_RegressionS.cpp \ Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl + Bug_2577_RegressionS.inl \ + Bug_2577_RegressionS_T.cpp \ + Bug_2577_RegressionS_T.h -Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl: Bug_2577_Regression-stamp +Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/Bug_2577_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -76,7 +84,9 @@ BUILT_SOURCES += \ Bug_2582_RegressionC.inl \ Bug_2582_RegressionS.cpp \ Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl + Bug_2582_RegressionS.inl \ + Bug_2582_RegressionS_T.cpp \ + Bug_2582_RegressionS_T.h CLEANFILES += \ Bug_2582_Regression-stamp \ @@ -85,12 +95,14 @@ CLEANFILES += \ Bug_2582_RegressionC.inl \ Bug_2582_RegressionS.cpp \ Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl + Bug_2582_RegressionS.inl \ + Bug_2582_RegressionS_T.cpp \ + Bug_2582_RegressionS_T.h -Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl: Bug_2582_Regression-stamp +Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/Bug_2582_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -99,7 +111,9 @@ BUILT_SOURCES += \ Bug_2583_RegressionC.inl \ Bug_2583_RegressionS.cpp \ Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl + Bug_2583_RegressionS.inl \ + Bug_2583_RegressionS_T.cpp \ + Bug_2583_RegressionS_T.h CLEANFILES += \ Bug_2583_Regression-stamp \ @@ -108,12 +122,14 @@ CLEANFILES += \ Bug_2583_RegressionC.inl \ Bug_2583_RegressionS.cpp \ Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl + Bug_2583_RegressionS.inl \ + Bug_2583_RegressionS_T.cpp \ + Bug_2583_RegressionS_T.h -Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl: Bug_2583_Regression-stamp +Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/Bug_2583_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -122,7 +138,9 @@ BUILT_SOURCES += \ Bug_2616_RegressionC.inl \ Bug_2616_RegressionS.cpp \ Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl + Bug_2616_RegressionS.inl \ + Bug_2616_RegressionS_T.cpp \ + Bug_2616_RegressionS_T.h CLEANFILES += \ Bug_2616_Regression-stamp \ @@ -131,12 +149,14 @@ CLEANFILES += \ Bug_2616_RegressionC.inl \ Bug_2616_RegressionS.cpp \ Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl + Bug_2616_RegressionS.inl \ + Bug_2616_RegressionS_T.cpp \ + Bug_2616_RegressionS_T.h -Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl: Bug_2616_Regression-stamp +Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/Bug_2616_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -145,7 +165,9 @@ BUILT_SOURCES += \ Bug_2619_RegressionC.inl \ Bug_2619_RegressionS.cpp \ Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl + Bug_2619_RegressionS.inl \ + Bug_2619_RegressionS_T.cpp \ + Bug_2619_RegressionS_T.h CLEANFILES += \ Bug_2619_Regression-stamp \ @@ -154,12 +176,14 @@ CLEANFILES += \ Bug_2619_RegressionC.inl \ Bug_2619_RegressionS.cpp \ Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl + Bug_2619_RegressionS.inl \ + Bug_2619_RegressionS_T.cpp \ + Bug_2619_RegressionS_T.h -Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl: Bug_2619_Regression-stamp +Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/Bug_2619_Regression.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl @touch $@ BUILT_SOURCES += \ @@ -168,7 +192,9 @@ BUILT_SOURCES += \ enum_in_structC.inl \ enum_in_structS.cpp \ enum_in_structS.h \ - enum_in_structS.inl + enum_in_structS.inl \ + enum_in_structS_T.cpp \ + enum_in_structS_T.h CLEANFILES += \ enum_in_struct-stamp \ @@ -177,12 +203,14 @@ CLEANFILES += \ enum_in_structC.inl \ enum_in_structS.cpp \ enum_in_structS.h \ - enum_in_structS.inl + enum_in_structS.inl \ + enum_in_structS_T.cpp \ + enum_in_structS_T.h -enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl: enum_in_struct-stamp +enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/enum_in_struct.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl @touch $@ BUILT_SOURCES += \ @@ -191,7 +219,9 @@ BUILT_SOURCES += \ fullC.inl \ fullS.cpp \ fullS.h \ - fullS.inl + fullS.inl \ + fullS_T.cpp \ + fullS_T.h CLEANFILES += \ full-stamp \ @@ -200,12 +230,14 @@ CLEANFILES += \ fullC.inl \ fullS.cpp \ fullS.h \ - fullS.inl + fullS.inl \ + fullS_T.cpp \ + fullS_T.h -fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl: full-stamp +fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/full.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl @touch $@ BUILT_SOURCES += \ @@ -214,7 +246,9 @@ BUILT_SOURCES += \ fwdC.inl \ fwdS.cpp \ fwdS.h \ - fwdS.inl + fwdS.inl \ + fwdS_T.cpp \ + fwdS_T.h CLEANFILES += \ fwd-stamp \ @@ -223,12 +257,14 @@ CLEANFILES += \ fwdC.inl \ fwdS.cpp \ fwdS.h \ - fwdS.inl + fwdS.inl \ + fwdS_T.cpp \ + fwdS_T.h -fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl: fwd-stamp +fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/fwd.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl @touch $@ BUILT_SOURCES += \ @@ -237,7 +273,9 @@ BUILT_SOURCES += \ gperfC.inl \ gperfS.cpp \ gperfS.h \ - gperfS.inl + gperfS.inl \ + gperfS_T.cpp \ + gperfS_T.h CLEANFILES += \ gperf-stamp \ @@ -246,12 +284,14 @@ CLEANFILES += \ gperfC.inl \ gperfS.cpp \ gperfS.h \ - gperfS.inl + gperfS.inl \ + gperfS_T.cpp \ + gperfS_T.h -gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl: gperf-stamp +gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/gperf.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl @touch $@ BUILT_SOURCES += \ @@ -260,7 +300,9 @@ BUILT_SOURCES += \ includingC.inl \ includingS.cpp \ includingS.h \ - includingS.inl + includingS.inl \ + includingS_T.cpp \ + includingS_T.h CLEANFILES += \ including-stamp \ @@ -269,12 +311,14 @@ CLEANFILES += \ includingC.inl \ includingS.cpp \ includingS.h \ - includingS.inl + includingS.inl \ + includingS_T.cpp \ + includingS_T.h -includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl: including-stamp +includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/including.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl @touch $@ BUILT_SOURCES += \ @@ -283,7 +327,9 @@ BUILT_SOURCES += \ interfaceC.inl \ interfaceS.cpp \ interfaceS.h \ - interfaceS.inl + interfaceS.inl \ + interfaceS_T.cpp \ + interfaceS_T.h CLEANFILES += \ interface-stamp \ @@ -292,12 +338,14 @@ CLEANFILES += \ interfaceC.inl \ interfaceS.cpp \ interfaceS.h \ - interfaceS.inl + interfaceS.inl \ + interfaceS_T.cpp \ + interfaceS_T.h -interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl: interface-stamp +interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/interface.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl @touch $@ BUILT_SOURCES += \ @@ -306,7 +354,9 @@ BUILT_SOURCES += \ includedC.inl \ includedS.cpp \ includedS.h \ - includedS.inl + includedS.inl \ + includedS_T.cpp \ + includedS_T.h CLEANFILES += \ included-stamp \ @@ -315,12 +365,14 @@ CLEANFILES += \ includedC.inl \ includedS.cpp \ includedS.h \ - includedS.inl + includedS.inl \ + includedS_T.cpp \ + includedS_T.h -includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp +includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/included.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl @touch $@ BUILT_SOURCES += \ @@ -329,7 +381,9 @@ BUILT_SOURCES += \ unionC.inl \ unionS.cpp \ unionS.h \ - unionS.inl + unionS.inl \ + unionS_T.cpp \ + unionS_T.h CLEANFILES += \ union-stamp \ @@ -338,12 +392,14 @@ CLEANFILES += \ unionC.inl \ unionS.cpp \ unionS.h \ - unionS.inl + unionS.inl \ + unionS_T.cpp \ + unionS_T.h -unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl: union-stamp +unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/union.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl @touch $@ BUILT_SOURCES += \ @@ -352,7 +408,9 @@ BUILT_SOURCES += \ nested_scopeC.inl \ nested_scopeS.cpp \ nested_scopeS.h \ - nested_scopeS.inl + nested_scopeS.inl \ + nested_scopeS_T.cpp \ + nested_scopeS_T.h CLEANFILES += \ nested_scope-stamp \ @@ -361,12 +419,14 @@ CLEANFILES += \ nested_scopeC.inl \ nested_scopeS.cpp \ nested_scopeS.h \ - nested_scopeS.inl + nested_scopeS.inl \ + nested_scopeS_T.cpp \ + nested_scopeS_T.h -nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl: nested_scope-stamp +nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/nested_scope.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl @touch $@ BUILT_SOURCES += \ @@ -375,7 +435,9 @@ BUILT_SOURCES += \ paramsC.inl \ paramsS.cpp \ paramsS.h \ - paramsS.inl + paramsS.inl \ + paramsS_T.cpp \ + paramsS_T.h CLEANFILES += \ params-stamp \ @@ -384,12 +446,14 @@ CLEANFILES += \ paramsC.inl \ paramsS.cpp \ paramsS.h \ - paramsS.inl + paramsS.inl \ + paramsS_T.cpp \ + paramsS_T.h -paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl: params-stamp +paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/params.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl @touch $@ BUILT_SOURCES += \ @@ -398,7 +462,9 @@ BUILT_SOURCES += \ reopened_modulesC.inl \ reopened_modulesS.cpp \ reopened_modulesS.h \ - reopened_modulesS.inl + reopened_modulesS.inl \ + reopened_modulesS_T.cpp \ + reopened_modulesS_T.h CLEANFILES += \ reopened_modules-stamp \ @@ -407,12 +473,14 @@ CLEANFILES += \ reopened_modulesC.inl \ reopened_modulesS.cpp \ reopened_modulesS.h \ - reopened_modulesS.inl + reopened_modulesS.inl \ + reopened_modulesS_T.cpp \ + reopened_modulesS_T.h -reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl: reopened_modules-stamp +reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/reopened_modules.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl @touch $@ BUILT_SOURCES += \ @@ -421,7 +489,9 @@ BUILT_SOURCES += \ sequenceC.inl \ sequenceS.cpp \ sequenceS.h \ - sequenceS.inl + sequenceS.inl \ + sequenceS_T.cpp \ + sequenceS_T.h CLEANFILES += \ sequence-stamp \ @@ -430,12 +500,14 @@ CLEANFILES += \ sequenceC.inl \ sequenceS.cpp \ sequenceS.h \ - sequenceS.inl + sequenceS.inl \ + sequenceS_T.cpp \ + sequenceS_T.h -sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl: sequence-stamp +sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/sequence.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl @touch $@ BUILT_SOURCES += \ @@ -444,7 +516,9 @@ BUILT_SOURCES += \ reopen_include1C.inl \ reopen_include1S.cpp \ reopen_include1S.h \ - reopen_include1S.inl + reopen_include1S.inl \ + reopen_include1S_T.cpp \ + reopen_include1S_T.h CLEANFILES += \ reopen_include1-stamp \ @@ -453,12 +527,14 @@ CLEANFILES += \ reopen_include1C.inl \ reopen_include1S.cpp \ reopen_include1S.h \ - reopen_include1S.inl + reopen_include1S.inl \ + reopen_include1S_T.cpp \ + reopen_include1S_T.h -reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl: reopen_include1-stamp +reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/reopen_include1.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl @touch $@ BUILT_SOURCES += \ @@ -467,7 +543,9 @@ BUILT_SOURCES += \ reopen_include2C.inl \ reopen_include2S.cpp \ reopen_include2S.h \ - reopen_include2S.inl + reopen_include2S.inl \ + reopen_include2S_T.cpp \ + reopen_include2S_T.h CLEANFILES += \ reopen_include2-stamp \ @@ -476,12 +554,14 @@ CLEANFILES += \ reopen_include2C.inl \ reopen_include2S.cpp \ reopen_include2S.h \ - reopen_include2S.inl + reopen_include2S.inl \ + reopen_include2S_T.cpp \ + reopen_include2S_T.h -reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl: reopen_include2-stamp +reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/reopen_include2.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl @touch $@ BUILT_SOURCES += \ @@ -490,7 +570,9 @@ BUILT_SOURCES += \ typeprefixC.inl \ typeprefixS.cpp \ typeprefixS.h \ - typeprefixS.inl + typeprefixS.inl \ + typeprefixS_T.cpp \ + typeprefixS_T.h CLEANFILES += \ typeprefix-stamp \ @@ -499,12 +581,14 @@ CLEANFILES += \ typeprefixC.inl \ typeprefixS.cpp \ typeprefixS.h \ - typeprefixS.inl + typeprefixS.inl \ + typeprefixS_T.cpp \ + typeprefixS_T.h -typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl: typeprefix-stamp +typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd $(srcdir)/typeprefix.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl @touch $@ BUILT_SOURCES += \ @@ -515,7 +599,9 @@ BUILT_SOURCES += \ anonymousC.inl \ anonymousS.cpp \ anonymousS.h \ - anonymousS.inl + anonymousS.inl \ + anonymousS_T.cpp \ + anonymousS_T.h CLEANFILES += \ anonymous-stamp \ @@ -526,12 +612,14 @@ CLEANFILES += \ anonymousC.inl \ anonymousS.cpp \ anonymousS.h \ - anonymousS.inl + anonymousS.inl \ + anonymousS_T.cpp \ + anonymousS_T.h -anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl: anonymous-stamp +anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/anonymous.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/anonymous.idl @touch $@ BUILT_SOURCES += \ @@ -542,7 +630,9 @@ BUILT_SOURCES += \ constantsC.inl \ constantsS.cpp \ constantsS.h \ - constantsS.inl + constantsS.inl \ + constantsS_T.cpp \ + constantsS_T.h CLEANFILES += \ constants-stamp \ @@ -553,12 +643,14 @@ CLEANFILES += \ constantsC.inl \ constantsS.cpp \ constantsS.h \ - constantsS.inl + constantsS.inl \ + constantsS_T.cpp \ + constantsS_T.h -constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl: constants-stamp +constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/constants.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/constants.idl @touch $@ BUILT_SOURCES += \ @@ -569,7 +661,9 @@ BUILT_SOURCES += \ generic_objectC.inl \ generic_objectS.cpp \ generic_objectS.h \ - generic_objectS.inl + generic_objectS.inl \ + generic_objectS_T.cpp \ + generic_objectS_T.h CLEANFILES += \ generic_object-stamp \ @@ -580,12 +674,14 @@ CLEANFILES += \ generic_objectC.inl \ generic_objectS.cpp \ generic_objectS.h \ - generic_objectS.inl + generic_objectS.inl \ + generic_objectS_T.cpp \ + generic_objectS_T.h -generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl: generic_object-stamp +generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/generic_object.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/generic_object.idl @touch $@ BUILT_SOURCES += \ @@ -596,7 +692,9 @@ BUILT_SOURCES += \ keywordsC.inl \ keywordsS.cpp \ keywordsS.h \ - keywordsS.inl + keywordsS.inl \ + keywordsS_T.cpp \ + keywordsS_T.h CLEANFILES += \ keywords-stamp \ @@ -607,12 +705,14 @@ CLEANFILES += \ keywordsC.inl \ keywordsS.cpp \ keywordsS.h \ - keywordsS.inl + keywordsS.inl \ + keywordsS_T.cpp \ + keywordsS_T.h -keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl: keywords-stamp +keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/keywords.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/keywords.idl @touch $@ BUILT_SOURCES += \ @@ -623,7 +723,9 @@ BUILT_SOURCES += \ pragmaC.inl \ pragmaS.cpp \ pragmaS.h \ - pragmaS.inl + pragmaS.inl \ + pragmaS_T.cpp \ + pragmaS_T.h CLEANFILES += \ pragma-stamp \ @@ -634,12 +736,14 @@ CLEANFILES += \ pragmaC.inl \ pragmaS.cpp \ pragmaS.h \ - pragmaS.inl + pragmaS.inl \ + pragmaS_T.cpp \ + pragmaS_T.h -pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl: pragma-stamp +pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/pragma.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/pragma.idl @touch $@ BUILT_SOURCES += \ @@ -650,7 +754,9 @@ BUILT_SOURCES += \ repo_id_modC.inl \ repo_id_modS.cpp \ repo_id_modS.h \ - repo_id_modS.inl + repo_id_modS.inl \ + repo_id_modS_T.cpp \ + repo_id_modS_T.h CLEANFILES += \ repo_id_mod-stamp \ @@ -661,12 +767,14 @@ CLEANFILES += \ repo_id_modC.inl \ repo_id_modS.cpp \ repo_id_modS.h \ - repo_id_modS.inl + repo_id_modS.inl \ + repo_id_modS_T.cpp \ + repo_id_modS_T.h -repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl: repo_id_mod-stamp +repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/repo_id_mod.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/repo_id_mod.idl @touch $@ BUILT_SOURCES += \ @@ -677,7 +785,9 @@ BUILT_SOURCES += \ typedefC.inl \ typedefS.cpp \ typedefS.h \ - typedefS.inl + typedefS.inl \ + typedefS_T.cpp \ + typedefS_T.h CLEANFILES += \ typedef-stamp \ @@ -688,12 +798,14 @@ CLEANFILES += \ typedefC.inl \ typedefS.cpp \ typedefS.h \ - typedefS.inl + typedefS.inl \ + typedefS_T.cpp \ + typedefS_T.h -typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl: typedef-stamp +typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/typedef.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/typedef.idl @touch $@ BUILT_SOURCES += \ @@ -704,7 +816,9 @@ BUILT_SOURCES += \ valuetypeC.inl \ valuetypeS.cpp \ valuetypeS.h \ - valuetypeS.inl + valuetypeS.inl \ + valuetypeS_T.cpp \ + valuetypeS_T.h CLEANFILES += \ valuetype-stamp \ @@ -715,12 +829,14 @@ CLEANFILES += \ valuetypeC.inl \ valuetypeS.cpp \ valuetypeS.h \ - valuetypeS.inl + valuetypeS.inl \ + valuetypeS_T.cpp \ + valuetypeS_T.h -valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl: valuetype-stamp +valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/valuetype.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/valuetype.idl @touch $@ BUILT_SOURCES += \ @@ -731,7 +847,9 @@ BUILT_SOURCES += \ array_onlyC.inl \ array_onlyS.cpp \ array_onlyS.h \ - array_onlyS.inl + array_onlyS.inl \ + array_onlyS_T.cpp \ + array_onlyS_T.h CLEANFILES += \ array_only-stamp \ @@ -742,12 +860,14 @@ CLEANFILES += \ array_onlyC.inl \ array_onlyS.cpp \ array_onlyS.h \ - array_onlyS.inl + array_onlyS.inl \ + array_onlyS_T.cpp \ + array_onlyS_T.h -array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl: array_only-stamp +array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA $(srcdir)/array_only.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GA -GT $(srcdir)/array_only.idl @touch $@ noinst_PROGRAMS = main @@ -833,131 +953,161 @@ main_SOURCES = \ Bug_2577_RegressionC.inl \ Bug_2577_RegressionS.h \ Bug_2577_RegressionS.inl \ + Bug_2577_RegressionS_T.h \ Bug_2582_RegressionC.h \ Bug_2582_RegressionC.inl \ Bug_2582_RegressionS.h \ Bug_2582_RegressionS.inl \ + Bug_2582_RegressionS_T.h \ Bug_2583_RegressionC.h \ Bug_2583_RegressionC.inl \ Bug_2583_RegressionS.h \ Bug_2583_RegressionS.inl \ + Bug_2583_RegressionS_T.h \ Bug_2616_RegressionC.h \ Bug_2616_RegressionC.inl \ Bug_2616_RegressionS.h \ Bug_2616_RegressionS.inl \ + Bug_2616_RegressionS_T.h \ Bug_2619_RegressionC.h \ Bug_2619_RegressionC.inl \ Bug_2619_RegressionS.h \ Bug_2619_RegressionS.inl \ + Bug_2619_RegressionS_T.h \ anonymousA.h \ anonymousC.h \ anonymousC.inl \ anonymousS.h \ anonymousS.inl \ + anonymousS_T.h \ arrayC.h \ arrayC.inl \ arrayS.h \ arrayS.inl \ + arrayS_T.h \ array_onlyA.h \ array_onlyC.h \ array_onlyC.inl \ array_onlyS.h \ array_onlyS.inl \ + array_onlyS_T.h \ constantsA.h \ constantsC.h \ constantsC.inl \ constantsS.h \ constantsS.inl \ + constantsS_T.h \ enum_in_structC.h \ enum_in_structC.inl \ enum_in_structS.h \ enum_in_structS.inl \ + enum_in_structS_T.h \ fullC.h \ fullC.inl \ fullS.h \ fullS.inl \ + fullS_T.h \ fwdC.h \ fwdC.inl \ fwdS.h \ fwdS.inl \ + fwdS_T.h \ generic_objectA.h \ generic_objectC.h \ generic_objectC.inl \ generic_objectS.h \ generic_objectS.inl \ + generic_objectS_T.h \ gperfC.h \ gperfC.inl \ gperfS.h \ gperfS.inl \ + gperfS_T.h \ includedC.h \ includedC.inl \ includedS.h \ includedS.inl \ + includedS_T.h \ includingC.h \ includingC.inl \ includingS.h \ includingS.inl \ + includingS_T.h \ interfaceC.h \ interfaceC.inl \ interfaceS.h \ interfaceS.inl \ + interfaceS_T.h \ keywordsA.h \ keywordsC.h \ keywordsC.inl \ keywordsS.h \ keywordsS.inl \ + keywordsS_T.h \ nested_scopeC.h \ nested_scopeC.inl \ nested_scopeS.h \ nested_scopeS.inl \ + nested_scopeS_T.h \ paramsC.h \ paramsC.inl \ paramsS.h \ paramsS.inl \ + paramsS_T.h \ pragmaA.h \ pragmaC.h \ pragmaC.inl \ pragmaS.h \ pragmaS.inl \ + pragmaS_T.h \ reopen_include1C.h \ reopen_include1C.inl \ reopen_include1S.h \ reopen_include1S.inl \ + reopen_include1S_T.h \ reopen_include2C.h \ reopen_include2C.inl \ reopen_include2S.h \ reopen_include2S.inl \ + reopen_include2S_T.h \ reopened_modulesC.h \ reopened_modulesC.inl \ reopened_modulesS.h \ reopened_modulesS.inl \ + reopened_modulesS_T.h \ repo_id_modA.h \ repo_id_modC.h \ repo_id_modC.inl \ repo_id_modS.h \ repo_id_modS.inl \ + repo_id_modS_T.h \ sequenceC.h \ sequenceC.inl \ sequenceS.h \ sequenceS.inl \ + sequenceS_T.h \ typedefA.h \ typedefC.h \ typedefC.inl \ typedefS.h \ typedefS.inl \ + typedefS_T.h \ typeprefixC.h \ typeprefixC.inl \ typeprefixS.h \ typeprefixS.inl \ + typeprefixS_T.h \ unionC.h \ unionC.inl \ unionS.h \ unionS.inl \ + unionS_T.h \ valuetypeA.h \ valuetypeC.h \ valuetypeC.inl \ valuetypeS.h \ - valuetypeS.inl + valuetypeS.inl \ + valuetypeS_T.h main_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc index e48d767fd5c..4800defda95 100644 --- a/TAO/tests/MProfile/MProfile.mpc +++ b/TAO/tests/MProfile/MProfile.mpc @@ -1,17 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver, iormanip { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient, iormanip { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/MProfile/Makefile.am b/TAO/tests/MProfile/Makefile.am index dea8d89fff2..8c70614e1cf 100644 --- a/TAO/tests/MProfile/Makefile.am +++ b/TAO/tests/MProfile/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.MProfile_Server.am - -if BUILD_EXCEPTIONS +## Makefile.MProfile_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.MProfile_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 = \ @@ -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,8 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + testS.cpp \ + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc index e4abfd734d6..57409e95046 100644 --- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc +++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc @@ -1,17 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver, messaging, iormanip { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient, messaging, iormanip { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/MProfile_Connection_Timeout/Makefile.am b/TAO/tests/MProfile_Connection_Timeout/Makefile.am index 8fa9803e91b..70c21ec3f2d 100644 --- a/TAO/tests/MProfile_Connection_Timeout/Makefile.am +++ b/TAO/tests/MProfile_Connection_Timeout/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.MProfile_Connection_Timeout_Server.am +## Makefile.MProfile_Connection_Timeout_Idl.am -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -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.MProfile_Connection_Timeout_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,10 +65,6 @@ server_SOURCES = \ testC.cpp \ testS.cpp \ test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h server_LDADD = \ @@ -86,27 +86,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING 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 = \ @@ -118,10 +97,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_IORManip.la \ diff --git a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am b/TAO/tests/No_Server_MT_Connect_Test/Makefile.am index 13672dc344f..20e6b9497ba 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/Makefile.am +++ b/TAO/tests/No_Server_MT_Connect_Test/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.No_Server_Connect_Test_Server.am - -if BUILD_EXCEPTIONS +## Makefile.No_Server_Connect_Test_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.No_Server_Connect_Test_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/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc index bfb96e8b536..aa28b25107f 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc +++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc @@ -1,18 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + 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, anytypecode { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/OBV/Any/Makefile.am b/TAO/tests/OBV/Any/Makefile.am index f35115f7905..98f76fdb8e9 100644 --- a/TAO/tests/OBV/Any/Makefile.am +++ b/TAO/tests/OBV/Any/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.OBV_Any_Server.am - -if BUILD_EXCEPTIONS +## Makefile.OBV_Any_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ AnyC.cpp \ AnyC.h \ AnyC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ AnyS.h \ AnyS.inl -CLEANFILES += \ +CLEANFILES = \ Any-stamp \ AnyC.cpp \ AnyC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ AnyC.cpp AnyC.h AnyC.inl AnyS.cpp AnyS.h AnyS.inl: Any-stamp Any-stamp: $(srcdir)/Any.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Any.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Any.idl @touch $@ + +noinst_HEADERS = \ + Any.idl + +## Makefile.OBV_Any_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ AnyS.cpp \ AnyS_impl.cpp \ server.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.h \ - AnyS.inl \ AnyS_impl.h server_LDADD = \ @@ -79,27 +79,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - AnyC.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.h \ - AnyS.inl - -CLEANFILES += \ - Any-stamp \ - AnyC.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.h \ - AnyS.inl - -AnyC.cpp AnyC.h AnyC.inl AnyS.h AnyS.inl: Any-stamp - -Any-stamp: $(srcdir)/Any.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Any.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ AnyC.cpp \ client.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.h \ - AnyS.inl + AnyS_impl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc index 62083fb37f5..b62d2cc4ae9 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -1,17 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Any.idl + } + custom_only = 1 +} + project(*Server): taoexe, portableserver, valuetype { + after += *idl Source_Files { AnyS_impl.cpp server.cpp } + Source_Files { + AnyC.cpp + AnyS.cpp + } + IDL_Files { + } } project(*Client): taoexe, valuetype { + after += *idl after += *Server Source_Files { - AnyC.cpp client.cpp } + Source_Files { + AnyC.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/OBV/Factory/Makefile.am b/TAO/tests/OBV/Factory/Makefile.am index 0bec0fe9c74..099308ade00 100644 --- a/TAO/tests/OBV/Factory/Makefile.am +++ b/TAO/tests/OBV/Factory/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.OBV_Factory_Server.am - -if BUILD_EXCEPTIONS +## Makefile.OBV_Factory_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ FactoryC.cpp \ FactoryC.h \ FactoryC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ FactoryS.h \ FactoryS.inl -CLEANFILES += \ +CLEANFILES = \ Factory-stamp \ FactoryC.cpp \ FactoryC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ FactoryC.cpp FactoryC.h FactoryC.inl FactoryS.cpp FactoryS.h FactoryS.inl: Factory-stamp Factory-stamp: $(srcdir)/Factory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Factory.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Factory.idl @touch $@ + +noinst_HEADERS = \ + Factory.idl + +## Makefile.OBV_Factory_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -61,11 +65,7 @@ server_SOURCES = \ FactoryS.cpp \ FactoryS_impl.cpp \ server.cpp \ - FactoryC.h \ - FactoryC.inl \ FactoryC_impl.h \ - FactoryS.h \ - FactoryS.inl \ FactoryS_impl.h server_LDADD = \ @@ -81,27 +81,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - FactoryC.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryS.h \ - FactoryS.inl - -CLEANFILES += \ - Factory-stamp \ - FactoryC.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryS.h \ - FactoryS.inl - -FactoryC.cpp FactoryC.h FactoryC.inl FactoryS.h FactoryS.inl: Factory-stamp - -Factory-stamp: $(srcdir)/Factory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Factory.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -114,11 +93,7 @@ client_SOURCES = \ FactoryC.cpp \ FactoryC_impl.cpp \ client.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryC_impl.h \ - FactoryS.h \ - FactoryS.inl + FactoryC_impl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc index e257b945987..7e17af5a88a 100644 --- a/TAO/tests/OBV/Factory/OBV_Factory.mpc +++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc @@ -1,20 +1,38 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Factory.idl + } + custom_only = 1 +} + project(*Server): taoserver, valuetype { + after += *idl Source_Files { FactoryC_impl.cpp FactoryS_impl.cpp server.cpp } + Source_Files { + FactoryC.cpp + FactoryS.cpp + } + IDL_Files { + } } project(*Client): taoclient, valuetype { + after += *idl after += *Server Source_Files { - FactoryC.cpp FactoryC_impl.cpp client.cpp } + Source_Files { + FactoryC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/OBV/Forward/Makefile.am b/TAO/tests/OBV/Forward/Makefile.am index 489eb0f32a8..ea902272700 100644 --- a/TAO/tests/OBV/Forward/Makefile.am +++ b/TAO/tests/OBV/Forward/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.OBV_Forward_Server.am - -if BUILD_EXCEPTIONS +## Makefile.OBV_Forward_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ TreeBaseC.cpp \ TreeBaseC.h \ TreeBaseC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ TreeBaseS.h \ TreeBaseS.inl -CLEANFILES += \ +CLEANFILES = \ TreeBase-stamp \ TreeBaseC.cpp \ TreeBaseC.h \ @@ -44,7 +40,7 @@ CLEANFILES += \ TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TreeBase.idl @touch $@ BUILT_SOURCES += \ @@ -67,7 +63,7 @@ CLEANFILES += \ TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TreeController.idl @touch $@ BUILT_SOURCES += \ @@ -90,9 +86,19 @@ CLEANFILES += \ 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 + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TreeNode.idl @touch $@ + +noinst_HEADERS = \ + TreeBase.idl \ + TreeController.idl \ + TreeNode.idl + +## Makefile.OBV_Forward_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -110,19 +116,7 @@ server_SOURCES = \ TreeNodeC.cpp \ TreeNodeS.cpp \ server.cpp \ - Test_impl.h \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.h \ - TreeBaseS.inl \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.h \ - TreeControllerS.inl \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.h \ - TreeNodeS.inl + Test_impl.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -137,69 +131,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.h \ - TreeControllerS.inl - -CLEANFILES += \ - TreeController-stamp \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.h \ - TreeControllerS.inl - -TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.h TreeControllerS.inl: TreeController-stamp - -TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl - @touch $@ - -BUILT_SOURCES += \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.h \ - TreeBaseS.inl - -CLEANFILES += \ - TreeBase-stamp \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.h \ - TreeBaseS.inl - -TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.h TreeBaseS.inl: TreeBase-stamp - -TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl - @touch $@ - -BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -213,18 +144,7 @@ client_SOURCES = \ TreeControllerC.cpp \ TreeNodeC.cpp \ client.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.h \ - TreeBaseS.inl \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.h \ - TreeControllerS.inl \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.h \ - TreeNodeS.inl + Test_impl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc index ee6e2623910..231a169eab6 100644 --- a/TAO/tests/OBV/Forward/OBV_Forward.mpc +++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc @@ -1,25 +1,44 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, valuetype { +project(*idl): taoidldefaults { IDL_Files { TreeBase.idl TreeController.idl TreeNode.idl } + custom_only = 1 +} + +project(*Server): taoserver, valuetype { + after += *idl Source_Files { Test_impl.cpp server.cpp } + Source_Files { + TreeBaseC.cpp + TreeBaseS.cpp + TreeControllerC.cpp + TreeControllerS.cpp + TreeNodeC.cpp + TreeNodeS.cpp + } + IDL_Files { + } } project(*Client): taoclient, valuetype { + after += *idl after += *Server Source_Files { + client.cpp + } + Source_Files { TreeBaseC.cpp TreeControllerC.cpp TreeNodeC.cpp - client.cpp + } + IDL_Files { } } - diff --git a/TAO/tests/OBV/TC_Alignment/Makefile.am b/TAO/tests/OBV/TC_Alignment/Makefile.am index bca0965af2b..f8c18499f3e 100644 --- a/TAO/tests/OBV/TC_Alignment/Makefile.am +++ b/TAO/tests/OBV/TC_Alignment/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.OBV_TC_Alignment_Server.am - -if BUILD_EXCEPTIONS +## Makefile.OBV_TC_Alignment_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.OBV_TC_Alignment_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 = \ @@ -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 = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc index f9e3d32dc18..ca8a8ce1b81 100644 --- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc +++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc @@ -1,20 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver, valuetype { + after += *idl Source_Files { - testS.cpp - testC.cpp test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient, valuetype { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } - diff --git a/TAO/tests/OBV/Truncatable/Makefile.am b/TAO/tests/OBV/Truncatable/Makefile.am index c2424c33bd5..d52f038a6e9 100644 --- a/TAO/tests/OBV/Truncatable/Makefile.am +++ b/TAO/tests/OBV/Truncatable/Makefile.am @@ -17,12 +17,31 @@ 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.OBV_Truncatable_Server.am +## Makefile.OBV_Truncatable_Idl.am -if BUILD_EXCEPTIONS +BUILT_SOURCES = \ + ExtraC.cpp \ + ExtraC.h \ + ExtraC.inl \ + ExtraS.cpp \ + ExtraS.h \ + ExtraS.inl + +CLEANFILES = \ + Extra-stamp \ + ExtraC.cpp \ + ExtraC.h \ + ExtraC.inl \ + ExtraS.cpp \ + ExtraS.h \ + ExtraS.inl + +ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.cpp ExtraS.h ExtraS.inl: Extra-stamp + +Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Extra.idl + @touch $@ BUILT_SOURCES += \ TruncatableC.cpp \ @@ -44,31 +63,17 @@ CLEANFILES += \ TruncatableC.cpp TruncatableC.h TruncatableC.inl TruncatableS.cpp TruncatableS.h TruncatableS.inl: Truncatable-stamp Truncatable-stamp: $(srcdir)/Truncatable.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Truncatable.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Truncatable.idl @touch $@ -BUILT_SOURCES += \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.cpp \ - ExtraS.h \ - ExtraS.inl -CLEANFILES += \ - Extra-stamp \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.cpp \ - ExtraS.h \ - ExtraS.inl +noinst_HEADERS = \ + Extra.idl \ + Truncatable.idl -ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.cpp ExtraS.h ExtraS.inl: Extra-stamp +## Makefile.OBV_Truncatable_Server.am -Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Extra.idl - @touch $@ +if BUILD_EXCEPTIONS noinst_PROGRAMS += server @@ -85,14 +90,6 @@ server_SOURCES = \ TruncatableS.cpp \ TruncatableS_impl.cpp \ server.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.h \ - ExtraS.inl \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.h \ - TruncatableS.inl \ TruncatableS_impl.h server_LDADD = \ @@ -108,48 +105,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TruncatableC.cpp \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.h \ - TruncatableS.inl - -CLEANFILES += \ - Truncatable-stamp \ - TruncatableC.cpp \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.h \ - TruncatableS.inl - -TruncatableC.cpp TruncatableC.h TruncatableC.inl TruncatableS.h TruncatableS.inl: Truncatable-stamp - -Truncatable-stamp: $(srcdir)/Truncatable.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Truncatable.idl - @touch $@ - -BUILT_SOURCES += \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.h \ - ExtraS.inl - -CLEANFILES += \ - Extra-stamp \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.h \ - ExtraS.inl - -ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.h ExtraS.inl: Extra-stamp - -Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Extra.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -162,14 +117,7 @@ client_SOURCES = \ ExtraC.cpp \ TruncatableC.cpp \ client.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.h \ - ExtraS.inl \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.h \ - TruncatableS.inl + TruncatableS_impl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc index 1dbf29bc7f6..65335b16213 100644 --- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc +++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc @@ -1,18 +1,40 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Extra.idl + Truncatable.idl + } + custom_only = 1 +} + project(*Server): taoexe, portableserver, valuetype { + after += *idl Source_Files { TruncatableS_impl.cpp server.cpp } + Source_Files { + ExtraC.cpp + ExtraS.cpp + TruncatableC.cpp + TruncatableS.cpp + } + IDL_Files { + } } project(*Client): taoexe, valuetype { + after += *idl after += *Server Source_Files { + client.cpp + } + Source_Files { ExtraC.cpp TruncatableC.cpp - client.cpp + } + IDL_Files { } } diff --git a/TAO/tests/OBV/ValueBox/Makefile.am b/TAO/tests/OBV/ValueBox/Makefile.am index 780443ef123..cef314c243e 100644 --- a/TAO/tests/OBV/ValueBox/Makefile.am +++ b/TAO/tests/OBV/ValueBox/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.Valuebox_Server.am - -if BUILD_EXCEPTIONS +## Makefile.valuebox_idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ vb_basicC.cpp \ vb_basicC.h \ vb_basicC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ vb_basicS.h \ vb_basicS.inl -CLEANFILES += \ +CLEANFILES = \ vb_basic-stamp \ vb_basicC.cpp \ vb_basicC.h \ @@ -44,7 +40,7 @@ CLEANFILES += \ vb_basicC.cpp vb_basicC.h vb_basicC.inl vb_basicS.cpp vb_basicS.h vb_basicS.inl: vb_basic-stamp vb_basic-stamp: $(srcdir)/vb_basic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_basic.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/vb_basic.idl @touch $@ BUILT_SOURCES += \ @@ -67,7 +63,7 @@ CLEANFILES += \ vb_structC.cpp vb_structC.h vb_structC.inl vb_structS.cpp vb_structS.h vb_structS.inl: vb_struct-stamp vb_struct-stamp: $(srcdir)/vb_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_struct.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/vb_struct.idl @touch $@ BUILT_SOURCES += \ @@ -90,7 +86,7 @@ CLEANFILES += \ vb_unionC.cpp vb_unionC.h vb_unionC.inl vb_unionS.cpp vb_unionS.h vb_unionS.inl: vb_union-stamp vb_union-stamp: $(srcdir)/vb_union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_union.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/vb_union.idl @touch $@ BUILT_SOURCES += \ @@ -113,9 +109,20 @@ CLEANFILES += \ valueboxC.cpp valueboxC.h valueboxC.inl valueboxS.cpp valueboxS.h valueboxS.inl: valuebox-stamp valuebox-stamp: $(srcdir)/valuebox.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/valuebox.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/valuebox.idl @touch $@ + +noinst_HEADERS = \ + valuebox.idl \ + vb_basic.idl \ + vb_struct.idl \ + vb_union.idl + +## Makefile.Valuebox_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -135,23 +142,7 @@ server_SOURCES = \ vb_structS.cpp \ vb_unionC.cpp \ vb_unionS.cpp \ - Test_impl.h \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.h \ - valueboxS.inl \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.h \ - vb_basicS.inl \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.h \ - vb_structS.inl \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.h \ - vb_unionS.inl + Test_impl.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -166,90 +157,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - vb_basicC.cpp \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.h \ - vb_basicS.inl - -CLEANFILES += \ - vb_basic-stamp \ - vb_basicC.cpp \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.h \ - vb_basicS.inl - -vb_basicC.cpp vb_basicC.h vb_basicC.inl vb_basicS.h vb_basicS.inl: vb_basic-stamp - -vb_basic-stamp: $(srcdir)/vb_basic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_basic.idl - @touch $@ - -BUILT_SOURCES += \ - vb_structC.cpp \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.h \ - vb_structS.inl - -CLEANFILES += \ - vb_struct-stamp \ - vb_structC.cpp \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.h \ - vb_structS.inl - -vb_structC.cpp vb_structC.h vb_structC.inl vb_structS.h vb_structS.inl: vb_struct-stamp - -vb_struct-stamp: $(srcdir)/vb_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_struct.idl - @touch $@ - -BUILT_SOURCES += \ - vb_unionC.cpp \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.h \ - vb_unionS.inl - -CLEANFILES += \ - vb_union-stamp \ - vb_unionC.cpp \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.h \ - vb_unionS.inl - -vb_unionC.cpp vb_unionC.h vb_unionC.inl vb_unionS.h vb_unionS.inl: vb_union-stamp - -vb_union-stamp: $(srcdir)/vb_union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_union.idl - @touch $@ - -BUILT_SOURCES += \ - valueboxC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.h \ - valueboxS.inl - -CLEANFILES += \ - valuebox-stamp \ - valueboxC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.h \ - valueboxS.inl - -valueboxC.cpp valueboxC.h valueboxC.inl valueboxS.h valueboxS.inl: valuebox-stamp - -valuebox-stamp: $(srcdir)/valuebox.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/valuebox.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -264,22 +171,7 @@ client_SOURCES = \ vb_basicC.cpp \ vb_structC.cpp \ vb_unionC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.h \ - valueboxS.inl \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.h \ - vb_basicS.inl \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.h \ - vb_structS.inl \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.h \ - vb_unionS.inl + Test_impl.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc index 64145b1880f..5ddfd8a99c9 100644 --- a/TAO/tests/OBV/ValueBox/valuebox.mpc +++ b/TAO/tests/OBV/ValueBox/valuebox.mpc @@ -1,13 +1,22 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, valuetype { +project(*idl): taoidldefaults { IDL_Files { vb_basic.idl vb_struct.idl vb_union.idl valuebox.idl } + custom_only = 1 +} + +project(*Server): taoserver, valuetype { + after += *idl + Source_Files { + Test_impl.cpp + server.cpp + } Source_Files { vb_basicC.cpp vb_basicS.cpp @@ -17,18 +26,23 @@ project(*Server): taoserver, valuetype { vb_unionS.cpp valueboxC.cpp valueboxS.cpp - Test_impl.cpp - server.cpp + } + IDL_Files { } } project(*Client): taoclient, valuetype { + after += *idl after += *Server Source_Files { + client.cpp + } + Source_Files { vb_basicC.cpp vb_structC.cpp vb_unionC.cpp valueboxC.cpp - client.cpp + } + IDL_Files { } } |