diff options
117 files changed, 286 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 85c7997584f..ceda8de9eed 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,131 @@ +Thu Dec 1 18:10:48 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tests/AMH_Exceptions/AMH_Exceptions.mpc: + * tests/AMH_Oneway/AMH_Oneway.mpc: + * tests/AMI_Buffering/AMI_Buffering.mpc: + * tests/Abstract_Interface/Abstract_Interface.mpc: + * tests/Any/Recursive/RecursiveHello.mpc: + * tests/BiDirectional/BiDirectional.mpc: + * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc: + * tests/Big_AMI/Big_AMI.mpc: + * tests/Big_Oneways/Big_Oneways.mpc: + * tests/Big_Reply/Big_Reply.mpc: + * tests/Big_Request_Muxing/Big_Request_Muxing.mpc: + * tests/Big_Twoways/Big_Twoways.mpc: + * tests/Blocking_Sync_None/Blocking_Sync_None.mpc: + * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc: + * tests/Bug_1269_Regression/Bug_1269_Regression.mpc: + * tests/Bug_1270_Regression/Bug_1270_Regression.mpc: + * tests/Bug_1330_Regression/Bug_1330_Regression.mpc: + * tests/Bug_1361_Regression/Bug_1361_Regression.mpc: + * tests/Bug_1476_Regression/Bug_1476_Regression.mpc: + * tests/Bug_1482_Regression/test.mpc: + * tests/Bug_1495_Regression/Bug_1495.mpc: + * tests/Bug_1551_Regression/test.mpc: + * tests/Bug_1568_Regression/Bug_1568_Regression.mpc: + * tests/Bug_1627_Regression/test.mpc: + * tests/Bug_2174_Regression/Bug_2174_Regression.mpc: + * tests/Bug_2183_Regression/Bug_2183_Regression.mpc: + * tests/Bug_2234_Regression/Bug_2234_Regression.mpc: + * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc: + * tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc: + * tests/Cache_Growth_Test/Cache_Growth_Test.mpc: + * tests/CallbackTest/CallbackTest.mpc: + * tests/Client_Leaks/Client_Leaks.mpc: + * tests/Collocation/Collocation.mpc: + * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc: + * tests/Connection_Purging/Connection_Purging.mpc: + * tests/Crash_On_Write/Crash_On_Write.mpc: + * tests/Crashed_Callback/Crashed_Callback.mpc: + * tests/DLL_ORB/DLL_ORB.mpc: + * tests/DSI_Gateway/DSI_Gateway.mpc: + * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc: + * tests/Exposed_Policies/Exposed_Policies.mpc: + * tests/FL_Cube/FL_Cube.mpc: + * tests/Faults/Faults.mpc: + * tests/File_IO/File_IO.mpc: + * tests/Forwarding/Forwarding.mpc: + * tests/Hang_Shutdown/Hang.mpc: + * tests/Hello/Hello.mpc: + * tests/ICMG_Any_Bug/Hello.mpc: + * tests/IPV6/IPV6_Hello.mpc: + * tests/InterOp-Naming/InterOp-Naming.mpc: + * tests/Leader_Followers/Leader_Followers.mpc: + * tests/LongUpcalls/LongUpcalls.mpc: + * tests/MProfile/MProfile.mpc: + * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc: + * tests/MProfile_Forwarding/MProfile_Forwarding.mpc: + * tests/MT_BiDir/MT_BiDir.mpc: + * tests/MT_Client/MT_Client.mpc: + * tests/MT_Server/MT_Server.mpc: + * tests/Multiple/Multiple.mpc: + * tests/Multiple_Inheritance/Multiple_Inheritance.mpc: + * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc: + * tests/Muxing/Muxing.mpc: + * tests/Native_Exceptions/Native_Exceptions.mpc: + * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc: + * tests/NestedUpcall/Triangle_Test/TT.mpc: + * tests/Nested_Event_Loop/Nested_Event_Loop.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/Supports/Supports_Test.mpc: + * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc: + * tests/OBV/ValueBox/valuebox.mpc: + * tests/Object_Loader/Object_Loader.mpc: + * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc: + * tests/OctetSeq/OctetSeq.mpc: + * tests/Oneway_Buffering/Oneway_Buffering.mpc: + * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc: + * tests/POA/Persistent_ID/Persistent_ID.mpc: + * tests/Param_Test/Param_Test.mpc: + * tests/Portable_Interceptors/AMI/PI_AMI.mpc: + * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc: + * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc: + * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc: + * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc: + * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc: + * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc: + * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc: + * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc: + * tests/QtTests/QtTests.mpc: + * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc: + * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc: + * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc: + * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc: + * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc: + * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc: + * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc: + * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc: + * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc: + * tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc: + * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc: + * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc: + * tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc: + * tests/Reliable_Oneways/Reliable_Oneways.mpc: + * tests/Server_Connection_Purging/Server_Connection_Purging.mpc: + * tests/Server_Leaks/Server_Leaks.mpc: + * tests/Single_Read/Single_Read.mpc: + * tests/Smart_Proxies/Smart_Proxies.mpc: + * tests/Stack_Recursion/Stack_Recursion.mpc: + * tests/Strategies/Strategies.mpc: + * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc: + * tests/Timeout/Timeout.mpc: + * tests/Two_Objects/Two_Objects.mpc: + * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc: + * tests/Xt_Stopwatch/Xt_Stopwatch.mpc: + + Added 'after += ...' lines to files where projects share one or + more IDL files. This change will order the builds and eliminate + concurrency problems in VC8 builds. This is a temporary solution + until there is time to apply J.T. Conklin's <jtc@acrontoolworks.com> + approach of creating a separate project in each file that just + executes the IDL compiler on the shared files, and ordering all + other projects that build the resulting generated files to + come after this step. + Thu Dec 1 16:08:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/RTCORBA/Thread_Pool.cpp: diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc index 31273239815..5188e4a669b 100644 --- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc +++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc @@ -8,6 +8,7 @@ project(*Server): taoserver, amh, strategies { } project(*Client): taoexe, amh, portableserver, strategies { + after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc index b42dca05552..a0a1fbb883e 100644 --- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc +++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc @@ -8,6 +8,7 @@ project(*client) : taoexe, portableserver, amh { } project(*server) : taoserver, amh, strategies { + after += *client source_files { server.cpp } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc index 8e9d0e4abb2..a4156b9a83f 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, ami { } project(*Client): taoserver, ami { + after += *Server exename = client Source_Files { Client_Task.cpp @@ -18,6 +19,7 @@ project(*Client): taoserver, ami { } project(*Admin): taoserver, ami { + after += *Client exename = admin Source_Files { AMI_Buffering_Admin.cpp diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc index 4eeadb14767..cc0059d58c7 100644 --- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc +++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc @@ -19,6 +19,7 @@ project(*client) : taoclient, valuetype { } project(*server) : taoserver, valuetype { + after += *client idlflags += -Sc IDL_Files { diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc index 8e6644828da..739a66df566 100644 --- a/TAO/tests/Any/Recursive/RecursiveHello.mpc +++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc @@ -10,7 +10,8 @@ project(*Server): taoserver, valuetype { } project(*Client): taoclient, valuetype, typecodefactory, ifr_client { - + after += *Server + Source_Files { TestC.cpp NonRecursiveC.cpp diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index 8f1239bb195..55e22534e4a 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop { project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop { exename = client + after += *Server Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc index 41e4576ab9a..abcf650df1b 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, minimum_corba, bidir_giop { } project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + after += *Server Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc index d98c87ca241..2493ddfb825 100644 --- a/TAO/tests/Big_AMI/Big_AMI.mpc +++ b/TAO/tests/Big_AMI/Big_AMI.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging, ami { project(*Client): taoserver, messaging, ami { exename = client + after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc index 85935126945..5cf458a0b1e 100644 --- a/TAO/tests/Big_Oneways/Big_Oneways.mpc +++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + after += *Server Source_Files { Peer.cpp Session.cpp diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc index 59034cf50db..648403b35a4 100644 --- a/TAO/tests/Big_Reply/Big_Reply.mpc +++ b/TAO/tests/Big_Reply/Big_Reply.mpc @@ -3,6 +3,7 @@ project(*Server): taoserver { idlflags += -Sa -St + after += *Client Source_Files { Big_Reply_i.cpp server.cpp diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc index 0931f18f506..5d5b10de0c1 100644 --- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc +++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc index 85935126945..5cf458a0b1e 100644 --- a/TAO/tests/Big_Twoways/Big_Twoways.mpc +++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + after += *Server Source_Files { Peer.cpp Session.cpp diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc index 1c10394d0c4..f2870ef39d9 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc index 4c5733dfbee..792a118237c 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc +++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { Echo.cpp Client_Task.cpp diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc index 28f67b75ec0..e38622c756d 100644 --- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc +++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { Echo.cpp client.cpp diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc index 132b1f49116..146c41a5026 100644 --- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc +++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { Echo.cpp client.cpp @@ -17,6 +18,7 @@ project(*Client): taoclient, messaging { } project(*Shutdown): taoexe, messaging { + after += *Client Source_Files { shutdown.cpp } diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc index 60296491dbb..93a6bb0d168 100644 --- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc +++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc @@ -1,14 +1,15 @@ // -*- MPC -*- // $Id$ -project(Bug 1330 Server): taoserver, iortable { +project(*Server): taoserver, iortable { Source_Files { Test_i.cpp server.cpp } } -project(Bug 1330 Client): taoclient, anytypecode { +project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc index 6b2b0dc5cc1..f0247d4c080 100644 --- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc +++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { Echo.cpp ORB_Task.cpp @@ -19,6 +20,7 @@ project(*Client): taoclient, messaging { } project(*Shutdown): taoexe, messaging { + after += *Client Source_Files { shutdown.cpp } diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc index 3c891b3c652..a149ce848c3 100644 --- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc +++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + after += *Server Source_Files { Client_Task.cpp Server_Task.cpp diff --git a/TAO/tests/Bug_1482_Regression/test.mpc b/TAO/tests/Bug_1482_Regression/test.mpc index db29b4062dd..26363b5c9bc 100644 --- a/TAO/tests/Bug_1482_Regression/test.mpc +++ b/TAO/tests/Bug_1482_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Bug_1482_Server): taoserver, amh, ami, iortable, portableserver { +project(*Server): taoserver, amh, ami, iortable, portableserver { Source_Files { Hello.cpp Server_Task.cpp @@ -9,8 +9,9 @@ project(Bug_1482_Server): taoserver, amh, ami, iortable, portableserver { } } -project(Bug_1482_Client): taoserver, amh, ami { +project(*Client): taoserver, amh, ami { exename = client + after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc index 17b9c050382..7e7cfd67199 100644 --- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc +++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors { project(*Client): taoserver, pi, interceptors { exename = client + after += *Server Source_Files { test_i.cpp testC.cpp diff --git a/TAO/tests/Bug_1551_Regression/test.mpc b/TAO/tests/Bug_1551_Regression/test.mpc index 3898d39df22..96a4dfabd63 100644 --- a/TAO/tests/Bug_1551_Regression/test.mpc +++ b/TAO/tests/Bug_1551_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Bug_1551_Server): taoserver, ami, iortable { +project(*Server): taoserver, ami, iortable { Source_Files { Hello.cpp Server_Task.cpp @@ -9,8 +9,9 @@ project(Bug_1551_Server): taoserver, ami, iortable { } } -project(Bug_1551_Client): taoserver, ami { +project(*Client): taoserver, ami { exename = client + after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc index 828fa8ce052..d6430831e00 100644 --- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc +++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc @@ -8,6 +8,7 @@ project(*Server): taoserver, amh { } project(*Client): taoserver, amh { + after += *Server exename = client Source_Files { client.cpp diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc index 66bcbf45c86..93a6bb0d168 100644 --- a/TAO/tests/Bug_1627_Regression/test.mpc +++ b/TAO/tests/Bug_1627_Regression/test.mpc @@ -1,14 +1,15 @@ // -*- MPC -*- // $Id$ -project(Bug_1627_Server): taoserver, iortable { +project(*Server): taoserver, iortable { Source_Files { Test_i.cpp server.cpp } } -project(Bug_1627_Client): taoclient, anytypecode { +project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc index 1d3d307ea3e..c01584c3559 100644 --- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc +++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode, minimum_corba { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index 62cffce1ede..ff28e59983f 100755 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, strategies { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc index 6ae49e52085..26c4972e1db 100644 --- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc +++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc @@ -14,6 +14,7 @@ project (*client) : taoclient,anytypecode { } project (*server) : taoserver,pi_server { + after += *client IDL_Files { Test.idl } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc index c7f6e20a3f5..453ea84a1f0 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc @@ -2,7 +2,8 @@ project : taolib_with_idl, csd_threadpool { sharedname = CSD_TP_Test dynamicflags = CSD_TP_TEST_BUILD_DLL - idlflags += -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h + idlflags += -Wb,export_macro=CSD_TP_Test_Export \ + -Wb,export_include=CSD_TP_Test_Export.h includes += $(TAO_ROOT)/tao IDL_Files { @@ -35,5 +36,4 @@ project : taolib_with_idl, csd_threadpool { Template_Files { ServantList_T.cpp } - } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc index 5b90572b45d..9da402191ea 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoclient { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc index 02cac4dc7da..afd9e5d8e68 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc @@ -12,6 +12,7 @@ project(*Server): csd_tp_test_exe_a { project(*Client): csd_tp_test_exe_a { exename=client_main + after += *Server Source_Files { ClientApp.cpp diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc index 8e25b42d362..e64ad8d08a8 100644 --- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc +++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc index 006030800af..9bf640dd2b3 100644 --- a/TAO/tests/CallbackTest/CallbackTest.mpc +++ b/TAO/tests/CallbackTest/CallbackTest.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, portableserver, messaging { + after += *Server Source_Files { Callback.cpp client.cpp diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc index 41961bc999f..a83a41950f3 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp Client_Task.cpp @@ -20,6 +21,7 @@ project(*Client): taoclient, anytypecode { project(*Child): taoserver { exename = child + after += *Client Source_Files { Process.cpp child.cpp diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc index 5a0b503aac4..2bb76c43a80 100644 --- a/TAO/tests/Collocation/Collocation.mpc +++ b/TAO/tests/Collocation/Collocation.mpc @@ -3,7 +3,11 @@ project(*Test Stub): taolib_with_idl { sharedname = Collocation_Test_Stub - idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa + idlflags += -Wb,skel_export_macro=Diamond_Export \ + -Wb,stub_export_macro=MY_Stub_Export \ + -Wb,skel_export_include=diamond_export.h \ + -Wb,stub_export_include=stub_export.h \ + -Gd -St -Sa dynamicflags = MY_STUB_BUILD_DLL Source_Files { @@ -15,7 +19,11 @@ project(*Diamond) : taolib_with_idl, portableserver { after += Collocation_Test_Stub sharedname = Collocation_Diamond libs += Collocation_Test_Stub - idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa + idlflags += -Wb,skel_export_macro=Diamond_Export \ + -Wb,stub_export_macro=MY_Stub_Export \ + -Wb,skel_export_include=diamond_export.h \ + -Wb,stub_export_include=stub_export.h \ + -Gd -St -Sa dynamicflags = DIAMOND_BUILD_DLL Source_Files { diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc index 8e25b42d362..e64ad8d08a8 100644 --- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc +++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc index ad230187aa7..321e97dff47 100644 --- a/TAO/tests/Connection_Purging/Connection_Purging.mpc +++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc @@ -9,6 +9,7 @@ project(*Server): strategies, taoserver { } project(*Client): strategies, taoclient { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc index 5dc777cfcad..2398d1eac4c 100644 --- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc +++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver { } project(*Client): taoclient { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc index b7c2b164029..34711dbef67 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, portableserver, messaging { + after += *Server Source_Files { Crashed_Callback.cpp client.cpp diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc index f7eb4ab9597..34ed08c9359 100644 --- a/TAO/tests/DLL_ORB/DLL_ORB.mpc +++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Test Client Module): taolib_with_idl, anytypecode { +project(*Test_Client_Module): taolib_with_idl, anytypecode { sharedname = Test_Client_Module dynamicflags = TEST_CLIENT_MODULE_BUILD_DLL @@ -11,9 +11,10 @@ project(*Test Client Module): taolib_with_idl, anytypecode { } } -project(*Test Server Module) : taolib_with_idl, portableserver { +project(*Test_Server_Module) : taolib_with_idl, portableserver { sharedname = Test_Server_Module dynamicflags = TEST_SERVER_MODULE_BUILD_DLL + after += *Test_CLient_Module Source_Files { Test_Server_Module.cpp diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index 6a8245f178e..c5deacad25b 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, messaging, minimum_corba, dynamicinterface { } project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { + after += *Server Source_Files { testC.cpp client.cpp @@ -16,6 +17,7 @@ project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { } project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface { + after += *Client Source_Files { test_dsi.cpp gateway.cpp diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc index 62136abbcaf..6da42a65f4b 100644 --- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc +++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc @@ -8,6 +8,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { timeC.cpp client.cpp diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc index 6eca87854c2..6e9c5283fe0 100644 --- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc +++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc @@ -12,6 +12,7 @@ project(*Server): strategies, rt_server { project(*Client): strategies, rt_server { exename = client + after += *Server Source_Files { CounterC.cpp diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc index 89af20e2099..9f8856707ff 100644 --- a/TAO/tests/FL_Cube/FL_Cube.mpc +++ b/TAO/tests/FL_Cube/FL_Cube.mpc @@ -8,6 +8,7 @@ project(*client) : taoclient, portableserver, tao_flresource { } project(*server) : taoserver, tao_flresource { + after += *client source_files { server.cpp test_i.cpp diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc index e52be673239..0bc0ae29bce 100644 --- a/TAO/tests/Faults/Faults.mpc +++ b/TAO/tests/Faults/Faults.mpc @@ -15,6 +15,7 @@ project(*Server): taoserver, minimum_corba { } project(*Middle): taoexe, portableserver, minimum_corba { + after += *Server IDL_Files { test.idl } @@ -28,6 +29,7 @@ project(*Middle): taoexe, portableserver, minimum_corba { } project(*Client): taoexe, portableserver, minimum_corba { + after += *Middle IDL_Files { test.idl } @@ -54,6 +56,7 @@ project(*Ping): taoexe, portableserver, minimum_corba { } project(*Pong): taoexe, portableserver, minimum_corba { + after += *Ping IDL_Files { ping.idl } diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 7d29aa811f5..0f597f3533e 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, minimum_corba { } project(*Client): taoclient, anytypecode, minimum_corba { + after += *Server Source_Files { FileC.cpp client.cpp diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc index d3e679e33b7..c0830f61571 100644 --- a/TAO/tests/Forwarding/Forwarding.mpc +++ b/TAO/tests/Forwarding/Forwarding.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, iortable { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc index 511bc4d5827..164f34dd522 100644 --- a/TAO/tests/Hang_Shutdown/Hang.mpc +++ b/TAO/tests/Hang_Shutdown/Hang.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc index 9ea6c4b127b..9a1892855d9 100644 --- a/TAO/tests/Hello/Hello.mpc +++ b/TAO/tests/Hello/Hello.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoclient { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc index 654e32854cd..a41e64733b8 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.mpc +++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc @@ -10,6 +10,7 @@ project(ICMG_Any_Bug_Hello_Server): taoserver { } project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, minimum_corba { + after += ICMG_Any_Bug_Hello_Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc index 9ea6c4b127b..9a1892855d9 100644 --- a/TAO/tests/IPV6/IPV6_Hello.mpc +++ b/TAO/tests/IPV6/IPV6_Hello.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoclient { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc index 5604fafaf7b..163fd3de1c3 100644 --- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc +++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver, utils, iortable { project(*Client): taoclient, anytypecode { exename = INS_test_client + after += *Server Source_Files { INSC.cpp INS_test_client.cpp diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc index c82979d0e98..a3b794ac88f 100644 --- a/TAO/tests/Leader_Followers/Leader_Followers.mpc +++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, strategies { } project(*Client): taoclient, strategies { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc index 5bd663d16e0..13a0c026057 100644 --- a/TAO/tests/LongUpcalls/LongUpcalls.mpc +++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc @@ -10,21 +10,24 @@ project(*Server): taoserver, messaging, ami { } project(*Client): messaging, taoexe, portableserver, ami { + after += *Server Source_Files { Controller.cpp blocking_client.cpp } } -project(*AMI Server): taoserver, messaging, ami { +project(*AMI_Server): taoserver, messaging, ami { exename = ami_server + after += *Client Source_Files { AMI_Manager.cpp ami_server.cpp } } -project(*AMI Client): messaging, taoexe, portableserver, ami { +project(*AMI_Client): messaging, taoexe, portableserver, ami { + after += *AMI_Server Source_Files { Controller.cpp Manager_Handler.cpp diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc index 40f7a4677d8..e48d767fd5c 100644 --- a/TAO/tests/MProfile/MProfile.mpc +++ b/TAO/tests/MProfile/MProfile.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, iormanip { } project(*Client): taoclient, iormanip { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc index cb84adb7841..e4abfd734d6 100644 --- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc +++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver, messaging, iormanip { } project(*Client): taoclient, messaging, iormanip { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc index e38b68ca361..d6f4df5acc4 100644 --- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc +++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, minimum_corba { project(*Client): taoclient, anytypecode, minimum_corba { exename = client + after += *Server Source_Files { testC.cpp client.cpp @@ -18,6 +19,7 @@ project(*Client): taoclient, anytypecode, minimum_corba { project(*Manager): taoserver, minimum_corba, iormanip { exename = manager + after += *Client Source_Files { testC.cpp Servant_Locator.cpp diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc index db3f6d32dbf..ab023c419a3 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -13,6 +13,7 @@ project(*Server): taoexe, portableserver, minimum_corba, bidir_giop { } project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + after += *Server Source_Files { ReceiverC.cpp ReceiverS.cpp diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc index 2d52b489a66..1974ade69bd 100644 --- a/TAO/tests/MT_Client/MT_Client.mpc +++ b/TAO/tests/MT_Client/MT_Client.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoclient { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc index 4c15c26f959..bfb96e8b536 100644 --- a/TAO/tests/MT_Server/MT_Server.mpc +++ b/TAO/tests/MT_Server/MT_Server.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc index 2584e88308f..47b388a8e0f 100644 --- a/TAO/tests/Multiple/Multiple.mpc +++ b/TAO/tests/Multiple/Multiple.mpc @@ -13,6 +13,7 @@ project(*Server): taoserver { project(*Client): taoexe, portableserver { idlflags += -Gd + after += *Server Source_Files { Multiple_Impl.cpp diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc index db84416b4cc..f818ca1c940 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc @@ -8,6 +8,7 @@ project(*Server): taoserver, utils { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { Multiple_InheritanceC.cpp client.cpp diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc index 4c15c26f959..bfb96e8b536 100644 --- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc +++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc index 2824b800b03..1d115e8dc19 100644 --- a/TAO/tests/Muxing/Muxing.mpc +++ b/TAO/tests/Muxing/Muxing.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc index 397406b1347..4218665fd3b 100644 --- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc +++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver, anytypecode, exceptions { project(*Client): taoclient, anytypecode, exceptions { idlflags = -Ge 0 -Sc -Sa -St + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc index c8a1b7d2075..35e6a89edfd 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc @@ -1,14 +1,15 @@ // -*- MPC -*- // $Id$ -project(*Nested Upcall Server): taoserver, utils { +project(*Nested_Upcall_Server): taoserver, utils { Source_Files { MT_Object_i.cpp server.cpp } } -project(*Nested Upcall Client): taoexe, utils, portableserver { +project(*Nested_Upcall_Client): taoexe, utils, portableserver { + after += *Nested_Upcall_Server Source_Files { MT_Object_i.cpp local_server.cpp diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc index 7480edb1f1c..e8b0864ecd5 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc +++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc @@ -1,21 +1,23 @@ // -*- MPC -*- // $Id$ -project(*Nested Upcall Server_A): taoexe, utils, portableserver { +project(*Nested_Upcall_Server_A): taoexe, utils, portableserver { Source_Files { Object_A_i.cpp server_A.cpp } } -project(*Nested Upcall Server_B): taoexe, utils, portableserver { +project(*Nested_Upcall_Server_B): taoexe, utils, portableserver { + after += *Nested_Upcal_Server_A Source_Files { Object_B_i.cpp server_B.cpp } } -project(*Nested Upcall Initiator): taoexe, utils, portableserver { +project(*Nested_Upcall_Initiator): taoexe, utils, portableserver { + after += *Nested_Upcall_Server_B Source_Files { Initiator_i.cpp initiator.cpp diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc index 47fc97557a4..50ef58ea252 100644 --- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc +++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc @@ -9,6 +9,7 @@ project(*Server): strategies, taoexe, portableserver { } project(*Client): strategies, taoexe, portableserver { + after += *Server Source_Files { test_i.cpp client.cpp 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 4c15c26f959..bfb96e8b536 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 @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc index 568259acf4e..d49a9b37b23 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -9,6 +9,7 @@ project(*Server): taoexe, portableserver, valuetype { } project(*Client): taoexe, valuetype { + after += *Server Source_Files { AnyC.cpp client.cpp diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc index cc812c1eebe..5f6bb954c43 100644 --- a/TAO/tests/OBV/Factory/OBV_Factory.mpc +++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc @@ -10,6 +10,7 @@ project(*Server): taoexe, portableserver, valuetype { } project(*Client): taoexe, valuetype { + after += *Server Source_Files { FactoryC.cpp FactoryC_impl.cpp diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc index a2e1bc181e0..cf17bc5cc47 100644 --- a/TAO/tests/OBV/Forward/OBV_Forward.mpc +++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc @@ -14,6 +14,7 @@ project(*Server): taoexe, portableserver, valuetype { } project(*Client): taoexe, valuetype { + after += *Server Source_Files { TreeBaseC.cpp TreeControllerC.cpp diff --git a/TAO/tests/OBV/Supports/Supports_Test.mpc b/TAO/tests/OBV/Supports/Supports_Test.mpc index 3de931f13dd..f54c3ae23a4 100644 --- a/TAO/tests/OBV/Supports/Supports_Test.mpc +++ b/TAO/tests/OBV/Supports/Supports_Test.mpc @@ -20,6 +20,7 @@ project(*Server): taoserver, valuetype, strategies { project(*Client): taoclient, taoserver, valuetype { exename = client + after += *Server // This is just a dummy_label to prevent the test from being compiled // in MPC builds requires += dummy_label diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc index ac045461c97..120b279c5de 100644 --- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc +++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc @@ -11,6 +11,7 @@ project(*Server): taoexe, portableserver, valuetype { } project(*Client): taoexe, valuetype { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc index 9d07560ab99..4132a64c40e 100644 --- a/TAO/tests/OBV/ValueBox/valuebox.mpc +++ b/TAO/tests/OBV/ValueBox/valuebox.mpc @@ -23,6 +23,7 @@ project(*Server): taoexe, portableserver, valuetype { } project(*Client): taoexe, valuetype { + after += *Server Source_Files { vb_basicC.cpp vb_structC.cpp diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc index 93ce5b41681..a008ebf89a3 100644 --- a/TAO/tests/Object_Loader/Object_Loader.mpc +++ b/TAO/tests/Object_Loader/Object_Loader.mpc @@ -12,6 +12,7 @@ project(*Test): taolib_with_idl, portableserver { } project(*Driver): taoexe, portableserver { + after += *Test Source_Files { TestC.cpp driver.cpp diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc index fcf4ac7709c..650b6c70356 100644 --- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc +++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc @@ -8,6 +8,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc index f022a840487..5a2d297780a 100644 --- a/TAO/tests/OctetSeq/OctetSeq.mpc +++ b/TAO/tests/OctetSeq/OctetSeq.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp client.cpp @@ -17,6 +18,7 @@ project(*Client): taoclient, anytypecode { project(*OctetSeq): taoclient, anytypecode { exename = OctetSeq + after += *Client Source_Files { testC.cpp OctetSeq.cpp diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc index 0ac9fd7eafc..ee95112f143 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc @@ -18,6 +18,7 @@ project(*Server): messaging, taoexe, portableserver { // succeeds. project(*Client): messaging, taoexe, portableserver { requires += corba_messaging + after += *Server Source_Files { TestC.cpp @@ -26,6 +27,7 @@ project(*Client): messaging, taoexe, portableserver { } project(*Admin): messaging, taoexe, portableserver { + after += *Client Source_Files { Oneway_Buffering_Admin.cpp admin.cpp diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc index 7aef588b5f2..bd6dfbc4ff5 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc +++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + after += *Server Source_Files { Client_Task.cpp Server_Task.cpp diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc index 735ef5e6ed2..de531ab3649 100644 --- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc +++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc @@ -9,6 +9,7 @@ project(POA_server*): taoserver { project(POA_client*): taoserver { exename = client + after += POA_server* Source_Files { client.cpp } diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 6124582c733..062a84c7147 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -10,7 +10,7 @@ project(*Server): taoserver, minimum_corba { project(*Client): taoserver, minimum_corba, dynamicinterface { exename = client - after += Param_Test_Server + after += *Server Source_Files { any.cpp @@ -59,7 +59,7 @@ project(*Client): taoserver, minimum_corba, dynamicinterface { project(*Anyop): taoserver, minimum_corba { exename = anyop - after += Param_Test_Client + after += *Client Source_Files { param_testC.cpp diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc index e53f00164a1..f55237bc40f 100644 --- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc +++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc @@ -13,6 +13,7 @@ project(*Client) : taoserver, ami, pi, interceptors { project(*server) : taoserver, ami, pi_server, interceptors { exename = server + after += *Client source_files { server.cpp Server_Interceptor.cpp diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc index 44a76c957f7..59737568104 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc +++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc @@ -13,6 +13,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp client_interceptors.cpp diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc index 1a864c9e26f..2e992878fcb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp Client_ORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc index 88fa97fd7ba..a55faf91bbf 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc +++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp client_interceptor.cpp diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc index 26777d6f625..fddc7298207 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver, iorinterceptor, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp FOO_Client_ORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc index 90a4632fc2b..600ba5c118b 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc index fcb0a6c8382..39a60cd5c75 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc +++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp ClientORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc index 15ecab48119..ee81ede8553 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp Client_ORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc index 1a864c9e26f..2e992878fcb 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc @@ -11,6 +11,7 @@ project(*Server): taoserver, pi_server, interceptors { } project(*Client): taoclient, pi, interceptors { + after += *Server Source_Files { testC.cpp Client_ORBInitializer.cpp diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc index ff027308cb8..f19a85221a1 100644 --- a/TAO/tests/QtTests/QtTests.mpc +++ b/TAO/tests/QtTests/QtTests.mpc @@ -15,6 +15,7 @@ project(*server): taoserver, tao_qtresource { } project(*client): taoclient, tao_qtresource { + after += *server MOC_Files { client.h diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc index 78e08a31786..b62ff14a3d9 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc +++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc @@ -8,6 +8,7 @@ project(*Server): rt_server { } project(*Client): rt_client { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index 23d288d93b3..9f0ce92c6ea 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -8,6 +8,7 @@ project(*Server): rt_server { } project(*Client): rt_client, interceptors { + after += *Server Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc index 596601d6e07..e51a077e7fe 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc +++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc @@ -8,6 +8,7 @@ project(*Server): strategies, rt_server { } project(*Client): strategies, rt_client { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 7138aa20720..85cadf3219a 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -9,6 +9,7 @@ project(*client) : taoexe, portableserver, rtcorba, minimum_corba { } project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { + after += *client source_files { server.cpp Custom_Network_Priority_Mapping.cpp diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index 10ba9a8a48f..a77351b5090 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -8,6 +8,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 0f82a323a72..87178218057 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -8,6 +8,7 @@ project(*Server): rt_server, minimum_corba { } project(*Client): rt_client, minimum_corba { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index 49d690018fd..c7a5f0c3229 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -8,6 +8,7 @@ project(*Server): rt_server, minimum_corba { } project(*Client): rt_client { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc index 4cb4bcb6c23..ebf79370785 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc @@ -9,6 +9,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc index 81a533380b3..4d9a96b12f0 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -6,6 +6,7 @@ project(*Server): rt_server, strategies, portableserver, minimum_corba { } project(*Client): rt_client, strategies, portableserver, minimum_corba { + after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc index 78e08a31786..b62ff14a3d9 100644 --- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc +++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc @@ -8,6 +8,7 @@ project(*Server): rt_server { } project(*Client): rt_client { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc index 10ba9a8a48f..a77351b5090 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -8,6 +8,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index 4cb4bcb6c23..ebf79370785 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -9,6 +9,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc index 08e00e4c333..a9fce2cd532 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc @@ -9,6 +9,7 @@ project(*Server): rtscheduling_server { } project(*Client) : rtscheduling_client { + after += *Server Source_Files { ../Scheduler.cpp testC.cpp diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc index c7d61fe00e7..2141f3040f5 100644 --- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc +++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging { } project(*Client): messaging, taoexe, portableserver { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc index 99546099606..a50eda03b14 100644 --- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc +++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc index 6e565915472..4517bde0f91 100644 --- a/TAO/tests/Server_Leaks/Server_Leaks.mpc +++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc index 4c15c26f959..bfb96e8b536 100644 --- a/TAO/tests/Single_Read/Single_Read.mpc +++ b/TAO/tests/Single_Read/Single_Read.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc index d9d43ad9a29..473bc9b4087 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc +++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc @@ -8,6 +8,7 @@ project(*Server): taoserver, smart_proxies { } project(*Client): taoclient, portableserver, smart_proxies { + after += *Server Source_Files { testC.cpp Smart_Proxy_Impl.cpp diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc index 253a61435dc..ce10971c433 100644 --- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc +++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc index 94da5a64615..32f5969e832 100644 --- a/TAO/tests/Strategies/Strategies.mpc +++ b/TAO/tests/Strategies/Strategies.mpc @@ -9,6 +9,7 @@ project(*Server): strategies, messaging, taoexe, portableserver { } project(*Client): strategies, messaging, taoexe, portableserver { + after += *Server Source_Files { simple_testC.cpp client.cpp diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc index cabea05ca6b..1bd7978c70a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc +++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc @@ -9,6 +9,7 @@ project(*Server): messaging, taoexe, portableserver { } project(*Client): messaging, taoexe, portableserver { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index 926002380e8..5826c607d6e 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -9,6 +9,7 @@ project(*Server): taoserver { } project(*Client): taoclient, messaging { + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc index de36db49c6a..1dbe304222f 100644 --- a/TAO/tests/Two_Objects/Two_Objects.mpc +++ b/TAO/tests/Two_Objects/Two_Objects.mpc @@ -12,6 +12,7 @@ project(*Server): taoserver { } project(*Client): taoclient, anytypecode { + after += *Server Source_Files { Two_ObjectsC.cpp client.cpp diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 91fc9d79183..ebb8ea35bb1 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, exceptions { project(*Client): taoclient, anytypecode, exceptions { idlflags = -Ge 0 + after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc index d98e1e04898..cbfa1580e94 100644 --- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc +++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc @@ -11,6 +11,7 @@ project(*Server): taoexe, portableserver, tao_xtresource, ace_motif { } project(*Client): taoexe, tao_xtresource, ace_motif { + after += *Server Source_Files { testC.cpp Control.cpp |