diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-27 08:31:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-27 08:31:26 +0000 |
| commit | a5b89137a3e1056abd22a2865054a522b8ee3f4f (patch) | |
| tree | f46e17e6305ab34df29382a38730ec3b3c5c7c4a | |
| parent | b0e3fb52ae5141e200b5924c1781e2483720ff20 (diff) | |
| download | ATCD-a5b89137a3e1056abd22a2865054a522b8ee3f4f.tar.gz | |
Mon Nov 27 08:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
149 files changed, 274 insertions, 274 deletions
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc index 6ff77c3e1fa..84417f4bc8f 100644 --- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc +++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc { +project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, ciao_server_dnc { exename = StaticDAnCEParser includes += .. libs += NodeApplicationManager diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/CIAO/performance-tests/Protocols/Controller/Controller.mpc index ce70851188d..b857bb7481b 100644 --- a/CIAO/performance-tests/Protocols/Controller/Controller.mpc +++ b/CIAO/performance-tests/Protocols/Controller/Controller.mpc @@ -1,6 +1,6 @@ // $Id$ -project (perf*) : ciao_client_dnc, rtcorba, exceptions { +project (perf*) : ciao_client_dnc, rtcorba { avoids += ace_for_tao after += Protocols_Sender_stub Protocols_Receiver_stub includes += ../Sender diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc index 873f0ea404c..a87f99d602f 100644 --- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc +++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p Protocols Receiver" -project(Protocols_Receiver_stub): ciao_client_dnc, exceptions { +project(Protocols_Receiver_stub): ciao_client_dnc { avoids += ace_for_tao libs += Protocols_stub after += Protocols_stub @@ -27,7 +27,7 @@ project(Protocols_Receiver_stub): ciao_client_dnc, exceptions { } } -project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions { +project(Protocols_Receiver_svnt) : ciao_servant_dnc { avoids += ace_for_tao after += Protocols_skel Protocols_Receiver_stub sharedname = Protocols_Receiver_svnt @@ -58,7 +58,7 @@ project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions { } -project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions { +project(Protocols_Receiver_exec) : ciao_component_dnc { avoids += ace_for_tao after += Protocols_Receiver_svnt sharedname = Protocols_Receiver_exec diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc index a4b3cdf3aa1..2f65f552b5b 100644 --- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc +++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p Protocols Sender" -project(Protocols_Sender_stub): ciao_client_dnc, exceptions { +project(Protocols_Sender_stub): ciao_client_dnc { avoids += ace_for_tao libs += Protocols_stub after += Protocols_stub @@ -27,7 +27,7 @@ project(Protocols_Sender_stub): ciao_client_dnc, exceptions { } } -project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions { +project(Protocols_Sender_svnt) : ciao_servant_dnc { avoids += ace_for_tao after += Protocols_skel Protocols_Sender_stub sharedname = Protocols_Sender_svnt @@ -58,7 +58,7 @@ project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions { } -project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions { +project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba { avoids += ace_for_tao after += Protocols_Sender_svnt sharedname = Protocols_Sender_exec diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/tools/Config_Handlers/Config_Handlers.mpc index de34a519bf2..be3a4f289aa 100644 --- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc +++ b/CIAO/tools/Config_Handlers/Config_Handlers.mpc @@ -1,6 +1,6 @@ //$Id$ -project (XSC_XML_Handlers) : acelib, xerces, exceptions { +project (XSC_XML_Handlers) : acelib, xerces { sharedname += XSC_XML_Handlers dynamicflags = XSC_XML_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc index 60095581130..4ded0107f21 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler.mpc +++ b/CIAO/tools/Config_Handlers/DynAny_Handler.mpc @@ -5,7 +5,6 @@ after += XSC_XML_Handlers libs += XSC_XML_Handlers dynamicflags += DYNANY_HANDLER_BUILD_DLL macros += XML_USE_PTHREADS -requires += exceptions includes += $(CIAO_ROOT)/tools/Config_Handlers Source_Files { diff --git a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc index 9bff5006b60..4f8dd05bcde 100644 --- a/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc +++ b/CIAO/tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc @@ -4,7 +4,6 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces { sharedname = RT_CCM_Config_Handlers dynamicflags = RT_CCM_HANDLERS_BUILD_DLL macros += XML_USE_PTHREADS - requires += exceptions includes += $(CIAO_ROOT)/tools/Config_Handlers after += CIAO_XML_Utils libs += CIAO_XML_Utils @@ -34,7 +33,6 @@ project (RT_CCM_Config_Handlers) : acelib, ciao_deployment_stub, xerces { // after += RT-CCM-Handlers // dynamicflags = CONFIG_HANDLERS_BUILD_DLL // macros += XML_USE_PTHREADS -// requires += exceptions // includes += $(CIAO_ROOT)/tools/Config_Handlers // libs += CIAO_DnC_Server TAO_IFR_Client RT_CCM_Config_Handlers CIAO_XML_Utils diff --git a/CIAO/tools/Config_Handlers/Utils/Utils.mpc b/CIAO/tools/Config_Handlers/Utils/Utils.mpc index 6fc4f4697a1..704c856d752 100644 --- a/CIAO/tools/Config_Handlers/Utils/Utils.mpc +++ b/CIAO/tools/Config_Handlers/Utils/Utils.mpc @@ -1,6 +1,6 @@ // $Id$ -project (CIAO_XML_Utils) : acelib, xerces, exceptions { +project (CIAO_XML_Utils) : acelib, xerces { includes += $(CIAO_ROOT)/tools/Config_Handlers sharedname += CIAO_XML_Utils dynamicflags = CIAO_XML_UTILS_BUILD_DLL diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0604164a268..42da56eefcc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 27 08:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * *.mpc: + Removed exceptions as base project because TAO already requires + exceptions and renamed minimum_corba to avoids_minimum_corba + Mon Nov 27 08:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> Document the changes I have done last weekend to resolve link diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc index b19033fbef3..8230799791a 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc +++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*client) : taoexe, portableserver, ami, exceptions { +project(*client) : taoexe, portableserver, ami { after += *idl source_files { client.cpp @@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, ami, exceptions { } } -project(*server) : taoserver, ami, exceptions { +project(*server) : taoserver, ami { after += *idl source_files { server.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 a98f1720c63..9d9eb79afc7 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc @@ -8,7 +8,7 @@ project(*idl) : taoidldefaults, anytypecode { custom_only = 1 } -project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions { +project(*client) : orbsvcsexe, portableserver, event, event_skel, naming { after += *idl source_files { client.cpp @@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimu } } -project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions { +project(*server) : orbsvcsexe, portableserver, event, event_skel, naming { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc index 797e2569292..28cb1412d21 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, naming, exceptions { +project(*client) : orbsvcsexe, portableserver, naming { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : orbsvcsexe, portableserver, naming, exceptions { } } -project(*server) : orbsvcsexe, portableserver, naming, exceptions { +project(*server) : orbsvcsexe, portableserver, naming { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib 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 650bdc9d832..e939ee6aa9b 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 @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exceptions { +project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, avoids_corba_e_micro { after += *idl source_files { client.cpp @@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exception } } -project(*server) : taoserver, naming, ami, minimum_corba, exceptions { +project(*server) : taoserver, naming, ami, avoids_minimum_corba, avoids_corba_e_micro { after += *idl source_files { server.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 15cb6b2be5b..e98c3833422 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 @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, anytypecode { custom_only = 1 } -project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions { +project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_micro { after += *idl source_files { client.cpp @@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_cor } } -project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions { +project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_micro { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc index d1f999594f1..39350e69199 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoexe, portableserver, exceptions { +project : taoexe, portableserver { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc index e15b2b37572..d66ed413d6e 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, rtevent, naming, exceptions { +project(*client) : taoexe, portableserver, rtevent, naming { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver, rtevent, naming, exceptions { } } -project(*server) : taoserver, rtevent, naming, iortable, exceptions { +project(*server) : taoserver, rtevent, naming, iortable { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib 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 fda3b450dd6..42bcc38ae52 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc @@ -1,5 +1,5 @@ // $Id$ -project : taoserver, minimum_corba, exceptions { +project : taoserver, avoids_minimum_corba, avoids_corba_e_micro { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc index c8c3a2ad4ae..e3614568deb 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, exceptions { +project(*client) : taoexe, portableserver { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver, exceptions { } } -project(*server) : taoserver, exceptions { +project(*server) : taoserver { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc index dc8789b784c..5cbce4fb41e 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoserver, exceptions { +project : taoserver { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc index 2e2cc5507a3..16f24c89b7e 100644 --- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc +++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*idl) : taoclient, exceptions { +project(*idl) : taoclient { IDL_Files { time.idl } custom_only = 1 } -project(*client) : taoclient, anytypecode, exceptions { +project(*client) : taoclient, anytypecode { after += *idl requires += corba_messaging source_files { @@ -19,7 +19,7 @@ project(*client) : taoclient, anytypecode, exceptions { } } -project(*server) : taoserver, exceptions { +project(*server) : taoserver { after += *idl source_files { server.cpp diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc index f27685e74cf..607fdfdc9c4 100644 --- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc +++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, exceptions { +project(*client) : taoexe, portableserver { requires += dummy_label source_files { client.cpp } } -project(*server) : taoserver, exceptions { +project(*server) : taoserver { requires += dummy_label source_files { server.cpp diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc index a17937ed47a..b6dc8f45585 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc +++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): csd_threadpool, taoserver, minimum_corba, pi { +project(*Server): csd_threadpool, taoserver, avoids_minimum_corba, avoids_corba_e_micro, pi { exename = server_main idlflags += -GT diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc index 746dfa9c23a..2d3d20bed1a 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc @@ -9,7 +9,7 @@ project(*IDL): taoidldefaults { custom_only = 1 } -project(*balancer): taoexe, utils, portableserver, minimum_corba { +project(*balancer): taoexe, utils, portableserver, avoids_minimum_corba { avoids += repo ace_for_tao exename = load_balancer after += *IDL @@ -25,7 +25,7 @@ project(*balancer): taoexe, utils, portableserver, minimum_corba { } } -project(*server): taoserver, utils, minimum_corba { +project(*server): taoserver, utils, avoids_minimum_corba { avoids += repo exename = server after += *IDL @@ -42,7 +42,7 @@ project(*server): taoserver, utils, minimum_corba { } } -project(*client): taoclient, utils, portableserver, minimum_corba { +project(*client): taoclient, utils, portableserver, avoids_minimum_corba { avoids += repo exename = client after += *IDL diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index 82cd71b5df0..eca3e876cf6 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -8,7 +8,7 @@ project(*IDL): taoidldefaults { custom_only = 1 } -project(*server): taoserver, utils, valuetype, minimum_corba { +project(*server): taoserver, utils, valuetype, avoids_minimum_corba { exename = server after += *IDL Source_Files { @@ -23,7 +23,7 @@ project(*server): taoserver, utils, valuetype, minimum_corba { } } -project(*client): taoserver, utils, valuetype, minimum_corba { +project(*client): taoserver, utils, valuetype, avoids_minimum_corba { exename = client after += *IDL Source_Files { diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc index 7b4048912d9..15c4ad0361c 100644 --- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc +++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, avoids_minimum_corba { 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 508a5b3f898..8e542496f58 100644 --- a/TAO/examples/POA/DSI/POA_DSI.mpc +++ b/TAO/examples/POA/DSI/POA_DSI.mpc @@ -6,7 +6,7 @@ project(*IDL): taoidldefaults { custom_only = 1 } -project(*Client) : taoclient, messaging, minimum_corba { +project(*Client) : taoclient, messaging, avoids_minimum_corba { after += *IDL source_files { DatabaseC.cpp @@ -16,7 +16,7 @@ project(*Client) : taoclient, messaging, minimum_corba { } } -project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba { +project(*Server) : taoserver, messaging, dynamicinterface, avoids_minimum_corba { after += *IDL source_files { Database_i.cpp diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc index 55d3216ddfb..6d1ac47eb4d 100644 --- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc +++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc @@ -8,7 +8,7 @@ project(*IDL): taoidldefaults, anytypecode { custom_only = 1 } -project(*Client) : taoclient, anytypecode, minimum_corba { +project(*Client) : taoclient, anytypecode, avoids_minimum_corba { after += *IDL source_files { FileC.cpp @@ -18,7 +18,7 @@ project(*Client) : taoclient, anytypecode, minimum_corba { } } -project(*Server) : taoserver, minimum_corba { +project(*Server) : taoserver, avoids_minimum_corba { after += *IDL source_files { File_i.cpp diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc index 60b77c13641..c639fb27585 100644 --- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc +++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver, avoids_minimum_corba { libs += Generic_Servant after += POA_Generic_Servant_Lib specific (automake) { includes += $(srcdir)/../Generic_Servant - } + } includes += ../Generic_Servant Source_Files { diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc index be326877b8b..0379b40ac39 100644 --- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc +++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: taoserver, minimum_corba { +project: taoserver, avoids_minimum_corba { exename = FindPOA } diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc index 758ca27605f..0db957fef16 100644 --- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc +++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc @@ -8,7 +8,7 @@ project(*IDL) : taoidldefaults, anytypecode { custom_only = 1 } -project(*Client) : taoclient, anytypecode, minimum_corba { +project(*Client) : taoclient, anytypecode, avoids_minimum_corba { after += *IDL source_files { client.cpp @@ -18,7 +18,7 @@ project(*Client) : taoclient, anytypecode, minimum_corba { } } -project(*Server) : taoserver, minimum_corba { +project(*Server) : taoserver, avoids_minimum_corba { after += *IDL source_files { test_i.cpp diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc index 3c249a12a2e..895377ed5bf 100644 --- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc +++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*lib): taolib_with_idl, portableserver, minimum_corba { +project(*lib): taolib_with_idl, portableserver, avoids_minimum_corba { sharedname = Generic_Servant dynamicflags = GENERIC_SERVANT_BUILD_DLL idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h @@ -8,7 +8,7 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba { } } -project(*client): taoexe, portableserver, minimum_corba { +project(*client): taoexe, portableserver, avoids_minimum_corba { avoids += ace_for_tao after += *lib libs += Generic_Servant diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc index 72bcf90edb6..a2fc2e4bab5 100644 --- a/TAO/examples/POA/Loader/POA_Loader.mpc +++ b/TAO/examples/POA/Loader/POA_Loader.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, avoids_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 8cb1ef1dc40..35725260234 100644 --- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc +++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc @@ -1,4 +1,4 @@ //$Id$ -project : taoserver, minimum_corba { +project : taoserver, avoids_minimum_corba { exename = NewPOA } 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 7b2742cdd86..7a86d51b644 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,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver, avoids_minimum_corba { 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 843c856715b..efe455accf2 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,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver, avoids_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 ecb5e5fea43..e0ca16f5e52 100644 --- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc +++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoserver, bidir_giop, minimum_corba { +project: taoserver, bidir_giop, avoids_minimum_corba { exename = POA_BiDir } 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 71264867f12..c639fb27585 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc +++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver, avoids_minimum_corba { 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 e3213c6fb17..83214bf8bea 100644 --- a/TAO/examples/POA/TIE/POA_TIE.mpc +++ b/TAO/examples/POA/TIE/POA_TIE.mpc @@ -9,7 +9,7 @@ project(*IDL) : taoidldefaults { custom_only = 1 } -project(*Client) : taoclient, anytypecode, minimum_corba { +project(*Client) : taoclient, anytypecode, avoids_minimum_corba { after += *IDL avoids += ace_for_tao source_files { @@ -20,7 +20,7 @@ project(*Client) : taoclient, anytypecode, minimum_corba { } } -project(*Server) : taoserver, minimum_corba { +project(*Server) : taoserver, avoids_minimum_corba { after += *IDL source_files { test_i.cpp diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index a5ed3d19def..197a5dfb016 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -8,7 +8,7 @@ project(*IDL): taoidldefaults { custom_only = 1 } -project(*server): namingexe, lifecycle, minimum_corba, utils { +project(*server): namingexe, lifecycle, avoids_minimum_corba, utils { after += *IDL Source_Files { server.cpp @@ -20,7 +20,7 @@ project(*server): namingexe, lifecycle, minimum_corba, utils { } } -project(*client): namingexe, lifecycle, minimum_corba { +project(*client): namingexe, lifecycle, avoids_minimum_corba { after += *IDL Source_Files { client.cpp @@ -30,7 +30,7 @@ project(*client): namingexe, lifecycle, minimum_corba { } } -project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils { +project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils { after += *IDL Source_Files { Factory_Finder.cpp @@ -42,7 +42,7 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils { } } -project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils { +project(*Generic Factory): namingexe, lifecycle, avoids_minimum_corba, utils { after += *IDL Source_Files { Generic_Factory.cpp diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc index 1bdbc4e848d..db43b0187e0 100644 --- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc +++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc @@ -1,6 +1,6 @@ // $Id$ -project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, minimum_corba { +project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client, avoids_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 c34f71456b1..2dab11c1662 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, minimum_corba { +project(*Lib): orbsvcslib, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba { sharedname = TAO_ReplicationManagerLib dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 719169d1594..2bfa340ddd7 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -16,7 +16,7 @@ project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, imr_client, cro } -project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, minimum_corba { +project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, avoids_minimum_corba { after += TAO_IDL_FE sharedname = TAO_IFR_BE libs += TAO_IDL_FE @@ -42,7 +42,7 @@ project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, minimum_corba } -project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba { +project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, avoids_minimum_corba { after += TAO_IFR_BE TAO_IDL_FE exename = tao_ifr libs += TAO_IFR_BE TAO TAO_IDL_FE diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 24d5c6e2a0c..27cde17f11a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -45,7 +45,7 @@ project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_ } } -project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, portableserver, imr_client, messaging, pi, codecfactory { +project(ImR_Activator) : orbsvcslib, conv_lib, acexml, avoids_minimum_corba, valuetype, portableserver, imr_client, messaging, pi, codecfactory { sharedname = TAO_ImR_Activator dynamicflags = ACTIVATOR_BUILD_DLL after += ImR_Activator_IDL ImR_Locator_IDL @@ -65,7 +65,7 @@ project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, } } -project(ImR_Locator) : orbsvcslib, conv_lib, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client { +project(ImR_Locator) : orbsvcslib, conv_lib, avoids_minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client { sharedname = TAO_ImR_Locator dynamicflags = LOCATOR_BUILD_DLL after += ImR_Locator_IDL ImR_Activator_IDL @@ -92,7 +92,7 @@ project(ImR_Locator) : orbsvcslib, conv_lib, minimum_corba, iortable, portablese } } -project(ImR_Locator_Service) : orbsvcsexe, install_bin, minimum_corba, iortable, messaging, acexml ,svc_utils, pi_server, imr_client { +project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, iortable, messaging, acexml ,svc_utils, pi_server, imr_client { exename = ImplRepo_Service after += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL libs += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL @@ -117,7 +117,7 @@ project(ImR_Locator_Service) : orbsvcsexe, install_bin, minimum_corba, iortable, } -project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, minimum_corba, messaging, svc_utils, imr_client { +project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, avoids_minimum_corba, messaging, svc_utils, imr_client { exename = ImR_Activator after += ImR_Activator ImR_Activator_IDL ImR_Locator_IDL libs += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL @@ -130,7 +130,7 @@ project(ImR_Activator_Service) : orbsvcsexe, install_bin, acexml, minimum_corba, } -project(tao_imr) : orbsvcsexe, install_bin, minimum_corba, portableserver, imr_client { +project(tao_imr) : orbsvcsexe, install_bin, avoids_minimum_corba, portableserver, imr_client { exename = tao_imr install = $(ACE_ROOT)/bin Source_Files { diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index 6c8727c5070..38d32a04cc9 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, lifecycle, naming, trading_serv, minimum_corba, utils { +project : orbsvcsexe, lifecycle, naming, trading_serv, avoids_minimum_corba, utils { exename = LifeCycle_Service } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc index dea14f4a82c..ab009dea00a 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc @@ -21,7 +21,7 @@ project(*Server): orbsvcsexe, fault_tolerance, tmcast, pi_server, interceptors { } } -project(*Client): taoclient, fault_tolerance, exceptions { +project(*Client): taoclient, fault_tolerance { after += *idl Source_Files { RolyPolyC.cpp diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc index 11a89093d9b..f6a36265381 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc +++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc @@ -7,7 +7,7 @@ project(*IDL): taoidldefaults { custom_only = 1 } -project(*Manager): orbsvcsexe, portableserver, exceptions { +project(*Manager): orbsvcsexe, portableserver { after += *IDL Source_Files { manager_main.cpp @@ -25,7 +25,7 @@ project(*Manager): orbsvcsexe, portableserver, exceptions { } } -project(*Server): orbsvcsexe, portableserver, iortable, exceptions { +project(*Server): orbsvcsexe, portableserver, iortable { after += *IDL Source_Files { server_main.cpp @@ -39,7 +39,7 @@ project(*Server): orbsvcsexe, portableserver, iortable, exceptions { } } -project(*Client): orbsvcsexe, exceptions { +project(*Client): orbsvcsexe { after += *IDL Source_Files { client_main.cpp diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc index fc8803905f7..10bf46a436e 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc @@ -7,7 +7,7 @@ project(*IDL): taoidldefaults { custom_only = 1 } -project : orbsvcsexe, portableserver, exceptions { +project : orbsvcsexe, portableserver { exename = combined_service after += *IDL source_files { @@ -19,7 +19,7 @@ project : orbsvcsexe, portableserver, exceptions { } } -project(*Controller) : orbsvcsexe, exceptions { +project(*Controller) : orbsvcsexe { exename = controller after += *IDL source_files { @@ -31,7 +31,7 @@ project(*Controller) : orbsvcsexe, exceptions { } // A client that uses corba to test out basic imr functionality -project(*Test) : orbsvcsexe, exceptions { +project(*Test) : orbsvcsexe { after += *IDL source_files { test.cpp @@ -42,7 +42,7 @@ project(*Test) : orbsvcsexe, exceptions { } // A server to use with the imr -project(*TestServer) : orbsvcsexe, portableserver, iortable, exceptions { +project(*TestServer) : orbsvcsexe, portableserver, iortable { after += *IDL // The gnuace specific portion is to prevent invalid object files from // IDL generated files being compiled simultaneously with parallel builds. @@ -60,7 +60,7 @@ project(*TestServer) : orbsvcsexe, portableserver, iortable, exceptions { // Another simple server that can be loaded dynamically into the // combined_service. -project(*DynamicServer) : taolib, portableserver, iortable, exceptions { +project(*DynamicServer) : taolib, portableserver, iortable { dynamicflags = DYNSERVER_BUILD_DLL sharedname = DynServer after += *IDL diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc index 3797e1cd0af..ad432a5bcd8 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc +++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc @@ -6,7 +6,7 @@ project(*idl) : taoidldefaults, anytypecode { custom_only = 1 } -project(*Server): taoexe, loadbalancing, pi_server, exceptions { +project(*Server): taoexe, loadbalancing, pi_server { avoids += ace_for_tao after += *idl Source_Files { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc index 147604e0274..8b821b00bdb 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc +++ b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Supplier): rtcorba, rtnotify, minimum_corba, naming { +project(*Supplier): rtcorba, rtnotify, avoids_minimum_corba, naming { exename = Supplier Source_Files { Supplier.cpp @@ -11,7 +11,7 @@ project(*Supplier): rtcorba, rtnotify, minimum_corba, naming { } } -project(*Consumer): notifytest, rtcorba, rtnotify, minimum_corba { +project(*Consumer): notifytest, rtcorba, rtnotify, avoids_minimum_corba { exename = Consumer Source_Files { Consumer.cpp diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc index 39521d11a30..9c467ce288e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, notification, notification_skel, naming, minimum_corba { +project : orbsvcsexe, notification, notification_skel, naming, avoids_minimum_corba { exename = Subscribe } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc index ed469821a28..fb57e075685 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { +project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba { exename = Supplier Source_Files { Supplier.cpp @@ -9,7 +9,7 @@ project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { } } -project(*Consumer): rtnotify, notifytest, rtportableserver, minimum_corba { +project(*Consumer): rtnotify, notifytest, rtportableserver, avoids_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 82fc927aab8..1c4a88b43fd 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*idl): taoidldefaults, minimum_corba { +project(*idl): taoidldefaults, avoids_minimum_corba { idl_files { Gateway.idl ObjectReferenceFactory.idl @@ -9,7 +9,7 @@ project(*idl): taoidldefaults, minimum_corba { custom_only = 1 } -project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { +project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corba { after += *idl source_files { @@ -23,7 +23,7 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { } } -project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iorinterceptor { +project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, avoids_minimum_corba, iorinterceptor { exename = server after += *Gateway source_files { @@ -41,7 +41,7 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori } } -project(*Client) : orbsvcsexe, event, minimum_corba { +project(*Client) : orbsvcsexe, event, avoids_minimum_corba { after += *Idl *Server source_files { client.cpp diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 5535f522485..acb698e994a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,6 +1,6 @@ // $Id$ -project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults { +project (CosEvent_IDL) : orbsvcslib, core, avoids_minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults { custom_only = 1 idlflags += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h @@ -10,7 +10,7 @@ project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, t } } -project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events { +project (CosEvent) : orbsvcslib, core, avoids_minimum_corba, ec_typed_events { sharedname = TAO_CosEvent dynamicflags = TAO_EVENT_BUILD_DLL tagchecks += CosEvent @@ -49,7 +49,7 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events { } -project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel { +project (CosEvent_Skel) : orbsvcslib, core, avoids_minimum_corba, event, portableserver, ec_typed_events_skel { sharedname = TAO_CosEvent_Skel dynamicflags = TAO_EVENT_SKEL_BUILD_DLL tagchecks += CosEvent @@ -86,7 +86,7 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver } -project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils { +project (CosEvent_Serv) : orbsvcslib, core, avoids_minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils { sharedname = TAO_CosEvent_Serv dynamicflags = TAO_EVENT_SERV_BUILD_DLL tagchecks += CosEvent diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index 7ea375e45af..95e9e9852a2 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults { +project : orbsvcslib, core, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults { sharedname = TAO_CosLoadBalancing idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h dynamicflags = TAO_LOADBALANCING_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 8254fb8f2de..ec909c49745 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba, tao_versioning_idl_defaults { +project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { sharedname = TAO_FTORB_Utils idlflags += -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 0b6911d2473..bb359127765 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba, tao_versioning_idl_defaults { +project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { sharedname = TAO_FaultTolerance idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags = TAO_FT_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index b510974a944..75cd0f4acc5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults { +project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, avoids_minimum_corba, pi_server, tao_versioning_idl_defaults { sharedname = TAO_FtRtEvent idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h dynamicflags = TAO_FTRTEVENT_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index e0c158052da..2e3edb0a81d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba { +project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, avoids_minimum_corba { avoids += ace_for_tao // Requires ace/Configuration sharedname = TAO_IFRService dynamicflags = TAO_IFRSERVICE_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 2c63bc2bff5..e39347a4b4f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, tao_versioning_idl_defaults { +project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, avoids_minimum_corba, tao_versioning_idl_defaults { sharedname = TAO_PortableGroup idlflags += -Wb,export_macro=TAO_PortableGroup_Export \ -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h 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 18d1be0bb26..754bfc906cd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc @@ -1,5 +1,5 @@ // $Id$ -project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf 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 a6681bf941c..bc8b1b1b271 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf @@ -13,10 +13,10 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf - + specific (automake) { includes += $(srcdir)/../lib } 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 188d5276fd9..8fc1c0491d8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { IDL_Files { Test.idl @@ -9,7 +9,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { custom_only = 1 } -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf @@ -31,7 +31,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf 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 bfd1de34f68..17ce8b6595e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { IDL_Files { Test.idl } @@ -8,7 +8,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { custom_only = 1 } -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf @@ -31,7 +31,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc index 1921fed616b..095ac068169 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf @@ -14,7 +14,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf 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 bded52788ee..50ba4c3ff5f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf @@ -14,7 +14,7 @@ project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { } } -project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { +project(*client): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba { after += RTEC_Perf libs += TAO_RTEC_Perf diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc index c73d8a6a356..b262ada3719 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc @@ -1,6 +1,6 @@ // $Id$ -project(RTEC_Perf): strategies, rtcorbaevent, minimum_corba { +project(RTEC_Perf): strategies, rtcorbaevent, avoids_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 bb3c6ac0488..ef2046225ee 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Bug_1630_testclient ) : taoclient, anytypecode, minimum_corba, ifr_client { +project(Bug_1630_testclient ) : taoclient, anytypecode, avoids_minimum_corba, ifr_client { exename = testclient Source_Files { diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc index 8bc20a15371..1d78cb6ca5b 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Test): taoclient, messaging, naming, minimum_corba { +project(*Test): taoclient, messaging, naming, avoids_minimum_corba { exename = test Source_Files { test.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc index cfeafb2ed12..5cd5dfb5049 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc @@ -9,7 +9,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba { +project(*server): portableserver, orbsvcsexe, iormanip, messaging, avoids_minimum_corba { after += *idl Source_Files { test_i.cpp @@ -21,7 +21,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba } } -project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, minimum_corba { +project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, avoids_minimum_corba { after += *idl Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc index ce7afec6555..de4c30d36c4 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc @@ -10,7 +10,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, minimum_corba { +project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, avoids_minimum_corba { after += *idl Source_Files { @@ -28,7 +28,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, } } -project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, minimum_corba { +project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, avoids_minimum_corba { after += *idl Source_Files { diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc index 8fbb929a329..a255da56843 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc @@ -2,7 +2,6 @@ // $Id$ project(*Supplier): namingexe, rteventexe, rtevent_serv { - requires += exceptions exename = EchoEventSupplier specific(automake) { @@ -19,7 +18,6 @@ project(*Supplier): namingexe, rteventexe, rtevent_serv { } project(*Consumer): namingexe, rteventexe, { - requires += exceptions exename = EchoEventConsumer specific(automake) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc index 4864a0acb3c..2220136abfe 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc +++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc @@ -7,7 +7,7 @@ project(*idl): taoidldefaults, orbsvcslib { custom_only = 1 } -project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba { +project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba { exename = ft_replica after += *idl Source_Files { @@ -47,7 +47,7 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, minimum_corba { } } -project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*Client): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba { exename = ft_client after += *idl Source_Files { @@ -60,7 +60,7 @@ project(*Client): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { } } -project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_corba { +project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, avoids_minimum_corba { exename = ft_notifier Source_Files { FTAPP_Notifier_Main.cpp @@ -91,7 +91,7 @@ project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe { } } -project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, minimum_corba { +project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, avoids_minimum_corba { exename = ft_fault_consumer libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib @@ -107,7 +107,7 @@ project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcse } } -project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba { exename = ft_registry Source_Files { @@ -124,7 +124,7 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe, minimum_corba } } -project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*Creator): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba { exename = ft_create Source_Files { @@ -140,7 +140,7 @@ project(*Creator): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { } } -project(*RMController): taoclient, fault_tolerance, orbsvcsexe, minimum_corba { +project(*RMController): taoclient, fault_tolerance, orbsvcsexe, avoids_minimum_corba { exename = replmgr_controller Source_Files { FT_ReplicationManagerController.cpp diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc index 981b180e88a..47f665c4214 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc @@ -22,7 +22,7 @@ project(*Server): taoexe, portableserver, bidir_giop { } } -project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { after += *idl Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc index 049f561a5fc..a9ceae0722d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*Server): taoserver, minimum_corba, imr_client { +project(*Server): taoserver, avoids_minimum_corba, imr_client { idlflags += -Sa -St exename = MessengerServer Source_Files { @@ -9,7 +9,7 @@ project(*Server): taoserver, minimum_corba, imr_client { } } -project(*Client): taoexe, minimum_corba { +project(*Client): taoexe, avoids_minimum_corba { idlflags += -Sa -St exename = MessengerClient Source_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index 848b239d9ee..7a7cf6db46e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -9,8 +9,8 @@ project(airplane_idl) : taoidldefaults { } -project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { - after += airplane_idl +project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client { + after += airplane_idl IDL_Files { } @@ -24,8 +24,8 @@ project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, } } -project(airplane client) : portableserver, orbsvcsexe, minimum_corba, iortable { - after += airplane_idl +project(airplane client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { + after += airplane_idl IDL_Files { } @@ -46,7 +46,7 @@ project(nestea_idl): taoidldefaults { custom_only = 1 } -project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { +project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client { avoids += ace_for_tao after += nestea_idl @@ -68,7 +68,7 @@ project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, im } } -project(nestea client) : portableserver, orbsvcsexe, minimum_corba, iortable { +project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { after += nestea_idl IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index fe939b060c5..c7d022ca2ed 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: namingexe, minimum_corba { +project: namingexe, avoids_minimum_corba { } diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc index 5e8640bf068..f9d77f60cf9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc @@ -7,7 +7,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { +project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client { after += *idl IDL_Files { @@ -21,7 +21,7 @@ project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_clie } } -project(*client) : portableserver, orbsvcsexe, minimum_corba, iortable { +project(*client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { after += *idl IDL_Files { 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 3396f7a98fe..7df7aa230a7 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, portableserver, ifr_client, minimum_corba { +project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba { Source_Files { test_i.cpp @@ -9,7 +9,7 @@ project(*server): taoexe, portableserver, ifr_client, minimum_corba { } } -project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba { +project(*client): taoexe, portableserver, ifr_client, dynamicinterface, avoids_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 e1f0a71cc46..258814a3017 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client, minimum_corba { +project: taoexe, ifr_client, avoids_minimum_corba { exename = IDL3_Test - + Source_Files { client.cpp idl3_client.cpp 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 c351c9ef039..d9b8b502656 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client, minimum_corba { +project: taoexe, ifr_client, avoids_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 57112a88744..5f03dd39e0c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoexe, ifr_client, minimum_corba { +project: taoexe, ifr_client, avoids_minimum_corba { exename = Persistence_Test } diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc index d77816dd0d4..80c79319c21 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*lib): orbsvcslib, notify_serv, exceptions { +project(*lib): orbsvcslib, notify_serv { sharedname = NotifyPlugTop dynamicflags = PLUGTOP_BUILD_DLL source_files { @@ -9,7 +9,7 @@ project(*lib): orbsvcslib, notify_serv, exceptions { } } -project : orbsvcsexe, notify_serv, exceptions { +project : orbsvcsexe, notify_serv { after += *lib source_files { main.cpp 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 caaf2d4cb8f..0c1500104b2 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, minimum_corba { +project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, avoids_minimum_corba { sharedname = TAO_RT_NotifyTests diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc index f2020bde1d3..c47d7c84114 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc @@ -1,13 +1,13 @@ // $Id$ -project(*idl): taoidldefaults, minimum_corba { +project(*idl): taoidldefaults, avoids_minimum_corba { IDL_Files { go.idl } custom_only = 1 } -project(*Ntf Perf Struct Supp): notifytest, minimum_corba { +project(*Ntf Perf Struct Supp): notifytest, avoids_minimum_corba { after += *idl exename = Structured_Supplier Source_Files { @@ -19,7 +19,7 @@ project(*Ntf Perf Struct Supp): notifytest, minimum_corba { } } -project(*Ntf Perf Struct Cons): notifytest, minimum_corba { +project(*Ntf Perf Struct Cons): notifytest, avoids_minimum_corba { after += *idl exename = Structured_Consumer Source_Files { @@ -31,7 +31,7 @@ project(*Ntf Perf Struct Cons): notifytest, minimum_corba { } } -project(*Ntf Perf Seq Supp): notifytest, minimum_corba { +project(*Ntf Perf Seq Supp): notifytest, avoids_minimum_corba { after += *idl exename = Sequence_Supplier Source_Files { @@ -43,7 +43,7 @@ project(*Ntf Perf Seq Supp): notifytest, minimum_corba { } } -project(*notify perf Sequence Consumer): notifytest, minimum_corba { +project(*notify perf Sequence Consumer): notifytest, avoids_minimum_corba { after += *idl exename = Sequence_Consumer Source_Files { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc index b16923c43da..43ba02e8306 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(*Ntf Perf Throughput): notifytest, strategies, messaging, minimum_corba { +project(*Ntf Perf Throughput): notifytest, strategies, messaging, avoids_minimum_corba { exename = Throughput } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc index 2b128347974..e93c2ef880c 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc +++ b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*SSL Server): taoexe, portableserver, minimum_corba, bidir_giop { +project(*SSL Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop { after += *idl Source_Files { test_i.cpp @@ -20,7 +20,7 @@ project(*SSL Server): taoexe, portableserver, minimum_corba, bidir_giop { } } -project(*SSL Client): taoexe, portableserver, minimum_corba, bidir_giop { +project(*SSL Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { after += *idl Source_Files { test_i.cpp 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 6437d7e9c6f..378466b0c97 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: taoexe, minimum_corba { +project: taoexe, avoids_minimum_corba { exename = tests_svc_loader } 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 3d6ccc86d5f..6e0c30d127c 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba { +project(*client): taoexe, portableserver, strategies, dynamicinterface, avoids_minimum_corba { after += IDL_Cubit_Server avoids += ace_for_tao idlflags += -Gd diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc index cc7c7fc9da0..995c3e94121 100644 --- a/TAO/performance-tests/Latency/DII/DII.mpc +++ b/TAO/performance-tests/Latency/DII/DII.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*latency_idl): taoidldefaults, strategies, minimum_corba { +project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba { IDL_Files { Test.idl } custom_only = 1 } -project(*latency server): taoserver, strategies, minimum_corba { +project(*latency server): taoserver, strategies, avoids_minimum_corba { after += *latency_idl Source_Files { Roundtrip.cpp @@ -20,7 +20,7 @@ project(*latency server): taoserver, strategies, minimum_corba { } } -project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba { +project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba { after += *latency_idl avoids += ace_for_tao Source_Files { diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc index b1e6a525ae5..7eb126c98d0 100644 --- a/TAO/performance-tests/Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Latency/DSI/DSI.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*latency server): taoserver, strategies, dynamicinterface, minimum_corba { +project(*latency server): taoserver, strategies, dynamicinterface, avoids_minimum_corba { IDL_Files { } @@ -12,7 +12,7 @@ project(*latency server): taoserver, strategies, dynamicinterface, minimum_corba } } -project(*latency client): taoclient, strategies, minimum_corba { +project(*latency client): taoclient, strategies, avoids_minimum_corba { avoids += ace_for_tao Source_Files { TestC.cpp diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc index edc3efefc87..60f9b68b31e 100644 --- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*latency_idl): taoidldefaults, strategies, minimum_corba { +project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba { IDL_Files { Test.idl } custom_only = 1 } -project(*latency server): taoserver, strategies, minimum_corba { +project(*latency server): taoserver, strategies, avoids_minimum_corba { after += *latency_idl Source_Files { Roundtrip.cpp @@ -20,7 +20,7 @@ project(*latency server): taoserver, strategies, minimum_corba { } } -project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba { +project(*latency client): taoclient, strategies, dynamicinterface, avoids_minimum_corba { after += *latency_idl avoids += ace_for_tao Source_Files { diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc index 3319967277c..2ba8a89f509 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc @@ -1,5 +1,5 @@ // $Id$ -project(RTCORBA_Common): taolib_with_idl, portableserver, minimum_corba { +project(RTCORBA_Common): taolib_with_idl, portableserver, avoids_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 0819f051562..703b2010c39 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,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): rt_server, strategies, rtcorbacommon, minimum_corba { +project(*server): rt_server, strategies, rtcorbacommon, avoids_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 a05388566f9..2aa911980f8 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc @@ -7,7 +7,7 @@ project(*oneways idl RT): taoidldefaults { custom_only = 1 } -project(*oneways server RT): rt_server, messaging, minimum_corba { +project(*oneways server RT): rt_server, messaging, avoids_minimum_corba { after += *oneways_idl_RT Source_Files { test_i.cpp @@ -19,7 +19,7 @@ project(*oneways server RT): rt_server, messaging, minimum_corba { } } -project(*oneways client RT): rt_client, messaging, minimum_corba { +project(*oneways client RT): rt_client, messaging, avoids_minimum_corba { after += *oneways_idl_RT Source_Files { testC.cpp diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc index 2049c723a97..fd7f98216fc 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc @@ -8,7 +8,7 @@ project(*RTCorba idl): taoidldefaults { custom_only = 1 } -project(*RTCorba server): rt_server, minimum_corba { +project(*RTCorba server): rt_server, avoids_minimum_corba { after += *RTCorba_idl Source_Files { server.cpp @@ -19,7 +19,7 @@ project(*RTCorba server): rt_server, minimum_corba { } } -project(*RTCorba client): rt_client, minimum_corba { +project(*RTCorba client): rt_client, avoids_minimum_corba { avoids += ace_for_tao after += *RTCorba_idl Source_Files { diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc index 6d4e82b25bf..a9d864be59f 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc +++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*sequence_idl): taoidldefaults, strategies, minimum_corba { +project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba { IDL_Files { Test.idl } custom_only = 1 } -project(*sequence server): taoserver, strategies, minimum_corba { +project(*sequence server): taoserver, strategies, avoids_minimum_corba { after += *sequence_idl exename = server @@ -22,7 +22,7 @@ project(*sequence server): taoserver, strategies, minimum_corba { } } -project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba { +project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba { after += *sequence_idl avoids += ace_for_tao diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc index 8344d3de55a..b584f707264 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc +++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*idl): taoidldefaults, strategies, minimum_corba { +project(*idl): taoidldefaults, strategies, avoids_minimum_corba { IDL_Files { Test.idl } custom_only = 1 } -project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_corba { +project(*sequence server) : taoserver, strategies, dynamicinterface, avoids_minimum_corba { after += *idl Source_Files { Roundtrip.cpp @@ -18,7 +18,7 @@ project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_cor IDL_Files { } } -project(*sequence client): taoclient, strategies, minimum_corba { +project(*sequence client): taoclient, strategies, avoids_minimum_corba { after += *idl avoids += ace_for_tao Source_Files { diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc index 0f4daed743a..f526758bf3e 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*sequence_idl): taoidldefaults, strategies, minimum_corba { +project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba { IDL_Files { Test.idl } custom_only = 1 } -project(*sequence server): taoserver, strategies, minimum_corba { +project(*sequence server): taoserver, strategies, avoids_minimum_corba { after += *sequence_idl exename = server @@ -22,7 +22,7 @@ project(*sequence server): taoserver, strategies, minimum_corba { } } -project(*sequence client): taoserver, strategies, dynamicinterface, minimum_corba { +project(*sequence client): taoserver, strategies, dynamicinterface, avoids_minimum_corba { after += *sequence_idl avoids += ace_for_tao exename = client diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc index fe00fe7a5b7..1174b4e04a9 100644 --- a/TAO/tao/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, minimum_corba { +project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba { sharedname = TAO_EndpointPolicy dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index 55e22534e4a..19054caa68f 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop { +project(*Server): taoserver, anytypecode, avoids_minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop { +project(*Client): taoserver, anytypecode, avoids_minimum_corba, bidir_giop { exename = client after += *Server Source_Files { diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc index abcf650df1b..5be04fb778d 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc +++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba, bidir_giop { +project(*Server): taoserver, avoids_minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { after += *Server Source_Files { test_i.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc index abcf650df1b..5be04fb778d 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba, bidir_giop { +project(*Server): taoserver, avoids_minimum_corba, bidir_giop { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { after += *Server Source_Files { test_i.cpp diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc index 7d7eaacb597..efe272bc3ba 100644 --- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc +++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(bug_1535_regression) : taoserver, utils, minimum_corba { +project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba { exename = bug_1535_regression Source_Files { bug_1535_regression.cpp diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc index ab891487d3f..7907eaa3b37 100644 --- a/TAO/tests/Bug_1636_Regression/test.mpc +++ b/TAO/tests/Bug_1636_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, minimum_corba { +project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba { exename = client IDL_Files { diff --git a/TAO/tests/Bug_1639_Regression/test.mpc b/TAO/tests/Bug_1639_Regression/test.mpc index f0d95132c29..883fc1c4bd0 100644 --- a/TAO/tests/Bug_1639_Regression/test.mpc +++ b/TAO/tests/Bug_1639_Regression/test.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (Bug_1639_testclient) : taoserver, dynamicany, exceptions { +project (Bug_1639_testclient) : taoserver, dynamicany { exename = client Source_Files { struct_client.cpp diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc index 15f79878b23..f4f21ac3fb7 100644 --- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc +++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, iortable, ami, exceptions { +project(*Server): taoserver, iortable, ami { Source_Files { server.cpp } } -project(*Client): taoclient, ami, exceptions { +project(*Client): taoclient, ami { Source_Files { client.cpp } diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc index 82d305b5af4..7ade436bd07 100644 --- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc +++ b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (*Test) : taoserver, iortable, minimum_corba, messaging { +project (*Test) : taoserver, iortable, avoids_minimum_corba, messaging { Source_Files { Hello.cpp } diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc index c01584c3559..afad6b88125 100644 --- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc +++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc @@ -8,7 +8,7 @@ project(*Server): taoserver { } } -project(*Client): taoclient, anytypecode, minimum_corba { +project(*Client): taoclient, anytypecode, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc index 7223fb9069c..3fc05c47808 100644 --- a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc +++ b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server) : taoserver, imr_client, exceptions { +project(*Server) : taoserver, imr_client { Source_Files { server.cpp } diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc index 3d5cf5b5deb..723340dc4b8 100644 --- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc +++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*server): taoserver, exceptions { +project(*server): taoserver { idlflags += -Sa -St Source_Files { server.cpp } } -project(*client): taoclient, exceptions { +project(*client): taoclient { after += *Server Source_Files { fooC.cpp diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc index 8541c4b3c74..583b69ba543 100644 --- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc +++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): messaging, taoserver, exceptions, ami { +project(*Server): messaging, taoserver, ami { Source_Files { test_i.cpp common.cpp @@ -9,7 +9,7 @@ project(*Server): messaging, taoserver, exceptions, ami { } } -project(*Client): messaging, taoexe, portableserver, exceptions, ami { +project(*Client): messaging, taoexe, portableserver, ami { after += *Server Source_Files { test_i.cpp diff --git a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc index cab5422cb36..70f0d60d81b 100644 --- a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc +++ b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba, bidir_giop { +project(*Server): taoserver, avoids_minimum_corba, bidir_giop { idlflags += -Sa -St Source_Files { @@ -11,7 +11,7 @@ project(*Server): taoserver, minimum_corba, bidir_giop { } -project(*Client): taoclient, minimum_corba, messaging, bidir_giop { +project(*Client): taoclient, avoids_minimum_corba, messaging, bidir_giop { Source_Files { HelloS.cpp diff --git a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc index afa9884eed8..18ac4d8cc04 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc +++ b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(*oneway) : taoserver, dynamicinterface, minimum_corba{ +project(*oneway) : taoserver, dynamicinterface, avoids_minimum_corba{ exename = Collocated_Test } diff --git a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc index c77ecfa435b..931635159a9 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc +++ b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(*twoway) : taoserver, dynamicinterface, minimum_corba{ +project(*twoway) : taoserver, dynamicinterface, avoids_minimum_corba{ exename = Collocated_Test } diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index c5deacad25b..905f8514d9c 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, messaging, minimum_corba, dynamicinterface { +project(*Server): taoserver, messaging, avoids_minimum_corba, dynamicinterface { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { +project(*Client): taoclient, messaging, avoids_minimum_corba, dynamicinterface { after += *Server Source_Files { testC.cpp @@ -16,7 +16,7 @@ project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { } } -project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface { +project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, dynamicinterface { after += *Client Source_Files { test_dsi.cpp diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc index 0bc0ae29bce..b75152236c8 100644 --- a/TAO/tests/Faults/Faults.mpc +++ b/TAO/tests/Faults/Faults.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, avoids_minimum_corba { IDL_Files { test.idl } @@ -14,7 +14,7 @@ project(*Server): taoserver, minimum_corba { } } -project(*Middle): taoexe, portableserver, minimum_corba { +project(*Middle): taoexe, portableserver, avoids_minimum_corba { after += *Server IDL_Files { test.idl @@ -28,7 +28,7 @@ project(*Middle): taoexe, portableserver, minimum_corba { } } -project(*Client): taoexe, portableserver, minimum_corba { +project(*Client): taoexe, portableserver, avoids_minimum_corba { after += *Middle IDL_Files { test.idl @@ -42,7 +42,7 @@ project(*Client): taoexe, portableserver, minimum_corba { } } -project(*Ping): taoexe, portableserver, minimum_corba { +project(*Ping): taoexe, portableserver, avoids_minimum_corba { IDL_Files { ping.idl } @@ -55,7 +55,7 @@ project(*Ping): taoexe, portableserver, minimum_corba { } } -project(*Pong): taoexe, portableserver, minimum_corba { +project(*Pong): taoexe, portableserver, avoids_minimum_corba { after += *Ping IDL_Files { ping.idl diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 0f597f3533e..7e02b0a1784 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, avoids_minimum_corba { Source_Files { File_i.cpp server.cpp } } -project(*Client): taoclient, anytypecode, minimum_corba { +project(*Client): taoclient, anytypecode, avoids_minimum_corba { after += *Server Source_Files { FileC.cpp diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc index a41e64733b8..9cb0eebf2ea 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.mpc +++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc @@ -9,7 +9,7 @@ project(ICMG_Any_Bug_Hello_Server): taoserver { } } -project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, minimum_corba { +project(ICMG_Any_Bug_Hello_Client): taoclient, ifr_client, dynamicinterface, avoids_minimum_corba { after += ICMG_Any_Bug_Hello_Server Source_Files { TestC.cpp diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc index d6f4df5acc4..17d70b094ed 100644 --- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc +++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, avoids_minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoclient, anytypecode, minimum_corba { +project(*Client): taoclient, anytypecode, avoids_minimum_corba { exename = client after += *Server Source_Files { @@ -17,7 +17,7 @@ project(*Client): taoclient, anytypecode, minimum_corba { } } -project(*Manager): taoserver, minimum_corba, iormanip { +project(*Manager): taoserver, avoids_minimum_corba, iormanip { exename = manager after += *Client Source_Files { diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc index ab023c419a3..70caf0c7e8c 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba, bidir_giop { +project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop { Source_Files { ReceiverC.cpp SenderC.cpp @@ -12,7 +12,7 @@ project(*Server): taoexe, portableserver, minimum_corba, bidir_giop { } } -project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { +project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop { after += *Server Source_Files { ReceiverC.cpp diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc index 1b292027ede..b70821d807c 100644 --- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc +++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, anytypecode, exceptions { +project(*Server): taoserver, anytypecode { Source_Files { test_i.cpp server.cpp } } -project(*Client): taoclient, anytypecode, exceptions { +project(*Client): taoclient, anytypecode { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc index 8bd676130d6..cc84bb9e931 100644 --- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc +++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoserver, minimum_corba { +project(POA*): taoserver, avoids_minimum_corba { } diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc index c96018f073f..c06f8c7230e 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc +++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA Default Servant): taoserver, minimum_corba { +project(POA Default Servant): taoserver, avoids_minimum_corba { exename = Default_Servant } diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc index 5411e0e656f..ccccdb0a944 100644 --- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc +++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, endpointpolicy, pi_server, minimum_corba { +project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba { idlflags += -Sa -St Source_Files { Hello.cpp diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc index 5400bf85c9b..2d534a1f414 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.mpc +++ b/TAO/tests/POA/Etherealization/Etherealization.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA*): taoserver, minimum_corba { +project(POA*): taoserver, avoids_minimum_corba { exename = Etherealization } 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 6443ce82a36..1243bd44d0e 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, minimum_corba { +project(POA*): taoexe, portableserver, avoids_minimum_corba { } diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc index 6443ce82a36..1243bd44d0e 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, minimum_corba { +project(POA*): taoexe, portableserver, avoids_minimum_corba { } diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc index b6c6400e52f..3179c2f1fef 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, pi_server, minimum_corba { +project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba { } diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc index 6443ce82a36..1243bd44d0e 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(POA*): taoexe, portableserver, minimum_corba { +project(POA*): taoexe, portableserver, avoids_minimum_corba { } diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 4ad4fa1ba44..7a8e3fc970e 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, minimum_corba { +project(*Server): taoserver, avoids_minimum_corba { Source_Files { param_test_i.cpp server.cpp } } -project(*Client): taoserver, minimum_corba, dynamicinterface { +project(*Client): taoserver, avoids_minimum_corba, dynamicinterface { avoids += ace_for_tao exename = client after += *Server @@ -58,7 +58,7 @@ project(*Client): taoserver, minimum_corba, dynamicinterface { } } -project(*Anyop): taoserver, minimum_corba { +project(*Anyop): taoserver, avoids_minimum_corba { exename = anyop after += *Client diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc index d53cfd5839c..375ecea5930 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc @@ -6,7 +6,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, pi_server, exceptions { +project(*Server): taoserver, pi_server { after += *idl Source_Files { StateTransferS.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server, exceptions { } } -project(*Client): taoclient, exceptions { +project(*Client): taoclient { after += *idl Source_Files { StateTransferC.cpp diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc index 0242f6d3360..6956b78b5fe 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc @@ -6,7 +6,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, pi_server, exceptions { +project(*Server): taoserver, pi_server { after += *idl Source_Files { InvokeMeS.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server, exceptions { } } -project(*Client): taoclient, exceptions { +project(*Client): taoclient { after += *idl Source_Files { InvokeMeC.cpp diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc index d53cfd5839c..375ecea5930 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc @@ -6,7 +6,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, pi_server, exceptions { +project(*Server): taoserver, pi_server { after += *idl Source_Files { StateTransferS.cpp @@ -17,7 +17,7 @@ project(*Server): taoserver, pi_server, exceptions { } } -project(*Client): taoclient, exceptions { +project(*Client): taoclient { after += *idl Source_Files { StateTransferC.cpp diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 85cadf3219a..c5ccb8581bc 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, rtcorba, minimum_corba { +project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba { source_files { client.cpp Custom_Network_Priority_Mapping.cpp } } -project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { +project(*server) : taoexe, rtportableserver, rtcorba, avoids_minimum_corba { after += *client source_files { server.cpp diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc index ebf79370785..f5dc1beb373 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server, avoids_minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index a77351b5090..5d6851d5497 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 87178218057..59888270ada 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client, minimum_corba { +project(*Client): rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.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 a77351b5090..5d6851d5497 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,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 87178218057..59888270ada 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client, minimum_corba { +project(*Client): rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc index 1e97eefaee4..e81f6141eb0 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.mpc +++ b/TAO/tests/RTCORBA/Policies/Policies.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project(RTCORBA Policies Server): rt_server, minimum_corba { +project(RTCORBA Policies Server): rt_server, avoids_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 c7a5f0c3229..0af6683c5ee 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server, avoids_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 ebf79370785..f5dc1beb373 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,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server, avoids_minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 87178218057..59888270ada 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): rt_server, minimum_corba { +project(*Server): rt_server, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client, minimum_corba { +project(*Client): rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.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 4d9a96b12f0..4bb83cef1d2 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -1,11 +1,11 @@ // $Id$ -project(*Server): rt_server, strategies, portableserver, minimum_corba { +project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): rt_client, strategies, portableserver, minimum_corba { +project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba { after += *Server 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 a77351b5090..5d6851d5497 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server, avoids_minimum_corba { Source_Files { server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index ebf79370785..f5dc1beb373 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Server): strategies, rt_server, minimum_corba { +project(*Server): strategies, rt_server, avoids_minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Client): strategies, rt_client, minimum_corba { +project(*Client): strategies, rt_client, avoids_minimum_corba { after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc index 9c240b72452..1c69c99c304 100644 --- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc +++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoexe, portableserver, minimum_corba { +project(*Server): taoexe, portableserver, avoids_minimum_corba { Source_Files { server.cpp Test_i.cpp diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 0fe69a4a621..7160291f272 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, exceptions { +project(*Server): taoserver { Source_Files { server.cpp } } -project(*Client): taoclient, anytypecode, exceptions { +project(*Client): taoclient, anytypecode { after += *Server Source_Files { testC.cpp diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc index a617d344245..51dd9b64af9 100644 --- a/TAO/utils/NamingViewer/NamingViewer.mpc +++ b/TAO/utils/NamingViewer/NamingViewer.mpc @@ -3,7 +3,6 @@ project : namingexe, ace_mfc { exename = NamingViewer - requires += exceptions install = $(ACE_ROOT)/bin pch_header = StdAfx.h pch_source = StdAfx.cpp |