diff options
Diffstat (limited to 'TAO/orbsvcs/tests')
76 files changed, 227 insertions, 515 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc index 3fbedf431e6..fbc1c6a8ea7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -7,7 +7,7 @@ project(sender): avstreamsexe { } } -project(distributer): avstreamsexe { +project(*distributer): avstreamsexe { exename = distributer Source_Files { @@ -16,7 +16,7 @@ project(distributer): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc index 8686dbabf50..15e50b2725e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe, strategies { +project(*sender): avstreamsexe, strategies { exename = sender Source_Files { @@ -7,7 +7,7 @@ project(sender): avstreamsexe, strategies { } } -project(distributer): avstreamsexe, strategies { +project(*distributer): avstreamsexe, strategies { exename = distributer Source_Files { @@ -16,7 +16,7 @@ project(distributer): avstreamsexe, strategies { } } -project(receiver): avstreamsexe, strategies { +project(*receiver): avstreamsexe, strategies { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc index a22b5c3335e..70e6b91ff07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe { +project(*server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe { } } -project(ftp): avstreamsexe { +project(*ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc index 11514686f85..7a640aa7275 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc @@ -1,4 +1,4 @@ -project(ping): avstreamsexe, strategies { +project(*ping): avstreamsexe, strategies { exename = ping Source_Files { @@ -6,7 +6,7 @@ project(ping): avstreamsexe, strategies { } } -project(pong): avstreamsexe, strategies { +project(*pong): avstreamsexe, strategies { exename = pong Source_Files { @@ -14,7 +14,7 @@ project(pong): avstreamsexe, strategies { } } -project(control): avstreamsexe, strategies { +project(*control): avstreamsexe, strategies { exename = control Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc index 24150d0814c..9e0ba3db26e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe, strategies { +project(*server): avstreamsexe, strategies { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe, strategies { } } -project(ftp): avstreamsexe, strategies { +project(*ftp): avstreamsexe, strategies { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc index a22b5c3335e..70e6b91ff07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe { +project(*server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe { } } -project(ftp): avstreamsexe { +project(*ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc index a22b5c3335e..70e6b91ff07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc @@ -1,4 +1,4 @@ -project(server): avstreamsexe { +project(*server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): avstreamsexe { } } -project(ftp): avstreamsexe { +project(*ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc index 80ac33b728f..1dabe554c43 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc @@ -1,15 +1,14 @@ -project(avstreams ts) : orbsvcslib { - sharedname = TAO_TS - dllflags = TAO_AV_BUILD_DLL - install = - comps += AV +project(*ts) : orbsvcslib, portableserver, avstreams, naming { + sharedname = TAO_TS + dynamicflags = TAO_AV_BUILD_DLL + comps += AV Source_Files { TimeStamp.cpp } } -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -17,7 +16,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc index af38d4d5ec6..1b836f3ddc5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(distributer): avstreamsexe { +project(*distributer): avstreamsexe { exename = distributer Source_Files { @@ -14,7 +14,7 @@ project(distributer): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc index 87f5ca868bc..c683ea2fef5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): avstreamsexe { +project(*sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): avstreamsexe { } } -project(receiver): avstreamsexe { +project(*receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc index 52c21d6ccf7..db3edaf54b4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc @@ -1,20 +1,14 @@ -project(sender): avstreamsexe { - depends += QoS +project(*sender): avstreamsexe, qos { requires += rapi - libs += ACE_QoS exename = sender - Source_Files { sender.cpp } } -project(receiver): avstreamsexe { - depends += QoS +project(*receiver): avstreamsexe, qos { requires += rapi - libs += ACE_QoS exename = receiver - Source_Files { receiver.cpp } diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc index 02ab33d8e95..151719d33eb 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc @@ -1,8 +1,5 @@ -project(Bug 1393 Client): client { - depends += IFR_Client - exename = client - libpaths += $(TAO_ROOT)/tao/IFR_Client - libs += TAO_IFR_Client +project(*Client): taoclient, ifr_client { + exename = client Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc index d7230e5ffec..b0e1a6ffcdf 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc @@ -1,11 +1,11 @@ -project(Bug 1395 Server): server { +project(*Server): taoserver { Source_Files { Test_i.cpp server.cpp } } -project(Bug 1395 Client): client { +project(*Client): taoclient { Source_Files { TestC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc index e7f7d5a00ed..4c6f678f475 100644 --- a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc +++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc @@ -1,6 +1,3 @@ -project(CC client) : orbsvcsexe { - depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer - libs += TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer +project(CC client) : orbsvcsexe, concurrency, naming, svc_utils, iortable, portableserver { exename = CC_client - comps += Concurrency } diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc index 86c0d1cf997..84d27803985 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc +++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc @@ -1,70 +1,40 @@ -project(Disconnect): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Disconnect): basiceventtestexe { exename = Disconnect - comps += CosEvent - Source_Files { Disconnect.cpp } } -project(MT_Disconnect): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*MT_Disconnect): basiceventtestexe { exename = MT_Disconnect - comps += CosEvent - Source_Files { MT_Disconnect.cpp } } -project(Push_Event): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Push_Event): basiceventtestexe { exename = Push_Event - comps += CosEvent - Source_Files { Push_Event.cpp } } -project(Pull_Push_Event): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Pull_Push_Event): basiceventtestexe { exename = Pull_Push_Event - comps += CosEvent - Source_Files { Pull_Push_Event.cpp } } -project(Shutdown): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Shutdown): basiceventtestexe { exename = Shutdown - comps += CosEvent - Source_Files { Shutdown.cpp } } -project(Random): orbsvcsexe, messaging { - depends += CosEvent_Test_Lib CosEvent CosNaming Svc_Utils IORTable - libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable - includes += ../lib +project(*Random): basiceventtestexe { exename = Random - comps += CosEvent - Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb new file mode 100644 index 00000000000..74857041faf --- /dev/null +++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb @@ -0,0 +1,6 @@ +project : orbsvcsexe, messaging, server, event, naming, svc_utils, iortable { + after += CosEvent_Test_Lib + libs += CECTests + includes += ../lib + comps += CosEvent +} diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc index 1b2d44aa696..1925cb18283 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc +++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc @@ -1,10 +1,6 @@ -project(CosEvent Test Lib): orbsvcslib { - sharedname = CECTests - depends += CosEvent CosNaming Svc_Utils IORTable PortableServer - libs += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - dllflags = CEC_TEST_BUILD_DLL - comps += CosEvent - +project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver { + sharedname = CECTests + dynamicflags = CEC_TEST_BUILD_DLL Header_Files { cectest_export.h } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc index f57e45eed91..9f24bdc487e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc @@ -1,19 +1,13 @@ -project(ECM Supplier): rteventexe { - depends += RTSched CosNaming IORTable Messaging - libs += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging { exename = ECM_Supplier - Source_Files { ECM_Data.cpp ECM_Supplier.cpp } } -project(ECM Consumer): rteventexe { - depends += RTSched CosNaming IORTable Messaging - libs += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging { exename = ECM_Consumer - Source_Files { ECM_Data.cpp ECM_Consumer.cpp diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc index a490a941d64..e347b814cda 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc @@ -1,5 +1,3 @@ -project(EC_Mcast): rteventexe { - depends += Messaging - libs += TAO_Messaging +project(EC_Mcast): rteventexe, messaging { exename = EC_Mcast }
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc index 5030fa91d5b..7ad66908fb9 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc @@ -1,5 +1,3 @@ -project(EC_Multiple): rteventexe { - depends += RTOLDEvent RTSchedEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSchedEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging { exename = EC_Multiple } diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc index 509996ef24c..1256f6edba6 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc +++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc @@ -1,6 +1,4 @@ -project(ECT Supplier): rteventexe { - depends += RTOLDEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging { exename = ECT_Supplier comps += Naming RTOLDEvent @@ -11,9 +9,7 @@ project(ECT Supplier): rteventexe { } } -project(ECT Consumer): rteventexe { - depends += RTOLDEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging { exename = ECT_Consumer comps += Naming RTOLDEvent @@ -24,9 +20,7 @@ project(ECT Consumer): rteventexe { } } -project(ECT Throughput): rteventexe { - depends += RTOLDEvent RTSched CosNaming IORTable Messaging - libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging +project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging { exename = ECT_Throughput comps += Naming RTOLDEvent diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index 1f348726321..b25b1794768 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -1,163 +1,88 @@ -project(Reconnect): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Reconnect - +project(*Reconnect): rteventtestexe { Source_Files { Reconnect.cpp } } -project(Shutdown): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Shutdown - +project(*Shutdown): rteventtestexe { Source_Files { Shutdown.cpp } } -project(Observer): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Observer - +project(*Observer): rteventtestexe { Source_Files { Observer.cpp } } -project(BCast): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = BCast - +project(*BCast): rteventtestexe { Source_Files { BCast.cpp } } -project(Timeout): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Timeout - +project(*Timeout): rteventtestexe { Source_Files { Timeout.cpp } } -project(Wildcard): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Wildcard - +project(*Wildcard): rteventtestexe { Source_Files { Wildcard.cpp } } -project(Negation): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Negation - +project(*Negation): rteventtestexe { Source_Files { Negation.cpp } } -project(Disconnect): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Disconnect - +project(*Disconnect): rteventtestexe { Source_Files { Disconnect.cpp } } -project(MT_Disconnect): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = MT_Disconnect - +project(*MT_Disconnect): rteventtestexe { Source_Files { MT_Disconnect.cpp } } -project(Atomic_Reconnect): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Atomic_Reconnect - +project(*Atomic_Reconnect): rteventtestexe { Source_Files { Atomic_Reconnect.cpp } } -project(Bitmask): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Bitmask - +project(*Bitmask): rteventtestexe { Source_Files { Bitmask.cpp } } -project(Complex): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Complex - +project(*Complex): rteventtestexe { Source_Files { Complex.cpp } } -project(Gateway): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Gateway - +project(*Gateway): rteventtestexe { Source_Files { Gateway.cpp } } -project(Control): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Control - +project(*Control): rteventtestexe { Source_Files { Control.cpp } } -project(Random): messaging, rteventexe { - depends += RTEvent_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib - exename = Random - +project(*Random) : rteventtestexe { Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb new file mode 100644 index 00000000000..3b0f0b416b5 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb @@ -0,0 +1,5 @@ +project : messaging, rteventexe, naming, iortable { + after += RTEvent_Test_Lib + libs += ECTests + includes += ../lib +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc index 75a2811ee50..f142bf79c6b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc @@ -1,10 +1,6 @@ -project(ECMcastTests Lib): orbsvcslib { +project: orbsvcslib, rtevent, svc_utils, iortable, portableserver { sharedname = ECMcastTests - depends += TAO RTEvent Svc_Utils IORTable PortableServer - libs += TAO TAO_RTEvent TAO_Svc_Utils TAO_IORTable TAO_PortableServer - dllflags = ECMCASTTESTS_BUILD_DLL - comps += RTEvent - + dynamicflags = ECMCASTTESTS_BUILD_DLL Header_Files { ectest_export.h } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc index a7eab87ae62..0f1fd636a2a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc @@ -1,5 +1,5 @@ -project(supplier): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*supplier): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = supplier @@ -9,8 +9,8 @@ project(supplier): messaging, rteventexe { } } -project(consumer): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*consumer): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = consumer @@ -20,8 +20,8 @@ project(consumer): messaging, rteventexe { } } -project(gateway-ec): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*gateway-ec): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = gateway-ec diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc index a7eab87ae62..0f1fd636a2a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc @@ -1,5 +1,5 @@ -project(supplier): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*supplier): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = supplier @@ -9,8 +9,8 @@ project(supplier): messaging, rteventexe { } } -project(consumer): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*consumer): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = consumer @@ -20,8 +20,8 @@ project(consumer): messaging, rteventexe { } } -project(gateway-ec): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*gateway-ec): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = gateway-ec diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc index f760c85d215..15ce9690c3b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc @@ -1,5 +1,5 @@ -project(application): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*application): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = application @@ -9,8 +9,8 @@ project(application): messaging, rteventexe { } } -project(gateway-ec): messaging, rteventexe { - depends += ECMcastTests_Lib CosNaming IORTable +project(*gateway-ec): messaging, rteventexe { + after += ECMcastTests_Lib CosNaming IORTable libs += ECMcastTests TAO_CosNaming TAO_IORTable includes += ../Common exename = gateway-ec diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc index 99093bb62f8..663d52a0877 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc +++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc @@ -1,53 +1,33 @@ -project(Throughput): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Throughput): eventperftestexe { exename = Throughput - Source_Files { Throughput.cpp } } -project(Connect): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Connect): eventperftestexe { exename = Connect - Source_Files { Connect.cpp } } -project(Inversion): messaging, rteventexe { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Inversion): eventperftestexe { exename = Inversion - Source_Files { Inversion.cpp } } -project(Latency): messaging, rteventexe, strategies { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Latency): eventperftestexe, strategies { exename = Latency - Source_Files { Latency.cpp } } -project(Latency_Server): messaging, rteventexe, strategies { - depends += Event_Test_Lib CosNaming IORTable - libs += ECTests TAO_CosNaming TAO_IORTable - includes += ../lib +project(*Latency_Server): eventperftestexe, strategies { exename = Latency_Server - Source_Files { Latency_Server.cpp } diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb new file mode 100644 index 00000000000..c9fab7fabf5 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb @@ -0,0 +1,6 @@ +project: messaging, rteventexe, naming, iortable { + after += Event_Test_Lib + libs += ECTests + includes += ../lib +} + diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc index c7a87e6535d..15def363a05 100644 --- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc +++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc @@ -1,10 +1,6 @@ -project(Event Test Lib): orbsvcslib { - sharedname = ECTests - depends += RTEvent CosNaming Svc_Utils IORTable PortableServer - libs += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer - dllflags = EC_TEST_BUILD_DLL - comps += RTEvent - +project(Event Test Lib): orbsvcslib, rtevent, naming, svc_utils, iortable, portableserver { + sharedname = ECTests + dynamicflags = EC_TEST_BUILD_DLL Header_Files { ectest_export.h } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc index 75cdff845c0..3ceeb4c709a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc @@ -1,20 +1,12 @@ -project: server, orbsvcsexe { - depends += FTORB IORManip - libs += TAO_FTORB TAO_IORManip - comps += FTORB - +project(*server): server, orbsvcsexe, iormanip, ftorb { Source_Files { test_i.cpp server.cpp } } -project(Manager): server, orbsvcsexe { - depends += FTORB IORManip - libs += TAO_FTORB TAO_IORManip +project(*Manager): taoserver, orbsvcsexe, iormanip, ftorb { exename = Manager - comps += FTORB - Source_Files { testC.cpp Manager.cpp diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc index 26f2bdf4663..7830e63a8a6 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc @@ -1,6 +1,3 @@ -project(IOGRTest): server, orbsvcsexe { - depends += FTORB IORManip - libs += TAO_FTORB TAO_IORManip +project(IOGRTest): taoserver, orbsvcsexe, iormanip, ftorb { exename = IOGRTest - comps += FTORB } diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc index 4495317318e..5c75a2ece83 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc +++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc @@ -1,4 +1,4 @@ -project: namingexe { +project(*server): namingexe { Source_Files { server_i.cpp MCast_Server_i.cpp @@ -6,7 +6,7 @@ project: namingexe { } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index 88426df1596..f5e19cebff8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -1,6 +1,4 @@ -project(airplane server) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(airplane server) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = airplane_server IDL_Files { @@ -16,9 +14,7 @@ project(airplane server) : server, orbsvcsexe, minimum_corba { } } -project(airplane client) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(airplane client) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = airplane_client IDL_Files { @@ -33,9 +29,7 @@ project(airplane client) : server, orbsvcsexe, minimum_corba { } } -project(nestea server) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(nestea server) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = nestea_server IDL_Files { @@ -51,9 +45,7 @@ project(nestea server) : server, orbsvcsexe, minimum_corba { } } -project(nestea client) : server, orbsvcsexe, minimum_corba { - depends += IORTable - libs += TAO_IORTable +project(nestea client) : taoserver, orbsvcsexe, minimum_corba, iortable { exename = nestea_client IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index fcea7321be4..b13db5bd77f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -1,4 +1,4 @@ -project(ImplRepo NameService) : namingexe, minimum_corba { +project: namingexe, minimum_corba { exename = test } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc index 8a641176f7e..33224b6317b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc @@ -1,17 +1,11 @@ -project: server { - depends += IFR_Client - libs += TAO_IFR_Client - +project(*server): taoserver, ifr_client { Source_Files { test_i.cpp server.cpp } } -project(client): server { - depends += IFR_Client DynamicInterface - libs += TAO_IFR_Client TAO_DynamicInterface - +project(*client): taoserver, ifr_client, dynamicinterface { IDL_Files { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc index 247e13d8593..7cba36180a2 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc @@ -1,5 +1,3 @@ -project(InterfaceRepo IFR Test): taoexe { - depends += IFR_Client - libs += TAO_IFR_Client +project: taoexe, ifr_client { exename = IFR_Test } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc index 6e421a842a0..2e1e428b9ee 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc @@ -1,5 +1,3 @@ -project(InterfaceRepo Persistence Test): taoexe { - depends += IFR_Client - libs += TAO_IFR_Client +project: taoexe, ifr_client { exename = Persistence_Test } diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc index 8ab0054fcdd..9d5c2d8ee91 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc @@ -1,3 +1,3 @@ -project(Interoperable Naming): namingexe { +project: namingexe { exename = client }
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc index fb0564cd91e..22511d8ea6d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc @@ -1,4 +1,4 @@ -project: server, orbsvcsexe { +project(*server): server, orbsvcsexe { comps += PortableGroup Source_Files { @@ -7,7 +7,7 @@ project: server, orbsvcsexe { } } -project: client, orbsvcsexe { +project(*client): client, orbsvcsexe { comps += PortableGroup Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc index 106b27d1b73..394ce4a885f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc +++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc @@ -1,4 +1,4 @@ -project(ConnectDisconnect): notifytest { +project(*Notify ConnectDisconnect): notifytest { exename = ConnectDisconnect Source_Files { @@ -7,7 +7,7 @@ project(ConnectDisconnect): notifytest { } -project(LifeCycle): notifytest { +project(*Notify LifeCycle): notifytest { exename = LifeCycle Source_Files { @@ -15,7 +15,7 @@ project(LifeCycle): notifytest { } } -project(IdAssignment): notifytest { +project(*Notify IdAssignment): notifytest { exename = IdAssignment Source_Files { @@ -23,7 +23,7 @@ project(IdAssignment): notifytest { } } -project(Events): notifytest { +project(*Notify Events): notifytest { exename = Events Source_Files { @@ -31,7 +31,7 @@ project(Events): notifytest { } } -project(AdminProperties): notifytest { +project(*Notify AdminProperties): notifytest { exename = AdminProperties Source_Files { @@ -39,7 +39,7 @@ project(AdminProperties): notifytest { } } -project(Simple): notifytest { +project(*Notify Simple): notifytest { exename = Simple Source_Files { @@ -47,3 +47,9 @@ project(Simple): notifytest { } } +project(*Notify MultiTypes): notifytest { + Source_Files { + MultiTypes.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc index 8a9b37f4cee..894e3967f93 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc +++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc index 2f4788cdadd..db543c60423 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc +++ b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc @@ -1,12 +1,6 @@ -project (Notify_Test_Destroy): notifytest { +project (Notify_Test_Destroy): notifytest, etcl, iortable, dynamicany, portableserver { exename = Notify_Tests_Destroy - - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - Source_Files { - main.cpp + main.cpp } }
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc index 737753c82e1..0da4cfb02a8 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc +++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { @@ -17,7 +17,7 @@ project(Structured Consumer): notifytest { } } -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -25,7 +25,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc index fc4556e54d0..1ae7ff46d8c 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc index 737753c82e1..0da4cfb02a8 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc +++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { @@ -17,7 +17,7 @@ project(Structured Consumer): notifytest { } } -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -25,7 +25,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc index ee79552a2b0..48e3e3aa096 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc @@ -1,19 +1,11 @@ +project: orbsvcslib, notify, rtcorba, rtportableserver { -project(TAO_RT_NotifyTests): orbsvcslib, notify { + after += TAO_NotifyTests + libs += TAO_NotifyTests - depends += TAO_NotifyTests RTPortableServer RTCORBA sharedname = TAO_RT_NotifyTests - libs += TAO_NotifyTests TAO_RTCORBA TAO_RTPortableServer - requires += rt_corba - libpaths += $(TAO_ROOT)/tao/RTCORBA - libpaths += $(TAO_ROOT)/tao/RTPortableServer - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - - dllflags = TAO_RT_NOTIFY_TEST_BUILD_DLL + dynamicflags = TAO_RT_NOTIFY_TEST_BUILD_DLL Source_Files{ RT_Application_Command.cpp diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc index a0d6a42a016..b7c685cccbd 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Multi_ETCL_Filter.mpc @@ -1,4 +1,4 @@ -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc index a0d6a42a016..b7c685cccbd 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc @@ -1,4 +1,4 @@ -project(Sequence Supplier): notifytest { +project(*Notify Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*Notify Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc index bc010fa07a2..5ee6ac4d4f7 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc index 90b199f6874..d8c014e0cab 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*Notify Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -7,7 +7,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*Notify Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc index 066e2d48a15..f2cc9d91a45 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc @@ -1,16 +1,8 @@ -project(TAO_RT_NotifyTests_Filter): orbsvcslib, notify { +project(TAO_RT_NotifyTests_Filter): orbsvcslib, notify, rtcorba, etcl, dynamicany, portableserver, iortable { sharedname = TAO_RT_NotifyTests_Filter - libs += TAO_CosNotification TAO_RTCORBA - requires += rt_corba - dllflags = TAO_RT_Test_Filter_BUILD_DLL - - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/RTCORBA + dynamicflags = TAO_RT_Test_Filter_BUILD_DLL IDL_Files { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc index ae9f81e625c..7e0cd7fbc09 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc @@ -1,55 +1,4 @@ -project(TAO_NotifyTests): orbsvcslib, notify { - depends += CosNotification - sharedname += TAO_NotifyTests - - libs += TAO_CosNotification - - libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL - libpaths += $(TAO_ROOT)/tao/IORTable - libpaths += $(TAO_ROOT)/tao/DynamicAny - libpaths += $(TAO_ROOT)/tao/PortableServer - - dllflags = TAO_NOTIFY_TEST_BUILD_DLL - - IDL_Files { - Activation_Manager.idl - } - - Source_Files{ - Activation_ManagerC.cpp - Activation_ManagerS.cpp - Peer.cpp - StructuredPushConsumer.cpp - SequencePushConsumer.cpp - PushConsumer.cpp - StructuredPushSupplier.cpp - SequencePushSupplier.cpp - PushSupplier.cpp - Direct_Consumer.cpp - Direct_Supplier.cpp - Relay_Consumer.cpp - Activation_Manager.cpp - Application_Command.cpp - Command.cpp - Command_Builder.cpp - Command_Factory.cpp - Command_Factory_T.cpp - ConsumerAdmin_Command.cpp - Driver.cpp - EventChannel_Command.cpp - Factories_Define.cpp - Filter_Command.cpp - LookupManager.cpp - Name.cpp - Notify_Test_Client.cpp - Options_Parser.cpp - Periodic_Consumer_Command.cpp - Periodic_Supplier_Command.cpp - Periodic_Consumer.cpp - Periodic_Supplier.cpp - Priority_Mapping.cpp - StructuredEvent.cpp - SupplierAdmin_Command.cpp - Task_Stats.cpp - } -} +project(NotifyTests_Lib): orbsvcslib, notify { + sharedname = NotifyTests + dynamicflags = TAO_NOTIFY_TEST_BUILD_DLL +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc index 737753c82e1..2712f4cdcca 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc @@ -1,4 +1,4 @@ -project(Structured Supplier): notifytest { +project(*notify perf Structured Supplier): notifytest { exename = Structured_Supplier Source_Files { @@ -6,7 +6,7 @@ project(Structured Supplier): notifytest { } } -project(Structured Consumer): notifytest { +project(*notify perf Structured Consumer): notifytest { exename = Structured_Consumer Source_Files { @@ -17,7 +17,7 @@ project(Structured Consumer): notifytest { } } -project(Sequence Supplier): notifytest { +project(*notify perf Sequence Supplier): notifytest { exename = Sequence_Supplier Source_Files { @@ -25,7 +25,7 @@ project(Sequence Supplier): notifytest { } } -project(Sequence Consumer): notifytest { +project(*notify perf Sequence Consumer): notifytest { exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc index 71a8b8973df..84a3653adac 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc @@ -1,3 +1,3 @@ -project(RedGreen): notifytest { +project(*notify perf RedGreen): notifytest { exename = RedGreen_Test } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc index 3279c094b0b..144536943a2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc @@ -1,5 +1,3 @@ -project(Throughput): notifytest, strategies { - depends += Messaging - libs += TAO_Messaging +project(*notify perf Throughput): notifytest, strategies, messaging { exename = Throughput } diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index a518e2928c2..a522e058a80 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -1,19 +1,11 @@ -project: server, namingexe { - depends += CosProperty - libs += TAO_CosProperty - comps += Property - +project(*server): taoserver, namingexe, property { Source_Files { server.cpp } } -project(client): server, namingexe { - depends += CosProperty - libs += TAO_CosProperty +project(*client): server, namingexe, property { exename = client - comps += Property - Source_Files { server.cpp } diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc index 109e9d8e637..598c380e154 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc +++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc @@ -1,4 +1,4 @@ -project(Redundant Naming Client) : namingexe { +project(*Client) : namingexe { exename = client } diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc index 2bb97fe9c19..867eebf770d 100644 --- a/TAO/orbsvcs/tests/Sched/Sched.mpc +++ b/TAO/orbsvcs/tests/Sched/Sched.mpc @@ -1,6 +1,3 @@ -project(Sched): server, namingexe { - depends += RTSched - libs += TAO_RTSched +project: taoserver, namingexe, rtsched { exename = Sched - comps += Sched } diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc index 0ea29a538af..e51d0d2888f 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc @@ -1,9 +1,5 @@ -project(Sched Conf): server, namingexe { - depends += RTSched - libs += TAO_RTSched +project: taoserver, namingexe, rtsched { exename = Sched_Conf - comps += Sched - Source_Files { Sched_Conf.cpp } diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc index 4ce6682b786..d2151a236e9 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc +++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc @@ -1,17 +1,11 @@ -project: server { - depends += SSL - requires += ssl - +project(*security server): taoserver, ssl { Source_Files { TX_Object_i.cpp server.cpp } } -project: client { - depends += SSL - requires += ssl - +project(*security client): taoclient, ssl { Source_Files { TX_ObjectC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc index 0d1d1a9e008..afe593a5d41 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc +++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc @@ -1,7 +1,4 @@ -project: server { - depends += SSL - requires += ssl - +project(*security server): taoserver, ssl { IDL_Files { server.idl client.idl @@ -16,10 +13,8 @@ project: server { } } -project(client): server { +project(*security client): taoserver, ssl { exename = client - depends += SSL - requires += ssl IDL_Files { server.idl diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc index 36887871fbb..2736c3d344c 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc @@ -1,4 +1,4 @@ -project: server { +project(*security server): orbsvcsexe, portableserver, ssl { Source_Files { Server_Worker.cpp test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(*security client): orbsvcsexe, ssl { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc index 36887871fbb..18d3f89fc68 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_SSLIOP.mpc @@ -1,4 +1,4 @@ -project: server { +project(* security server): taoserver { Source_Files { Server_Worker.cpp test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(* security client): taoclient { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc index 36887871fbb..2736c3d344c 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc @@ -1,4 +1,4 @@ -project: server { +project(*security server): orbsvcsexe, portableserver, ssl { Source_Files { Server_Worker.cpp test_i.cpp @@ -6,7 +6,7 @@ project: server { } } -project: client { +project(*security client): orbsvcsexe, ssl { Source_Files { testC.cpp Client_Worker.cpp diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc index 29eba59b7bd..5e37463cfc5 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc @@ -1,20 +1,12 @@ -project: server, orbsvcsexe { +project(*security server): taoserver, orbsvcsexe, security, ssl { ssl = 1 - depends += Security SSL - libs += TAO_Security - requires += ssl - Source_Files { Foo_i.cpp server.cpp } } -project: client, orbsvcsexe { - depends += Security SSL - libs += TAO_Security - requires += ssl - +project(*security client): taoclient, orbsvcsexe, security, ssl { Source_Files { FooC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc index e3ce0a1cbbe..116fa15bce0 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc @@ -1,18 +1,12 @@ -project: server, orbsvcsexe { +project(*security server): taoserver, orbsvcsexe, ssl, security { ssl = 1 - depends += Security SSL - libs += TAO_Security - requires += ssl Source_Files { SLevel1_Test_i.cpp server.cpp } } -project: client, orbsvcsexe { - depends += Security SSL - libs += TAO_Security - requires += ssl +project(*security client): taoclient, orbsvcsexe, ssl, security { Source_Files { SLevel1_TestC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 9bab3528979..71352b6ae9c 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,4 +1,4 @@ -project(Simple Naming Client) : namingexe { +project(*Client) : namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc index 3aebba805f0..6939095c7fd 100644 --- a/TAO/orbsvcs/tests/Time/Time.mpc +++ b/TAO/orbsvcs/tests/Time/Time.mpc @@ -1,6 +1,3 @@ -project(client): server, namingexe { - depends += CosTime - libs += TAO_CosTime +project(*client): taoserver, namingexe, time { exename = client - comps += Time } diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index 4923114a3ee..94db6d210e4 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -1,8 +1,6 @@ -project(Trading Test Lib): orbsvcslib { - depends += CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer TAO - libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO +project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver { sharedname = TTest - comps += Trader + dynamicflags = TRADING_TEST_BUILD_DLL Source_Files { TT_Info.cpp @@ -11,13 +9,20 @@ project(Trading Test Lib): orbsvcslib { Offer_Importer.cpp Simple_Dynamic.cpp } + Header_Files { + ttest_export.h + TT_Info.h + Service_Type_Exporter.h + Offer_Exporter.h + Offer_Importer.h + Simple_Dynamic.h + } } -project(export test): namingexe { - depends += Trading_Test_Lib CosTrading DynamicAny - libs += TTest TAO_CosTrading TAO_DynamicAny +project(*export test): namingexe, trading, dynamicany { + after += Trading_Test_Lib + libs += TTest exename = export_test - comps += Trader IDL_Files { } @@ -27,11 +32,10 @@ project(export test): namingexe { } } -project(import test): namingexe { - depends += Trading_Test_Lib CosTrading DynamicAny - libs += TTest TAO_CosTrading TAO_DynamicAny +project(*import test): namingexe, trading, dynamicany { + after += Trading_Test_Lib + libs += TTest exename = import_test - comps += Trader IDL_Files { } @@ -41,11 +45,10 @@ project(import test): namingexe { } } -project(colocated test): namingexe { - depends += Trading_Test_Lib CosTrading DynamicAny - libs += TTest TAO_CosTrading TAO_DynamicAny +project(*colocated test): namingexe, trading, dynamicany { + after += Trading_Test_Lib + libs += TTest exename = colocated_test - comps += Trader IDL_Files { } diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc index d30a93ca5f5..3015d82a066 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc @@ -1,14 +1,11 @@ -project: namingexe { - depends += CosNaming - libs += TAO_CosNaming - +project(*server): namingexe, naming { Source_Files { status_i.cpp server.cpp } } -project(client): namingexe { +project(*client): namingexe { exename = client Source_Files { diff --git a/TAO/orbsvcs/tests/tests.mwc b/TAO/orbsvcs/tests/tests.mwc new file mode 100644 index 00000000000..d90104a2381 --- /dev/null +++ b/TAO/orbsvcs/tests/tests.mwc @@ -0,0 +1,2 @@ +workspace { +} diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc index 04f5f1b0448..69929f9d4d9 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc @@ -1,3 +1,3 @@ -project(tests svc loader): taoexe, minimum_corba { +project: taoexe, minimum_corba { exename = tests_svc_loader } |