diff options
74 files changed, 204 insertions, 248 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 860c08f089b..442b02b0590 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,81 @@ +Wed Aug 11 09:36:16 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc: + * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc: + * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc: + * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc: + * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc: + * examples/OBV/Typed_Events/Typed_Events.mpc: + * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc: + * examples/POA/DSI/POA_DSI.mpc: + * examples/POA/Default_Servant/POA_Default_Servant.mpc: + * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc: + * examples/POA/FindPOA/POA_FindPOA.mpc: + * examples/POA/Forwarding/POA_Forwarding.mpc: + * examples/POA/Generic_Servant/POA_Generic_Servant.mpc: + * examples/POA/Loader/POA_Loader.mpc: + * examples/POA/NewPOA/POA_NewPOA.mpc: + * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc: + * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc: + * examples/POA/POA_BiDir/POA_BiDir.mpc: + * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc: + * examples/POA/TIE/POA_TIE.mpc: + * examples/Quoter/Quoter.mpc: + * examples/TypeCode_Creation/TypeCode_Creation.mpc: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc: + * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc: + * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc: + * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc: + * orbsvcs/examples/ORT/ORT.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLoadBalancing.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/FtRtEvent.mpc: + * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc: + * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc: + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc: + * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc: + * orbsvcs/tests/Bug_1630_Regression/test.mpc: + * orbsvcs/tests/FT_App/FT_App.mpc: + * orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc: + * orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc: + * orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc: + * orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc: + * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc: + * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc: + * performance-tests/Latency/DII/DII.mpc: + * performance-tests/Latency/DSI/DSI.mpc: + * performance-tests/Latency/Deferred/Deferred.mpc: + * performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc: + * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc: + * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc: + * performance-tests/Sequence_Latency/DII/DII.mpc: + * performance-tests/Sequence_Latency/DSI/DSI.mpc: + * performance-tests/Sequence_Latency/Deferred/Deferred.mpc: + * tao/DynamicInterface.mpc: + * tests/Bug_1636_Regression/test.mpc: + * tests/POA/Default_Servant/Default_Servant.mpc: + * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc: + * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc: + * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc: + * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc: + * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc: + * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc: + * tests/RTCORBA/Policies/Policies.mpc: + * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc: + * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc: + * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc: + * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc: + * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc: + * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc: + Changed to inherit from minimum_corba instead of providing avoids + statements to eliminate duplicate entries in list. + Wed Aug 11 13:20:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Oneway_Buffering/admin.cpp: diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc index f5965752877..483e86313de 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc @@ -1,18 +1,16 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, event, naming { +project(*client) : orbsvcsexe, portableserver, event, naming, minimum_corba { requires += exceptions - avoids += minimum_corba source_files { client.cpp Stock_Consumer.cpp } } -project(*server) : orbsvcsexe, portableserver, event, naming { +project(*server) : orbsvcsexe, portableserver, event, naming, minimum_corba { requires += exceptions - avoids += minimum_corba source_files { server.cpp Stock_Factory_i.cpp diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc index b3226bc8160..a6df82cb29a 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc @@ -1,18 +1,16 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, naming, ami { +project(*client) : taoexe, portableserver, naming, ami, minimum_corba { requires += exceptions - avoids += minimum_corba source_files { client.cpp Handler_i.cpp } } -project(*server) : taoexe, portableserver, naming, ami { +project(*server) : taoexe, portableserver, naming, ami, minimum_corba { requires += exceptions - avoids += minimum_corba source_files { server.cpp Stock_Factory_i.cpp diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc index 785c8628d04..5134a909130 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc @@ -1,18 +1,16 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, rtevent, naming { +project(*client) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba { requires += exceptions - avoids += minimum_corba source_files { client.cpp Stock_Consumer.cpp } } -project(*server) : orbsvcsexe, portableserver, rtevent, naming { +project(*server) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba { requires += exceptions - avoids += minimum_corba source_files { server.cpp Stock_Factory_i.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc index 202171a2f9e..d7152082ec0 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc @@ -1,6 +1,5 @@ // $Id$ -project : taoexe, portableserver { - avoids += minimum_corba +project : taoexe, portableserver, minimum_corba { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib includes += ../../idl diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc index 4be2d6c7ce4..84bdfb0f588 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc @@ -1,8 +1,8 @@ // -*- MPC -*- // $Id$ -project(*balancer): taoexe, portableserver { - avoids += minimum_corba repo +project(*balancer): taoexe, portableserver, minimum_corba { + avoids += repo exename = load_balancer IDL_Files { @@ -17,8 +17,8 @@ project(*balancer): taoexe, portableserver { } } -project(*server): taoserver { - avoids += minimum_corba repo +project(*server): taoserver, minimum_corba { + avoids += repo Source_Files { IdentityC.cpp @@ -29,8 +29,8 @@ project(*server): taoserver { } } -project(*client): taoclient, portableserver { - avoids += minimum_corba repo +project(*client): taoclient, portableserver, minimum_corba { + avoids += repo exename = client Source_Files { diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index f38edeefc8c..ce1d87be55f 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver, valuetype { - avoids += minimum_corba +project(*server): taoexe, portableserver, valuetype, minimum_corba { Source_Files { Server_i.cpp Event_Types_impl.cpp @@ -11,8 +10,7 @@ project(*server): taoexe, portableserver, valuetype { } } -project(*client): taoexe, portableserver, valuetype { - avoids += minimum_corba +project(*client): taoexe, portableserver, valuetype, minimum_corba { Source_Files { Client_i.cpp Event_Types_impl.cpp diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc index 92e0254b024..7f01d95962a 100644 --- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc +++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { - avoids += minimum_corba +project(*Server): taoexe, portableserver, minimum_corba { includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc index 19d9e4f61a2..04d3e67fc42 100644 --- a/TAO/examples/POA/DSI/POA_DSI.mpc +++ b/TAO/examples/POA/DSI/POA_DSI.mpc @@ -1,13 +1,11 @@ //$Id$ -project(*Client) : taoexe, messaging, portableserver { - avoids += minimum_corba +project(*Client) : taoexe, messaging, portableserver, minimum_corba { source_files { client.cpp } } -project(*Server) : taoexe, messaging, portableserver, dynamicinterface{ - avoids += minimum_corba +project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba { source_files { Database_i.cpp server.cpp diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc index dd0c0d645cd..779807622d3 100644 --- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc +++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Client) : taoexe, portableserver { - avoids += minimum_corba +project(*Client) : taoexe, portableserver, minimum_corba { source_files { client.cpp } } -project(*Server) : taoexe, portableserver { - avoids += minimum_corba +project(*Server) : taoexe, portableserver, minimum_corba { source_files { File_i.cpp server.cpp diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc index 92e0254b024..7f01d95962a 100644 --- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc +++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { - avoids += minimum_corba +project(*Server): taoexe, portableserver, minimum_corba { includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc index e2176127181..e5743eb768c 100644 --- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc +++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoexe, portableserver { - avoids += minimum_corba +project: taoexe, portableserver, minimum_corba { } diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc index e8b34068166..6356aeab319 100644 --- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc +++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Client) : taoexe, portableserver { - avoids += minimum_corba +project(*Client) : taoexe, portableserver, minimum_corba { source_files { client.cpp } } -project(*Server) : taoexe, portableserver { - avoids += minimum_corba +project(*Server) : taoexe, portableserver, minimum_corba { source_files { test_i.cpp server.cpp diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc index 5ddbc1753a3..0cc793eef25 100644 --- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc +++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc @@ -1,6 +1,5 @@ // $Id$ -project(*lib): taolib_with_idl, portableserver { - avoids += minimum_corba +project(*lib): taolib_with_idl, portableserver, minimum_corba { sharedname = Generic_Servant dynamicflags = GENERIC_SERVANT_BUILD_DLL idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h @@ -9,8 +8,7 @@ project(*lib): taolib_with_idl, portableserver { } } -project(*client): taoexe, portableserver { - avoids += minimum_corba +project(*client): taoexe, portableserver, minimum_corba { after += *lib libs += Generic_Servant idl_files { diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc index 08d63c26e51..5fb4927d770 100644 --- a/TAO/examples/POA/Loader/POA_Loader.mpc +++ b/TAO/examples/POA/Loader/POA_Loader.mpc @@ -1,6 +1,5 @@ // $Id$ -project(*Server): taoexe, portableserver { - avoids += minimum_corba +project(*Server): taoexe, portableserver, minimum_corba { Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc index de7282249a6..b330e9a825f 100644 --- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc +++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc @@ -1,4 +1,3 @@ //$Id$ -project : taoexe, portableserver { - avoids += minimum_corba +project : taoexe, portableserver, minimum_corba { } diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc index 04ca8b96d72..57a09f749b8 100644 --- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc +++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { - avoids += minimum_corba +project(*Server): taoexe, portableserver, minimum_corba { includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc index 6c3c72f5505..843c856715b 100644 --- a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc +++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { - avoids += minimum_corba +project(*Server): taoexe, portableserver, minimum_corba { Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc index d1e881a3dab..368e062cbc6 100644 --- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc +++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc @@ -1,8 +1,5 @@ // -*- MPC -*- // $Id$ -project: taoexe, portableserver, bidir_giop { - - avoids += minimum_corba +project: taoexe, portableserver, bidir_giop, minimum_corba { } - diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc index 6f42aaf7f48..0b54971c2cb 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc +++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver { - avoids += minimum_corba +project(*Server): taoexe, portableserver, minimum_corba { includes += ../Generic_Servant libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc index e921c19724a..e517831c421 100644 --- a/TAO/examples/POA/TIE/POA_TIE.mpc +++ b/TAO/examples/POA/TIE/POA_TIE.mpc @@ -1,16 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Client) : taoexe, portableserver { - avoids += minimum_corba +project(*Client) : taoexe, portableserver, minimum_corba { source_files { client.cpp testC.cpp } } -project(*Server) : taoexe, portableserver { - avoids += minimum_corba +project(*Server) : taoexe, portableserver, minimum_corba { source_files { test_i.cpp server.cpp diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index c48f1565830..f972a2040d5 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -4,8 +4,7 @@ // todo : Once MPC is used for everything, we should consider // removing the includes += lines below, and updating // the source code instead. -project(*server): namingexe, lifecycle { - avoids += minimum_corba +project(*server): namingexe, lifecycle, minimum_corba { idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { @@ -14,8 +13,7 @@ project(*server): namingexe, lifecycle { } } -project(*client): namingexe, lifecycle { - avoids += minimum_corba +project(*client): namingexe, lifecycle, minimum_corba { idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { @@ -23,8 +21,7 @@ project(*client): namingexe, lifecycle { } } -project(*Factory Finder): namingexe, lifecycle { - avoids += minimum_corba +project(*Factory Finder): namingexe, lifecycle, minimum_corba { idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { @@ -33,8 +30,7 @@ project(*Factory Finder): namingexe, lifecycle { } } -project(*Generic Factory): namingexe, lifecycle { - avoids += minimum_corba +project(*Generic Factory): namingexe, lifecycle, minimum_corba { idlflags += -I../../orbsvcs/orbsvcs includes += ../../orbsvcs/orbsvcs Source_Files { diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc index 7eaef3102a4..1bdbc4e848d 100644 --- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc +++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc @@ -1,7 +1,6 @@ // $Id$ -project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client { - avoids += minimum_corba +project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, minimum_corba { exename = create_tc Source_Files { testC.cpp diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index c8b0643d09c..c2a7cbd377d 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,8 +1,7 @@ // $Id$ -project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup { +project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup, minimum_corba { sharedname = TAO_ReplicationManagerLib dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL - avoids += minimum_corba Source_Files { FT_FaultAnalyzer.cpp diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index ce6a8681ac2..78caf4b51cf 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, lifecycle, naming, trading { - avoids += minimum_corba +project : orbsvcsexe, core, lifecycle, naming, trading, minimum_corba { exename = LifeCycle_Service } diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc index 589a889ed25..4e1a9ef09ce 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc @@ -1,6 +1,5 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, notification, naming { - avoids += minimum_corba +project : orbsvcsexe, notification, naming, minimum_corba { } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc index 2be127fbfd1..ed469821a28 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc @@ -1,6 +1,5 @@ // $Id$ -project(*Supplier): rtnotify, notifytest, rtportableserver { - avoids += minimum_corba +project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { exename = Supplier Source_Files { Supplier.cpp @@ -10,8 +9,7 @@ project(*Supplier): rtnotify, notifytest, rtportableserver { } } -project(*Consumer): rtnotify, notifytest, rtportableserver { - avoids += minimum_corba +project(*Consumer): rtnotify, notifytest, rtportableserver, minimum_corba { exename = Consumer Source_Files { Consumer.cpp diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc index c7442bcc119..91a32c4f34f 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -1,6 +1,5 @@ // $Id$ -project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client { - avoids += minimum_corba +project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { source_files { GatewayC.cpp GatewayS.cpp @@ -13,10 +12,9 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client { } } -project(*Server) : orbsvcsexe, dynamicinterface, ifr_client { +project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { exename = server after += *Gateway - avoids += minimum_corba source_files { server.cpp GatewayC.cpp @@ -34,8 +32,7 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client { } } -project(*Client) : orbsvcsexe, event { - avoids += minimum_corba +project(*Client) : orbsvcsexe, event, minimum_corba { after += *Server source_files { client.cpp diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 9181b72a2da..e4b4dbbc7ad 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,8 +1,7 @@ // $Id$ -project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming { +project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming, minimum_corba { sharedname = TAO_CosEvent - avoids += minimum_corba // Warning : The idlflags must match exactly those used in // CosNotification, because we don't know which project diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index 4c8b075c744..65e9144f3a6 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -1,12 +1,11 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, core, naming, iormanip, portablegroup, ami { +project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba { sharedname = TAO_CosLoadBalancing idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL tagchecks += CosLoadBalancing - avoids += minimum_corba IDL_Files { CosLoadBalancing.idl diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 1b34fde8571..8c0718157c5 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,12 +1,11 @@ // -*- MPC -*- // $Id$ -project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup { +project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup, minimum_corba { sharedname = TAO_FaultTolerance idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_BUILD_DLL tagchecks += FaultTolerance - avoids += minimum_corba IDL_Files { FT_CORBA.idl diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 693d2fb5c50..73fb2b39d93 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -1,9 +1,8 @@ // -*- MPC -*- // $Id$ -project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming { +project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming, minimum_corba { sharedname = TAO_FtRtEvent - avoids += minimum_corba idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc index 7c40937df34..079da1f50f9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc @@ -1,9 +1,8 @@ // $Id$ -project: orbsvcsexe, rtcorbaevent, strategies { +project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { driver.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc index 37968d5d018..8071ce1b8d5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc @@ -1,20 +1,18 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies { +project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { server.cpp } } -project(*client): orbsvcsexe, rtcorbaevent, strategies { +project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc index b30da066e4c..21b9f66db74 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -1,9 +1,8 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies { +project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { server.cpp @@ -11,11 +10,10 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies { +project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc index 888b449e615..b0f8e782677 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -1,9 +1,8 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies { +project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { server.cpp @@ -12,11 +11,10 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies { +project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc index b19cf565d20..431a4fbd726 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc @@ -1,20 +1,18 @@ // $Id$ -project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies { +project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { server.cpp } } -project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies { +project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc index abef2e1dff7..b337568bab2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc @@ -1,20 +1,18 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies { +project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { server.cpp } } -project(*client): orbsvcsexe, rtcorbaevent, strategies { +project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - avoids += minimum_corba Source_Files { client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc index 35ee463a899..2f7c48e06c2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc @@ -1,6 +1,5 @@ // $Id$ -project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba { - avoids += minimum_corba +project(RTEC_Perf): strategies, messaging, orbsvcslib, rtcorbaevent, rtevent, naming, svc_utils, iortable, rtportableserver, rtcorba, minimum_corba { sharedname = TAO_RTEC_Perf idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h dynamicflags += TAO_RTEC_PERF_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc index 750a79f00ef..99300dbb59d 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc @@ -1,11 +1,10 @@ // -*- MPC -*- // $Id$ -project(Bug_1630_testclient ) : taoexe { +project(Bug_1630_testclient ) : taoexe, minimum_corba { exename = testclient libs += TAO_IFR_Client libpaths += $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao $(ACE_ROOT)/ace - avoids += minimum_corba IDL_Files { } diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc index 9b9fbca1e5b..80540d3324b 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc +++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc @@ -1,8 +1,7 @@ // $Id$ -project(*Server): taoserver, fault_tolerance, orbsvcsexe{ +project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba { exename = ft_replica - avoids += minimum_corba Source_Files { FT_Replica.cpp FT_TestReplica_i.cpp @@ -35,9 +34,8 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe{ } } -project(*Client): taoclient, fault_tolerance, orbsvcsexe { +project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { exename = ft_client - avoids += minimum_corba includes += $(TAO_ROOT) after += *Server Source_Files { @@ -47,9 +45,8 @@ project(*Client): taoclient, fault_tolerance, orbsvcsexe { } } -project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe { +project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_corba { exename = ft_notifier - avoids += minimum_corba Source_Files { FTAPP_Notifier_Main.cpp StubFaultNotifier.cpp @@ -79,9 +76,8 @@ project(*Analyzer): taoclient, fault_tolerance, orbsvcsexe { } } -project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe { +project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe, minimum_corba { exename = ft_fault_consumer - avoids += minimum_corba libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib Source_Files { @@ -96,9 +92,8 @@ project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe { } } -project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe { +project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { exename = ft_registry - avoids += minimum_corba Source_Files { FTAPP_FactoryRegistry_Main.cpp @@ -114,9 +109,8 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe { } } -project(*Creator): taoclient, fault_tolerance, orbsvcsexe { +project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { exename = ft_create - avoids += minimum_corba Source_Files { FT_Creator.cpp @@ -131,9 +125,8 @@ project(*Creator): taoclient, fault_tolerance, orbsvcsexe { } } -project(*RMController): taoclient, fault_tolerance, orbsvcsexe { +project(*RMController): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { exename = replmgr_controller - avoids += minimum_corba Source_Files { FT_ReplicationManagerController.cpp } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc index 2c14a302961..3396f7a98fe 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver, ifr_client { - avoids += minimum_corba +project(*server): taoexe, portableserver, ifr_client, minimum_corba { Source_Files { test_i.cpp @@ -10,8 +9,7 @@ project(*server): taoexe, portableserver, ifr_client { } } -project(*client): taoexe, portableserver, ifr_client, dynamicinterface { - avoids += minimum_corba +project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba { IDL_Files { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc index a34e2eafcf1..e1f0a71cc46 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client { - avoids += minimum_corba +project: taoexe, ifr_client, minimum_corba { exename = IDL3_Test Source_Files { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc index 722bf26f64d..c351c9ef039 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client { - avoids += minimum_corba +project: taoexe, ifr_client, minimum_corba { exename = IFR_Test } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc index d9ae7520f6b..57112a88744 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client { - avoids += minimum_corba +project: taoexe, ifr_client, minimum_corba { exename = Persistence_Test } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc index 3bc2661b6b9..0c726ed4014 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc @@ -1,14 +1,12 @@ // $Id$ -project(*Ntf Perf Struct Supp): notifytest { - avoids += minimum_corba +project(*Ntf Perf Struct Supp): notifytest, minimum_corba { exename = Structured_Supplier Source_Files { Structured_Supplier.cpp } } -project(*Ntf Perf Struct Cons): notifytest { - avoids += minimum_corba +project(*Ntf Perf Struct Cons): notifytest, minimum_corba { exename = Structured_Consumer Source_Files { goC.cpp @@ -18,16 +16,14 @@ project(*Ntf Perf Struct Cons): notifytest { } } -project(*Ntf Perf Seq Supp): notifytest { - avoids += minimum_corba +project(*Ntf Perf Seq Supp): notifytest, minimum_corba { exename = Sequence_Supplier Source_Files { Sequence_Supplier.cpp } } -project(*notify perf Sequence Consumer): notifytest { - avoids += minimum_corba +project(*notify perf Sequence Consumer): notifytest, minimum_corba { exename = Sequence_Consumer Source_Files { goC.cpp diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc index 2dbe9ad8891..b16923c43da 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project(*Ntf Perf Throughput): notifytest, strategies, messaging { - avoids += minimum_corba +project(*Ntf Perf Throughput): notifytest, strategies, messaging, minimum_corba { exename = Throughput } diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc index ba46360e274..c0c97e91f12 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc @@ -1,10 +1,9 @@ // -*- MPC -*- // $Id$ -project(*client): taoexe, portableserver, strategies, dynamicinterface { +project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { after += IDL_Cubit_Server idlflags += -Gd - avoids += minimum_corba Source_Files { cubitC.cpp diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc index eb9d686f728..3b7ab57a9c9 100644 --- a/TAO/performance-tests/Latency/DII/DII.mpc +++ b/TAO/performance-tests/Latency/DII/DII.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*latency server): taoexe, portableserver, strategies { - avoids += minimum_corba +project(*latency server): taoexe, portableserver, strategies, minimum_corba { Source_Files { Roundtrip.cpp @@ -10,8 +9,7 @@ project(*latency server): taoexe, portableserver, strategies { } } -project(*latency client): taoexe, portableserver, strategies, dynamicinterface { - avoids += minimum_corba +project(*latency client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { Source_Files { client.cpp diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc index 2666d39006d..3d099c9d4da 100644 --- a/TAO/performance-tests/Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Latency/DSI/DSI.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*latency server): taoexe, portableserver, strategies, dynamicinterface { - avoids += minimum_corba +project(*latency server): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { IDL_Files { } @@ -13,8 +12,7 @@ project(*latency server): taoexe, portableserver, strategies, dynamicinterface { } } -project(*latency client): taoexe, strategies { - avoids += minimum_corba +project(*latency client): taoexe, strategies, minimum_corba { Source_Files { TestC.cpp diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc index 8d55ee55feb..582246b039f 100644 --- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver, strategies { - avoids += minimum_corba +project(*server): taoexe, portableserver, strategies, minimum_corba { Source_Files { Roundtrip.cpp @@ -10,8 +9,7 @@ project(*server): taoexe, portableserver, strategies { } } -project(*client): taoexe, portableserver, strategies, dynamicinterface { - avoids += minimum_corba +project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { Source_Files { TestC.cpp diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc index bfb4380bccc..3319967277c 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc @@ -1,6 +1,5 @@ // $Id$ -project(RTCORBA_Common): taolib_with_idl, portableserver { - avoids += minimum_corba +project(RTCORBA_Common): taolib_with_idl, portableserver, minimum_corba { sharedname = RTCORBA_Common requires += rt_corba idlflags += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc index ee1af8fb5bf..0819f051562 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): rt_server, strategies, rtcorbacommon { - avoids += minimum_corba +project(*server): rt_server, strategies, rtcorbacommon, minimum_corba { Source_Files { server.cpp } diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc index 2dd87870427..d5803b64f2d 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc @@ -1,15 +1,13 @@ // $Id$ -project(*oneways server RT): rt_server, messaging { - avoids += minimum_corba +project(*oneways server RT): rt_server, messaging, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*oneways client RT): rt_client, messaging { - avoids += minimum_corba +project(*oneways client RT): rt_client, messaging, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc index f7a311aff6d..cc658473947 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*RTCorba server): rt_server { - avoids += minimum_corba +project(*RTCorba server): rt_server, minimum_corba { Source_Files { server.cpp } } -project(*RTCorba client): rt_client { - avoids += minimum_corba +project(*RTCorba client): rt_client, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc index da11b30d725..10900fc5f8f 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc +++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(* sequence server): server, strategies { - avoids += minimum_corba +project(* sequence server): server, strategies, minimum_corba { Source_Files { Roundtrip.cpp @@ -10,9 +9,8 @@ project(* sequence server): server, strategies { } } -project(* sequence client): server, strategies, dynamicinterface { +project(* sequence client): server, strategies, dynamicinterface, minimum_corba { exename = client - avoids += minimum_corba Source_Files { TestC.cpp diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc index 38fb2d8acdb..8aa01068f30 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*sequence server) : server, strategies, dynamicinterface { - avoids += minimum_corba +project(*sequence server) : server, strategies, dynamicinterface, minimum_corba { Source_Files { Roundtrip.cpp server.cpp } } -project(*sequence client): taoexe, strategies { - avoids += minimum_corba +project(*sequence client): taoexe, strategies, minimum_corba { Source_Files { TestC.cpp client.cpp diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc index da11b30d725..10900fc5f8f 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(* sequence server): server, strategies { - avoids += minimum_corba +project(* sequence server): server, strategies, minimum_corba { Source_Files { Roundtrip.cpp @@ -10,9 +9,8 @@ project(* sequence server): server, strategies { } } -project(* sequence client): server, strategies, dynamicinterface { +project(* sequence client): server, strategies, dynamicinterface, minimum_corba { exename = client - avoids += minimum_corba Source_Files { TestC.cpp diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc index 4add99313e9..31e066f9c33 100644 --- a/TAO/tao/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface.mpc @@ -1,6 +1,5 @@ //$Id$ -project : taolib, core, messaging { - avoids += minimum_corba +project : taolib, core, messaging, minimum_corba { sharedname = TAO_DynamicInterface dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc index 194e1e090d1..fff450cca15 100644 --- a/TAO/tests/Bug_1636_Regression/test.mpc +++ b/TAO/tests/Bug_1636_Regression/test.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project (bug_1636_testclient) : taoexe, dynamicany, dynamicinterface, portableserver { - avoids += minimum_corba +project (bug_1636_testclient) : taoexe, dynamicany, dynamicinterface, portableserver, minimum_corba { exename = client IDL_Files { diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc index 749786fdc8a..c96018f073f 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc +++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA Default Servant): taoserver { +project(POA Default Servant): taoserver, minimum_corba { exename = Default_Servant - avoids += minimum_corba } diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc index 1fcc6facae2..6443ce82a36 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc @@ -1,6 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver { - avoids += minimum_corba +project(POA*): taoexe, portableserver, minimum_corba { } diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 2e4c9d4fd1f..7138aa20720 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -1,16 +1,14 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, rtcorba { - avoids += minimum_corba +project(*client) : taoexe, portableserver, rtcorba, minimum_corba { source_files { client.cpp Custom_Network_Priority_Mapping.cpp } } -project(*server) : taoexe, rtportableserver, rtcorba { - avoids += minimum_corba +project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { 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 5b41a9b0826..10ba9a8a48f 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server { - avoids += minimum_corba +project(*Server): strategies, rt_server, minimum_corba { Source_Files { server.cpp } } -project(*Client): strategies, rt_client { - avoids += minimum_corba +project(*Client): strategies, rt_client, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 16c54a31b82..0f82a323a72 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server { - avoids += minimum_corba +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client { - avoids += minimum_corba +project(*Client): rt_client, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc index 5b41a9b0826..10ba9a8a48f 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server { - avoids += minimum_corba +project(*Server): strategies, rt_server, minimum_corba { Source_Files { server.cpp } } -project(*Client): strategies, rt_client { - avoids += minimum_corba +project(*Client): strategies, rt_client, minimum_corba { 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 81573c2dfab..0662db7fb4e 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server { - avoids += minimum_corba +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } } -project(*Client): taoexe { - avoids += minimum_corba +project(*Client): taoexe, minimum_corba { requires += rt_corba Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc index b4b68d36e7a..1e97eefaee4 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.mpc +++ b/TAO/tests/RTCORBA/Policies/Policies.mpc @@ -1,6 +1,5 @@ // -*- MPC -*- // $Id$ -project(RTCORBA Policies Server): rt_server { - avoids += minimum_corba +project(RTCORBA Policies Server): rt_server, minimum_corba { } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index 399abfea95e..49d690018fd 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server { - avoids += minimum_corba +project(*Server): rt_server, minimum_corba { Source_Files { server.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 6902d4a09fb..4cb4bcb6c23 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 @@ -1,16 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server { - avoids += minimum_corba +project(*Server): strategies, rt_server, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client { - avoids += minimum_corba +project(*Client): strategies, rt_client, minimum_corba { Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 16c54a31b82..0f82a323a72 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server { - avoids += minimum_corba +project(*Server): rt_server, minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client { - avoids += minimum_corba +project(*Client): rt_client, minimum_corba { 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 220bbb47171..81a533380b3 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -1,13 +1,11 @@ // $Id$ -project(*Server): rt_server, strategies, portableserver { - avoids += minimum_corba +project(*Server): rt_server, strategies, portableserver, minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client, strategies, portableserver { - avoids += minimum_corba +project(*Client): rt_client, strategies, portableserver, minimum_corba { Source_Files { 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 5b41a9b0826..10ba9a8a48f 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -1,15 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server { - avoids += minimum_corba +project(*Server): strategies, rt_server, minimum_corba { Source_Files { server.cpp } } -project(*Client): strategies, rt_client { - avoids += minimum_corba +project(*Client): strategies, rt_client, minimum_corba { 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 6902d4a09fb..4cb4bcb6c23 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -1,16 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server { - avoids += minimum_corba +project(*Server): strategies, rt_server, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client { - avoids += minimum_corba +project(*Client): strategies, rt_client, minimum_corba { Source_Files { testC.cpp client.cpp |