diff options
author | bala <balanatarajan@users.noreply.github.com> | 2003-12-12 05:13:38 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2003-12-12 05:13:38 +0000 |
commit | 74113596d77c094a1c02bb7ccfaf56b9518dc91f (patch) | |
tree | 93f1b735cf9664058b3a541c5bfa51acc32cbc25 | |
parent | 601b24f5e7c5518ad6ec5047c44ec6fdd5eb073e (diff) | |
download | ATCD-74113596d77c094a1c02bb7ccfaf56b9518dc91f.tar.gz |
ChangeLogTag:Thu Dec 11 23:10:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
14 files changed, 41 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4bb4b22654a..5dec9a41523 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,19 @@ +Thu Dec 11 23:10:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * examples/OBV/Typed_Events/Typed_Events.mpc + * examples/POA/DSI/POA_DSI.mpc: + * examples/POA/Generic_Servant/POA_Generic_Servant.mpc: + * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc: + * examples/POA/TIE/POA_TIE.mpc: + * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc: + * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc: + * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc: + * tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc: + * performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc: + * orbsvcs/examples/ORT/ORT.mpc: + + Do not compile the above tests when minimum_corba is disabled. + Thu Dec 11 22:22:36 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/RTScheduling/VoidData/Makefile: diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index e6dff43e0d4..a2512b85194 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -1,4 +1,5 @@ project(*server): taoexe, portableserver, valuetype { + avoids += minimum_corba Source_Files { Server_i.cpp Event_Types_impl.cpp @@ -8,6 +9,7 @@ project(*server): taoexe, portableserver, valuetype { } project(*client): taoexe, portableserver, valuetype { + avoids += minimum_corba Source_Files { Client_i.cpp Event_Types_impl.cpp diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc index 266133c6951..19d9e4f61a2 100644 --- a/TAO/examples/POA/DSI/POA_DSI.mpc +++ b/TAO/examples/POA/DSI/POA_DSI.mpc @@ -6,7 +6,8 @@ project(*Client) : taoexe, messaging, portableserver { } } -project(*Server) : taoexe, messaging, portableserver, dynamicinterface { +project(*Server) : taoexe, messaging, portableserver, dynamicinterface{ + avoids += minimum_corba source_files { Database_i.cpp server.cpp diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc index 3fce3e7f2ab..5ddbc1753a3 100644 --- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc +++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc @@ -10,6 +10,7 @@ project(*lib): taolib_with_idl, portableserver { } project(*client): taoexe, portableserver { + avoids += minimum_corba after += *lib libs += Generic_Servant idl_files { 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 fc44e355b33..04a41e38403 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,4 +1,5 @@ project(*Server): taoexe, portableserver { + avoids += minimum_corba Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc index 68654880054..28a2bf06809 100644 --- a/TAO/examples/POA/TIE/POA_TIE.mpc +++ b/TAO/examples/POA/TIE/POA_TIE.mpc @@ -1,5 +1,5 @@ project(*Client) : taoexe, portableserver { - requires += minimum_corba + avoids += minimum_corba idlflags -= -Sc source_files { client.cpp @@ -8,6 +8,7 @@ project(*Client) : taoexe, portableserver { } project(*Server) : taoexe, portableserver { + avoids += minimum_corba idlflags -= -Sc source_files { test_i.cpp diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc index 55b7f390558..63e660f5387 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc @@ -1,8 +1,7 @@ -project(FTRTEC_Factory_Service): orbsvcsexe, ftorbutils, notify { +project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notify { after += FaultTolerance exename = ftrtec_factory_service includes += $(TAO_ROOT)/orbsvcs - libs += TAO_FaultTolerance specific(gnuace) { lit_libs += TAO_Strategies diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc index 29b0ed09c28..0049ca759e4 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc +++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc @@ -1,4 +1,5 @@ project(*Consumer) : orbsvcsexe, rtevent, naming, rteventlogadmin { + requires += minimum_corba exename = consumer source_files { RTEvent_Consumer.cpp @@ -6,6 +7,7 @@ project(*Consumer) : orbsvcsexe, rtevent, naming, rteventlogadmin { } project(*Supplier) : orbsvcsexe, rtevent, naming, rteventlogadmin { + requires += minimum_corba exename = supplier source_files { RTEvent_Supplier.cpp diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc index a9c7197380c..eb9321488e6 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -1,4 +1,6 @@ +// $Id$ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client { + avoids += minimum_corba source_files { GatewayC.cpp GatewayS.cpp @@ -14,6 +16,7 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client { project(*Server) : orbsvcsexe, dynamicinterface, ifr_client { exename = server after += *Gateway + avoids += minimum_corba source_files { server.cpp GatewayC.cpp @@ -31,6 +34,7 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client { } project(*Client) : orbsvcsexe, event { + avoids += minimum_corba after += *Server source_files { client.cpp diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc index 38eacbb4a8c..bfb4380bccc 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc @@ -1,4 +1,6 @@ +// $Id$ 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/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc index 462f32a40ae..ec9dfb2053b 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc @@ -1,2 +1,3 @@ project(POA*): taoexe, portableserver { + avoids += minimum_corba } diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index 0aee233bb3a..31e74cfc0be 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -1,10 +1,12 @@ project(*Server): strategies, rt_server { + avoids += minimum_corba Source_Files { server.cpp } } project(*Client): strategies, rt_client { + avoids += minimum_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 3f3c8f2babe..c515981181f 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -1,10 +1,12 @@ project(*Server): rt_server { + avoids += minimum_corba Source_Files { server.cpp } } project(*Client): taoexe { + avoids += minimum_corba requires += rt_corba Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc index 08e506244c8..220bbb47171 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Profile_And_Endpoint_Selection.mpc @@ -1,10 +1,13 @@ +// $Id$ project(*Server): rt_server, strategies, portableserver { + avoids += minimum_corba Source_Files { server.cpp } } project(*Client): rt_client, strategies, portableserver { + avoids += minimum_corba Source_Files { client.cpp } |