diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-07-18 13:46:42 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-07-18 13:46:42 +0000 |
| commit | 9e4c49620cf3ef4394bcfa59b1243956f54fbdf7 (patch) | |
| tree | 2660e43a62560887214912970a161cf48bb9aad5 | |
| parent | ba9692d06c0b01e5810b3d8a4c09bfa54bdb6e9f (diff) | |
| download | ATCD-9e4c49620cf3ef4394bcfa59b1243956f54fbdf7.tar.gz | |
ChangeLogTag: Thu Jul 18 08:46:16 2002 Chad Elliott <elliott_c@ociweb.com>
100 files changed, 646 insertions, 354 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8992f2979a5..83efa1dfb12 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,111 @@ +Thu Jul 18 08:46:16 2002 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/orbsvcs/AV.mpc: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLifeCycle.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/CosTime.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + * orbsvcs/orbsvcs/ETCL.mpc: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/IFRService.mpc: + * orbsvcs/orbsvcs/Loadbalancing.mpc: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTOLDEvent.mpc: + * orbsvcs/orbsvcs/RTSched.mpc: + * orbsvcs/orbsvcs/RTSchedEvent.mpc: + * orbsvcs/orbsvcs/SSLIOP.mpc: + * orbsvcs/orbsvcs/Security.mpc: + + Added options to generate conditional target GNU Makefiles. + + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc: + * orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc: + * orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc: + * orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc: + * orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc: + * orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc: + * orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc: + * orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc: + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc: + * orbsvcs/tests/Concurrency/Concurrency.mpc: + * orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc: + * orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc: + * orbsvcs/tests/EC_Throughput/EC_Throughput.mpc: + * orbsvcs/tests/Event/Basic/Event_Basic.mpc: + * orbsvcs/tests/Event/Performance/Event_Performance.mpc: + * orbsvcs/tests/Event/lib/Event_lib.mpc: + * orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc: + * orbsvcs/tests/ImplRepo/ImplRepo.mpc: + * orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc: + * orbsvcs/tests/LoadBalancing/LoadBalancing.mpc: + * orbsvcs/tests/Miop/McastHello/McastHello.mpc: + * orbsvcs/tests/Notify/Basic/Basic.mpc: + * orbsvcs/tests/Property/Property.mpc: + * orbsvcs/tests/Sched/Sched.mpc: + * orbsvcs/tests/Sched_Conf/Sched_Conf.mpc: + * orbsvcs/tests/Security/Big_Request/Big_Request.mpc: + * orbsvcs/tests/Security/Callback/Callback.mpc: + * orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc: + * orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc: + * orbsvcs/tests/Simple_Naming/Simple_Naming.mpc: + * orbsvcs/tests/Time/Time.mpc: + * orbsvcs/tests/Trading/Trading.mpc: + * orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc: + * tests/AMI/AMI.mpc: + * tests/BiDirectional/BiDirectional.mpc: + * tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc: + * tests/Big_Request_Muxing/Big_Request_Muxing.mpc: + * tests/Blocking_Sync_None/Blocking_Sync_None.mpc: + * tests/Crashed_Callback/Crashed_Callback.mpc: + * tests/DSI_Gateway/DSI_Gateway.mpc: + * tests/Faults/Faults.mpc: + * tests/File_IO/File_IO.mpc: + * tests/MProfile_Forwarding/MProfile_Forwarding.mpc: + * tests/MT_BiDir/MT_BiDir.mpc: + * tests/MT_Timeout/MT_Timeout.mpc: + * tests/Native_Exceptions/Native_Exceptions.mpc: + * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc: + * tests/ORT/ORT.mpc: + * tests/Oneway_Buffering/Oneway_Buffering.mpc: + * tests/POA/Etherealization/Etherealization.mpc: + * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc: + * tests/POA/Identity/Identity.mpc: + * tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc: + * tests/POA/Object_Reactivation/Object_Reactivation.mpc: + * tests/POA/POA_Destruction/POA_Destruction.mpc: + * tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc: + * tests/POA/wait_for_completion/wait_for_completion.mpc: + * tests/Param_Test/Param_Test.mpc: + * tests/Policies/Policies.mpc: + * tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc: + * tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc: + * tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc: + * tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc: + * tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc: + * tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc: + * tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc: + * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc: + * tests/Reliable_Oneways/Reliable_Oneways.mpc: + * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc: + * tests/Timeout/Timeout.mpc: + + Added options to generate target conditional GNU Makefiles based + on GNU Make macro settings. + Wed Jul 17 23:54:44 2002 Ossama Othman <ossama@uci.edu> * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h: diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index b09c229607e..87468ac4ae0 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -4,6 +4,7 @@ project(AV) : orbsvcslib { libs += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h dllflags = TAO_AV_BUILD_DLL + tagchecks = AV IDL_Files { AVStreams.idl @@ -11,13 +12,15 @@ project(AV) : orbsvcslib { sfp.idl } - Source_Files { - AVStreamsC.cpp - AVStreamsS.cpp - Null_MediaCtrlC.cpp - Null_MediaCtrlS.cpp - sfpC.cpp - sfpS.cpp - AV + Source_Files(ORBSVCS_COMPONENTS) { + AV { + AVStreamsC.cpp + AVStreamsS.cpp + Null_MediaCtrlC.cpp + Null_MediaCtrlS.cpp + sfpC.cpp + sfpS.cpp + AV + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 1c376834464..3c1d82fd977 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -4,14 +4,17 @@ project(CosConcurrency) : orbsvcslib { libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h dllflags = TAO_CONCURRENCY_BUILD_DLL + tagchecks = Concurrency IDL_Files { CosConcurrencyControl.idl } - Source_Files { - CosConcurrencyControlC.cpp - CosConcurrencyControlS.cpp - Concurrency + Source_Files(ORBSVCS_COMPONENTS) { + Concurrency { + CosConcurrencyControlC.cpp + CosConcurrencyControlS.cpp + Concurrency + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 7c3f263244f..6baf99f3d09 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -4,17 +4,20 @@ project(CosEvent) : orbsvcslib { libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h dllflags = TAO_EVENT_BUILD_DLL + tagchecks = CosEvent IDL_Files { CosEventComm.idl CosEventChannelAdmin.idl } - Source_Files { - CosEventCommC.cpp - CosEventCommS.cpp - CosEventChannelAdminC.cpp - CosEventChannelAdminS.cpp - CosEvent + Source_Files(ORBSVCS_COMPONENTS) { + CosEvent { + CosEventCommC.cpp + CosEventCommS.cpp + CosEventChannelAdminC.cpp + CosEventChannelAdminS.cpp + CosEvent + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index 5e108aa841e..4ef4392e10d 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -4,16 +4,19 @@ project(CosLifeCycle) : orbsvcslib { libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h dllflags = TAO_LIFECYCLE_BUILD_DLL + tagchecks = LifeCycle IDL_Files { CosLifeCycle.idl LifeCycleService.idl } - Source_Files { - CosLifeCycleC.cpp - CosLifeCycleS.cpp - LifeCycleServiceC.cpp - LifeCycleServiceS.cpp + Source_Files(ORBSVCS_COMPONENTS) { + LifeCycle { + CosLifeCycleC.cpp + CosLifeCycleS.cpp + LifeCycleServiceC.cpp + LifeCycleServiceS.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index 847c77004e3..ba3b9832eb1 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -4,14 +4,17 @@ project(CosNaming) : orbsvcslib { libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h dllflags = TAO_NAMING_BUILD_DLL + tagchecks = Naming IDL_Files { CosNaming.idl } - Source_Files { - CosNamingC.cpp - CosNamingS.cpp - Naming + Source_Files(ORBSVCS_COMPONENTS) { + Naming { + CosNamingC.cpp + CosNamingS.cpp + Naming + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 42dff5e6f0d..bf21f0a838a 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -4,6 +4,7 @@ project(CosNotification) : orbsvcslib { libs += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h dllflags = TAO_NOTIFY_BUILD_DLL + tagchecks = Notify IDL_Files { CosEventComm.idl @@ -14,19 +15,21 @@ project(CosNotification) : orbsvcslib { CosNotifyChannelAdmin.idl } - Source_Files { - CosEventCommC.cpp - CosEventCommS.cpp - CosEventChannelAdminC.cpp - CosEventChannelAdminS.cpp - CosNotificationC.cpp - CosNotificationS.cpp - CosNotifyCommC.cpp - CosNotifyCommS.cpp - CosNotifyFilterC.cpp - CosNotifyFilterS.cpp - CosNotifyChannelAdminC.cpp - CosNotifyChannelAdminS.cpp - Notify + Source_Files(ORBSVCS_COMPONENTS) { + Notify { + CosEventCommC.cpp + CosEventCommS.cpp + CosEventChannelAdminC.cpp + CosEventChannelAdminS.cpp + CosNotificationC.cpp + CosNotificationS.cpp + CosNotifyCommC.cpp + CosNotifyCommS.cpp + CosNotifyFilterC.cpp + CosNotifyFilterS.cpp + CosNotifyChannelAdminC.cpp + CosNotifyChannelAdminS.cpp + Notify + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index cefe8de39a5..9d6d3f9aafa 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -4,14 +4,17 @@ project(CosProperty) : orbsvcslib { libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h dllflags = TAO_PROPERTY_BUILD_DLL + tagchecks = Property IDL_Files { CosPropertyService.idl } - Source_Files { - CosPropertyServiceC.cpp - CosPropertyServiceS.cpp - Property + Source_Files(ORBSVCS_COMPONENTS) { + Property { + CosPropertyServiceC.cpp + CosPropertyServiceS.cpp + Property + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 04c9f46d7ea..55716d3e0b4 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -4,14 +4,17 @@ project(CosTime) : orbsvcslib { libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h dllflags = TAO_TIME_BUILD_DLL + tagchecks = Time IDL_Files { TimeService.idl } - Source_Files { - TimeServiceC.cpp - TimeServiceS.cpp - Time + Source_Files(ORBSVCS_COMPONENTS) { + Time { + TimeServiceC.cpp + TimeServiceS.cpp + Time + } } } diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 3db64b44019..962a47da1e7 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -4,6 +4,7 @@ project(CosTrading) : orbsvcslib { libs += TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h dllflags = TAO_TRADING_BUILD_DLL + tagchecks = Trader IDL_Files { CosTrading.idl @@ -11,13 +12,15 @@ project(CosTrading) : orbsvcslib { CosTradingDynamic.idl } - Source_Files { - CosTradingC.cpp - CosTradingS.cpp - CosTradingReposC.cpp - CosTradingReposS.cpp - CosTradingDynamicC.cpp - CosTradingDynamicS.cpp - Trader + Source_Files(ORBSVCS_COMPONENTS) { + Trader { + CosTradingC.cpp + CosTradingS.cpp + CosTradingReposC.cpp + CosTradingReposS.cpp + CosTradingDynamicC.cpp + CosTradingDynamicS.cpp + Trader + } } } diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index e89600c7b99..c687b4c5ee3 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -4,14 +4,17 @@ project(DsLogAdmin) : orbsvcslib { libs += TAO_CosTrading TAO_Svc_Utils TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h dllflags = TAO_LOG_BUILD_DLL + tagchecks = Log IDL_Files { DsLogAdmin.idl } - Source_Files { - DsLogAdminC.cpp - DsLogAdminS.cpp - Log + Source_Files(ORBSVCS_COMPONENTS) { + Log { + DsLogAdminC.cpp + DsLogAdminS.cpp + Log + } } } diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc index 3cf86b8fdab..ad850cbf3dc 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -2,6 +2,7 @@ project(ETCL) : orbsvcslib { sharedname = TAO_ETCL libs += TAO dllflags = TAO_ETCL_BUILD_DLL + tagchecks = Notify IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 56a8257281e..36004fc8379 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -4,14 +4,17 @@ project(FTORB) : orbsvcslib { libs += TAO_IORManip TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dllflags = TAO_FT_BUILD_DLL + tagchecks = FTORB IDL_Files { FT_CORBA_ORB.idl } - Source_Files { - FT_CORBA_ORBC.cpp - FT_CORBA_ORBS.cpp - FaultTolerance + Source_Files(ORBSVCS_COMPONENTS) { + FTORB { + FT_CORBA_ORBC.cpp + FT_CORBA_ORBS.cpp + FaultTolerance + } } } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 8339b127493..443fa59246f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -4,13 +4,16 @@ project(FaultTolerance) : orbsvcslib { libs += TAO_FTORB TAO_CosNaming TAO_CosNotification TAO_Svc_Utils TAO_IORManip TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h dllflags = TAO_FT_BUILD_DLL + tagchecks = FaultTolerance IDL_Files { FT_CORBA.idl } - Source_Files { - FT_CORBAC.cpp - FT_CORBAS.cpp + Source_Files(ORBSVCS_COMPONENTS) { + FaultTolerance { + FT_CORBAC.cpp + FT_CORBAS.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index d3ce4677f11..16609d00e56 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -3,11 +3,14 @@ project(IFRService) : orbsvcslib { sharedname = TAO_IFRService libs += TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO dllflags = TAO_IFRSERVICE_BUILD_DLL + tagchecks = IFRService IDL_Files { } - Source_Files { - IFRService + Source_Files(ORBSVCS_COMPONENTS) { + IFRService { + IFRService + } } } diff --git a/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc b/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc index d0b216137c3..c02d136aacc 100644 --- a/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc @@ -4,19 +4,22 @@ project(LoadBalancing) : orbsvcslib { libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h dllflags = TAO_LOADBALANCING_BUILD_DLL + tagchecks = LoadBalancing IDL_Files { LoadBalancing.idl } - Source_Files { - LoadBalancingC.cpp - LoadBalancingS.cpp - LoadBalancing/LoadBalancer_i.cpp - LoadBalancing/LoadBalancing_Strategy.cpp - LoadBalancing/ReplicaLocator.cpp - LoadBalancing/ReplicaProxy.cpp - LoadBalancing/Round_Robin_Strategy.cpp - LoadBalancing/Minimum_Dispersion.cpp + Source_Files(ORBSVCS_COMPONENTS) { + LoadBalancing { + LoadBalancingC.cpp + LoadBalancingS.cpp + LoadBalancing/LoadBalancer_i.cpp + LoadBalancing/LoadBalancing_Strategy.cpp + LoadBalancing/ReplicaLocator.cpp + LoadBalancing/ReplicaProxy.cpp + LoadBalancing/Round_Robin_Strategy.cpp + LoadBalancing/Minimum_Dispersion.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 9033185e80b..e57d2d3a1c7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -4,17 +4,20 @@ project(PortableGroup) : orbsvcslib { libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h dllflags = TAO_PORTABLEGROUP_BUILD_DLL + tagchecks = PortableGroup IDL_Files { miop.idl PortableGroup.idl } - Source_Files { - miopC.cpp - miopS.cpp - PortableGroupC.cpp - PortableGroupS.cpp - PortableGroup + Source_Files(ORBSVCS_COMPONENTS) { + PortableGroup { + miopC.cpp + miopS.cpp + PortableGroupC.cpp + PortableGroupS.cpp + PortableGroup + } } } diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 56bbbdacd49..33394200b25 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -4,12 +4,15 @@ project(RTCORBAEvent) : orbsvcslib { libs += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_RTPortableServer TAO_PortableServer TAO_RTCORBA TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h dllflags = TAO_RTCORBAEVENT_BUILD_DLL + tagchecks = RTCORBAEvent IDL_Files { } - Source_Files { - Event/EC_RTCORBA_Dispatching.cpp - Event/EC_RTCORBA_Factory.cpp + Source_Files(ORBSVCS_COMPONENTS) { + RTCORBAEvent { + Event/EC_RTCORBA_Dispatching.cpp + Event/EC_RTCORBA_Factory.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 3112a85ea8e..299479c2a71 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -4,6 +4,7 @@ project(RTEvent) : orbsvcslib { libs += TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h dllflags = TAO_RTEVENT_BUILD_DLL + tagchecks = RTEvent IDL_Files { RtecDefaultEventData.idl @@ -12,59 +13,61 @@ project(RTEvent) : orbsvcslib { RtecUDPAdmin.idl } - Source_Files { - RtecDefaultEventDataC.cpp - RtecDefaultEventDataS.cpp - RtecEventCommC.cpp - RtecEventCommS.cpp - RtecEventChannelAdminC.cpp - RtecEventChannelAdminS.cpp - RtecUDPAdminC.cpp - RtecUDPAdminS.cpp - Event/EC_Event_Channel.cpp - Event/EC_ConsumerAdmin.cpp - Event/EC_SupplierAdmin.cpp - Event/EC_ProxyConsumer.cpp - Event/EC_ProxySupplier.cpp - Event/EC_Supplier_Filter.cpp - Event/EC_Supplier_Filter_Builder.cpp - Event/EC_Trivial_Supplier_Filter.cpp - Event/EC_Filter.cpp - Event/EC_Filter_Builder.cpp - Event/EC_Dispatching.cpp - Event/EC_Factory.cpp - Event/EC_QOS_Info.cpp - Event/EC_Null_Factory.cpp - Event/EC_Disjunction_Filter.cpp - Event/EC_Conjunction_Filter.cpp - Event/EC_Negation_Filter.cpp - Event/EC_Type_Filter.cpp - Event/EC_Basic_Filter_Builder.cpp - Event/EC_Basic_Factory.cpp - Event/EC_Default_Factory.cpp - Event/EC_ObserverStrategy.cpp - Event/EC_Per_Supplier_Filter.cpp - Event/EC_Timeout_Filter.cpp - Event/EC_Timeout_Generator.cpp - Event/EC_Reactive_Timeout_Generator.cpp - Event/EC_MT_Dispatching.cpp - Event/EC_Dispatching_Task.cpp - Event/EC_Scheduling_Strategy.cpp - Event/EC_Null_Scheduling.cpp - Event/EC_Group_Scheduling.cpp - Event/EC_ConsumerControl.cpp - Event/EC_SupplierControl.cpp - Event/EC_Reactive_ConsumerControl.cpp - Event/EC_Reactive_SupplierControl.cpp - Event/EC_Bitmask_Filter.cpp - Event/EC_Masked_Type_Filter.cpp - Event/EC_Prefix_Filter_Builder.cpp - Event/EC_And_Filter.cpp - Event_Utilities.cpp - Event/EC_Gateway.cpp - Event/EC_Gateway_UDP.cpp - Event/ECG_Mcast_EH.cpp - Event/ECG_UDP_Sender.cpp - Event/EC_UDP_Admin.cpp + Source_Files(ORBSVCS_COMPONENTS) { + RTEvent { + RtecDefaultEventDataC.cpp + RtecDefaultEventDataS.cpp + RtecEventCommC.cpp + RtecEventCommS.cpp + RtecEventChannelAdminC.cpp + RtecEventChannelAdminS.cpp + RtecUDPAdminC.cpp + RtecUDPAdminS.cpp + Event/EC_Event_Channel.cpp + Event/EC_ConsumerAdmin.cpp + Event/EC_SupplierAdmin.cpp + Event/EC_ProxyConsumer.cpp + Event/EC_ProxySupplier.cpp + Event/EC_Supplier_Filter.cpp + Event/EC_Supplier_Filter_Builder.cpp + Event/EC_Trivial_Supplier_Filter.cpp + Event/EC_Filter.cpp + Event/EC_Filter_Builder.cpp + Event/EC_Dispatching.cpp + Event/EC_Factory.cpp + Event/EC_QOS_Info.cpp + Event/EC_Null_Factory.cpp + Event/EC_Disjunction_Filter.cpp + Event/EC_Conjunction_Filter.cpp + Event/EC_Negation_Filter.cpp + Event/EC_Type_Filter.cpp + Event/EC_Basic_Filter_Builder.cpp + Event/EC_Basic_Factory.cpp + Event/EC_Default_Factory.cpp + Event/EC_ObserverStrategy.cpp + Event/EC_Per_Supplier_Filter.cpp + Event/EC_Timeout_Filter.cpp + Event/EC_Timeout_Generator.cpp + Event/EC_Reactive_Timeout_Generator.cpp + Event/EC_MT_Dispatching.cpp + Event/EC_Dispatching_Task.cpp + Event/EC_Scheduling_Strategy.cpp + Event/EC_Null_Scheduling.cpp + Event/EC_Group_Scheduling.cpp + Event/EC_ConsumerControl.cpp + Event/EC_SupplierControl.cpp + Event/EC_Reactive_ConsumerControl.cpp + Event/EC_Reactive_SupplierControl.cpp + Event/EC_Bitmask_Filter.cpp + Event/EC_Masked_Type_Filter.cpp + Event/EC_Prefix_Filter_Builder.cpp + Event/EC_And_Filter.cpp + Event_Utilities.cpp + Event/EC_Gateway.cpp + Event/EC_Gateway_UDP.cpp + Event/ECG_Mcast_EH.cpp + Event/ECG_UDP_Sender.cpp + Event/EC_UDP_Admin.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index be00e0764b8..b834592a43e 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -3,20 +3,23 @@ project(RTOLDEvent) : orbsvcslib { sharedname = TAO_RTOLDEvent libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO dllflags = TAO_RTOLDEVENT_BUILD_DLL + tagchecks = RTOLDEvent IDL_Files { } - Source_Files { - Event/BCU.cpp - Event/Dispatching_Modules.cpp - Event/Event_Channel.cpp - Event/Event_Manip.cpp - Event/Local_ESTypes.cpp - Event/Memory_Pools.cpp - Event/RT_Task.cpp - Event/ReactorTask.cpp - Event/Timer_Module.cpp - Event/Module_Factory.cpp + Source_Files(ORBSVCS_COMPONENTS) { + RTOLDEvent { + Event/BCU.cpp + Event/Dispatching_Modules.cpp + Event/Event_Channel.cpp + Event/Event_Manip.cpp + Event/Local_ESTypes.cpp + Event/Memory_Pools.cpp + Event/RT_Task.cpp + Event/ReactorTask.cpp + Event/Timer_Module.cpp + Event/Module_Factory.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 50cfb0c2c71..4e73ac166b5 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -4,17 +4,20 @@ project(RTSched) : orbsvcslib { libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h dllflags = TAO_RTSCHED_BUILD_DLL + tagchecks = Sched IDL_Files { RtecScheduler.idl } Source_Files { - RtecSchedulerC.cpp - RtecSchedulerS.cpp - Scheduler_Factory.cpp - Runtime_Scheduler.cpp - Scheduler_Utilities.cpp - Sched + Sched { + RtecSchedulerC.cpp + RtecSchedulerS.cpp + Scheduler_Factory.cpp + Runtime_Scheduler.cpp + Scheduler_Utilities.cpp + Sched + } } } diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index f9c4525c40f..bef5adaf422 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -3,16 +3,19 @@ project(RTSchedEvent) : orbsvcslib { sharedname = TAO_RTSchedEvent libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO dllflags = TAO_RTSCHEDEVENT_BUILD_DLL + tagchecks = RTSchedEvent IDL_Files { } - Source_Files { - Event/EC_Sched_Filter.cpp - Event/EC_Sched_Filter_Builder.cpp - Event/EC_Priority_Scheduling.cpp - Event/EC_Priority_Dispatching.cpp - Event/EC_Sched_Factory.cpp - Event/EC_Gateway_Sched.cpp + Source_Files(ORBSVCS_COMPONENTS) { + RTSchedEvent { + Event/EC_Sched_Filter.cpp + Event/EC_Sched_Filter_Builder.cpp + Event/EC_Priority_Scheduling.cpp + Event/EC_Priority_Dispatching.cpp + Event/EC_Sched_Factory.cpp + Event/EC_Gateway_Sched.cpp + } } } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 32586d0b544..c435325dbdd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -5,14 +5,17 @@ project(SSLIOP) : orbsvcslib { libs += TAO_Security TAO_PortableServer TAO ACE_SSL idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h dllflags = TAO_SSLIOP_BUILD_DLL + tagchecks = SSLIOP IDL_Files { SSLIOP.idl } - Source_Files { - SSLIOPC.cpp - SSLIOPS.cpp - SSLIOP + Source_Files(ORBSVCS_COMPONENTS) { + SSLIOP { + SSLIOPC.cpp + SSLIOPS.cpp + SSLIOP + } } } diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index f5cfece2915..2480bb0b6a6 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -4,6 +4,7 @@ project(Security) : orbsvcslib { libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h dllflags = TAO_SECURITY_BUILD_DLL + tagchecks = Security IDL_Files { Security.idl @@ -12,15 +13,17 @@ project(Security) : orbsvcslib { SecurityReplaceable.idl } - Source_Files { - SecurityC.cpp - SecurityS.cpp - SecurityLevel1C.cpp - SecurityLevel1S.cpp - SecurityLevel2C.cpp - SecurityLevel2S.cpp - SecurityReplaceableC.cpp - SecurityReplaceableS.cpp - Security + Source_Files(ORBSVCS_COMPONENTS) { + Security { + SecurityC.cpp + SecurityS.cpp + SecurityLevel1C.cpp + SecurityLevel1S.cpp + SecurityLevel2C.cpp + SecurityLevel2S.cpp + SecurityReplaceableC.cpp + SecurityReplaceableS.cpp + Security + } } } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc index d85f7d336c4..3fbedf431e6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -7,7 +7,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(distributer): orbsvcsexe, avstreamsexe { +project(distributer): avstreamsexe { exename = distributer Source_Files { @@ -16,7 +16,7 @@ project(distributer): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc index 3fafd05d6f0..87f5ca868bc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc index 4d4eb2bf3ed..8686dbabf50 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe, strategies { +project(sender): avstreamsexe, strategies { exename = sender Source_Files { @@ -7,7 +7,7 @@ project(sender): orbsvcsexe, avstreamsexe, strategies { } } -project(distributer): orbsvcsexe, avstreamsexe, strategies { +project(distributer): avstreamsexe, strategies { exename = distributer Source_Files { @@ -16,7 +16,7 @@ project(distributer): orbsvcsexe, avstreamsexe, strategies { } } -project(receiver): orbsvcsexe, avstreamsexe, strategies { +project(receiver): avstreamsexe, strategies { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc index fb88d5acec7..a22b5c3335e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc @@ -1,4 +1,4 @@ -project(server): orbsvcsexe, avstreamsexe { +project(server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): orbsvcsexe, avstreamsexe { } } -project(ftp): orbsvcsexe, avstreamsexe { +project(ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc index 711cd9d29c4..11514686f85 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc @@ -1,4 +1,4 @@ -project(ping): orbsvcsexe, avstreamsexe, strategies { +project(ping): avstreamsexe, strategies { exename = ping Source_Files { @@ -6,7 +6,7 @@ project(ping): orbsvcsexe, avstreamsexe, strategies { } } -project(pong): orbsvcsexe, avstreamsexe, strategies { +project(pong): avstreamsexe, strategies { exename = pong Source_Files { @@ -14,7 +14,7 @@ project(pong): orbsvcsexe, avstreamsexe, strategies { } } -project(control): orbsvcsexe, avstreamsexe, strategies { +project(control): avstreamsexe, strategies { exename = control Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc index 3fafd05d6f0..87f5ca868bc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc index 16bcdf02d48..24150d0814c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc @@ -1,4 +1,4 @@ -project(server): orbsvcsexe, avstreamsexe, strategies { +project(server): avstreamsexe, strategies { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): orbsvcsexe, avstreamsexe, strategies { } } -project(ftp): orbsvcsexe, avstreamsexe, strategies { +project(ftp): avstreamsexe, strategies { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc index fb88d5acec7..a22b5c3335e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc @@ -1,4 +1,4 @@ -project(server): orbsvcsexe, avstreamsexe { +project(server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): orbsvcsexe, avstreamsexe { } } -project(ftp): orbsvcsexe, avstreamsexe { +project(ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc index 3fafd05d6f0..87f5ca868bc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc index fb88d5acec7..a22b5c3335e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc @@ -1,4 +1,4 @@ -project(server): orbsvcsexe, avstreamsexe { +project(server): avstreamsexe { exename = server Source_Files { @@ -6,7 +6,7 @@ project(server): orbsvcsexe, avstreamsexe { } } -project(ftp): orbsvcsexe, avstreamsexe { +project(ftp): avstreamsexe { exename = ftp Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc index 64014297999..80ac33b728f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc @@ -2,13 +2,14 @@ project(avstreams ts) : orbsvcslib { sharedname = TAO_TS dllflags = TAO_AV_BUILD_DLL install = + comps += AV Source_Files { TimeStamp.cpp } } -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -16,7 +17,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc index 14656da768d..af38d4d5ec6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(distributer): orbsvcsexe, avstreamsexe { +project(distributer): avstreamsexe { exename = distributer Source_Files { @@ -14,7 +14,7 @@ project(distributer): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc index 3fafd05d6f0..87f5ca868bc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { exename = sender Source_Files { @@ -6,7 +6,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { exename = receiver Source_Files { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc index d5ea16da14d..70d14127c00 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc @@ -1,4 +1,4 @@ -project(sender): orbsvcsexe, avstreamsexe { +project(sender): avstreamsexe { depends += QoS libs += ACE_QoS exename = sender @@ -8,7 +8,7 @@ project(sender): orbsvcsexe, avstreamsexe { } } -project(receiver): orbsvcsexe, avstreamsexe { +project(receiver): avstreamsexe { depends += QoS libs += ACE_QoS exename = receiver diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc index 5d3a7bf18fe..e7f7d5a00ed 100644 --- a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc +++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc @@ -2,4 +2,5 @@ project(CC client) : orbsvcsexe { depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer libs += TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer exename = CC_client -}
\ No newline at end of file + comps += Concurrency +} diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc index 90695b413b6..7a829267722 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc +++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc @@ -3,6 +3,7 @@ project(Disconnect): orbsvcsexe, messaging { libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable includes += ../lib exename = Disconnect + comps += CosEvent Source_Files { Disconnect.cpp @@ -14,6 +15,7 @@ project(MT_Disconnect): orbsvcsexe, messaging { libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable includes += ../lib exename = MT_Disconnect + comps += CosEvent Source_Files { MT_Disconnect.cpp @@ -25,6 +27,7 @@ project(Push_Event): orbsvcsexe, messaging { libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable includes += ../lib exename = Push_Event + comps += CosEvent Source_Files { Push_Event.cpp @@ -36,6 +39,7 @@ project(Pull_Push_Event): orbsvcsexe, messaging { libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable includes += ../lib exename = Pull_Push_Event + comps += CosEvent Source_Files { Pull_Push_Event.cpp @@ -47,6 +51,7 @@ project(Shutdown): orbsvcsexe, messaging { libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable includes += ../lib exename = Shutdown + comps += CosEvent Source_Files { Shutdown.cpp @@ -58,6 +63,7 @@ project(Random): orbsvcsexe, messaging { libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable includes += ../lib exename = Random + comps += CosEvent Source_Files { Random.cpp diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc index 90aead5a8fb..1b2d44aa696 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc +++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc @@ -3,6 +3,7 @@ project(CosEvent Test Lib): orbsvcslib { depends += CosEvent CosNaming Svc_Utils IORTable PortableServer libs += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer dllflags = CEC_TEST_BUILD_DLL + comps += CosEvent Header_Files { cectest_export.h diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc index 6c565916946..509996ef24c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc +++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc @@ -2,6 +2,7 @@ project(ECT Supplier): rteventexe { depends += RTOLDEvent RTSched CosNaming IORTable Messaging libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging exename = ECT_Supplier + comps += Naming RTOLDEvent Source_Files { ECT_Driver.cpp @@ -14,6 +15,7 @@ project(ECT Consumer): rteventexe { depends += RTOLDEvent RTSched CosNaming IORTable Messaging libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging exename = ECT_Consumer + comps += Naming RTOLDEvent Source_Files { ECT_Driver.cpp @@ -26,6 +28,7 @@ project(ECT Throughput): rteventexe { depends += RTOLDEvent RTSched CosNaming IORTable Messaging libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging exename = ECT_Throughput + comps += Naming RTOLDEvent Source_Files { ECT_Driver.cpp @@ -33,4 +36,4 @@ project(ECT Throughput): rteventexe { ECT_Supplier.cpp ECT_Throughput.cpp } -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index eae39280a71..058ed4e68a7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -1,6 +1,6 @@ -project(Reconnect): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Reconnect): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Reconnect @@ -9,9 +9,9 @@ project(Reconnect): orbsvcsexe, messaging { } } -project(Shutdown): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Shutdown): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Shutdown @@ -20,9 +20,9 @@ project(Shutdown): orbsvcsexe, messaging { } } -project(Observer): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Observer): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Observer @@ -31,9 +31,9 @@ project(Observer): orbsvcsexe, messaging { } } -project(BCast): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(BCast): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = BCast @@ -42,9 +42,9 @@ project(BCast): orbsvcsexe, messaging { } } -project(Timeout): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Timeout): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Timeout @@ -53,9 +53,9 @@ project(Timeout): orbsvcsexe, messaging { } } -project(Wildcard): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Wildcard): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Wildcard @@ -64,9 +64,9 @@ project(Wildcard): orbsvcsexe, messaging { } } -project(Negation): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Negation): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Negation @@ -75,9 +75,9 @@ project(Negation): orbsvcsexe, messaging { } } -project(Disconnect): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Disconnect): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Disconnect @@ -86,9 +86,9 @@ project(Disconnect): orbsvcsexe, messaging { } } -project(MT_Disconnect): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(MT_Disconnect): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = MT_Disconnect @@ -97,9 +97,9 @@ project(MT_Disconnect): orbsvcsexe, messaging { } } -project(Atomic_Reconnect): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Atomic_Reconnect): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Atomic_Reconnect @@ -108,9 +108,9 @@ project(Atomic_Reconnect): orbsvcsexe, messaging { } } -project(Bitmask): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Bitmask): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Bitmask @@ -119,9 +119,9 @@ project(Bitmask): orbsvcsexe, messaging { } } -project(Complex): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Complex): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Complex @@ -130,9 +130,9 @@ project(Complex): orbsvcsexe, messaging { } } -project(Gateway): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Gateway): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Gateway @@ -141,9 +141,9 @@ project(Gateway): orbsvcsexe, messaging { } } -project(Control): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Control): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Control @@ -152,9 +152,9 @@ project(Control): orbsvcsexe, messaging { } } -project(Random): orbsvcsexe, messaging { - depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Random): messaging, rteventexe { + depends += "RTEvent Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Random diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc index 647ba0c8c91..ac909ee28d3 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc +++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc @@ -1,6 +1,6 @@ -project(Throughput): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Throughput): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Throughput @@ -9,9 +9,9 @@ project(Throughput): orbsvcsexe, messaging { } } -project(Connect): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Connect): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Connect @@ -20,9 +20,9 @@ project(Connect): orbsvcsexe, messaging { } } -project(Inversion): orbsvcsexe, messaging { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Inversion): messaging, rteventexe { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Inversion @@ -31,9 +31,9 @@ project(Inversion): orbsvcsexe, messaging { } } -project(Latency): orbsvcsexe, messaging, strategies { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Latency): messaging, rteventexe, strategies { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Latency @@ -42,9 +42,9 @@ project(Latency): orbsvcsexe, messaging, strategies { } } -project(Latency_Server): orbsvcsexe, messaging, strategies { - depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable - libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable +project(Latency_Server): messaging, rteventexe, strategies { + depends += "Event Test Lib" CosNaming IORTable + libs += ECTests TAO_CosNaming TAO_IORTable includes += ../lib exename = Latency_Server diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc index 57cd7116b69..c7a87e6535d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc +++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc @@ -3,6 +3,7 @@ project(Event Test Lib): orbsvcslib { depends += RTEvent CosNaming Svc_Utils IORTable PortableServer libs += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer dllflags = EC_TEST_BUILD_DLL + comps += RTEvent Header_Files { ectest_export.h diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc index d50500423ad..75cdff845c0 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc @@ -1,6 +1,7 @@ project: server, orbsvcsexe { depends += FTORB IORManip libs += TAO_FTORB TAO_IORManip + comps += FTORB Source_Files { test_i.cpp @@ -12,6 +13,7 @@ project(Manager): server, orbsvcsexe { depends += FTORB IORManip libs += TAO_FTORB TAO_IORManip exename = Manager + comps += FTORB Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc index d7f22d77b16..26f2bdf4663 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc @@ -2,4 +2,5 @@ project(IOGRTest): server, orbsvcsexe { depends += FTORB IORManip libs += TAO_FTORB TAO_IORManip exename = IOGRTest + comps += FTORB } diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index e8c53b5d38d..88426df1596 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -1,4 +1,4 @@ -project(airplane server) : server, orbsvcsexe { +project(airplane server) : server, orbsvcsexe, minimum_corba { depends += IORTable libs += TAO_IORTable exename = airplane_server @@ -16,7 +16,7 @@ project(airplane server) : server, orbsvcsexe { } } -project(airplane client) : server, orbsvcsexe { +project(airplane client) : server, orbsvcsexe, minimum_corba { depends += IORTable libs += TAO_IORTable exename = airplane_client @@ -33,7 +33,7 @@ project(airplane client) : server, orbsvcsexe { } } -project(nestea server) : server, orbsvcsexe { +project(nestea server) : server, orbsvcsexe, minimum_corba { depends += IORTable libs += TAO_IORTable exename = nestea_server @@ -51,7 +51,7 @@ project(nestea server) : server, orbsvcsexe { } } -project(nestea client) : server, orbsvcsexe { +project(nestea client) : server, orbsvcsexe, minimum_corba { depends += IORTable libs += TAO_IORTable exename = nestea_client diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index 7e7367b39be..fcea7321be4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -1,4 +1,4 @@ -project(ImplRepo NameService) : namingexe { +project(ImplRepo NameService) : namingexe, minimum_corba { exename = test } diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc index 71b2d35bfe5..1c6510e1669 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc @@ -1,6 +1,7 @@ project: server, orbsvcsexe { depends += LoadBalancing libs += TAO_LoadBalancing + comps += LoadBalancing Source_Files { Hash_ReplicaControl.cpp @@ -13,6 +14,7 @@ project(client): server, orbsvcsexe { depends += LoadBalancing libs += TAO_LoadBalancing exename = client + comps += LoadBalancing Source_Files { Hash_ReplicaC.cpp diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc index 2ad4d82a178..fb0564cd91e 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc @@ -1,11 +1,15 @@ -project: server { +project: server, orbsvcsexe { + comps += PortableGroup + Source_Files { McastHello.cpp server.cpp } } -project: client { +project: client, orbsvcsexe { + comps += PortableGroup + Source_Files { TestC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc new file mode 100644 index 00000000000..4ddb8916264 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc @@ -0,0 +1,49 @@ +project(ConnectDisconnect): notifytest { + exename = ConnectDisconnect + + Source_Files { + ConnectDisconnect.cpp + } +} + + +project(LifeCycleTest): notifytest { + exename = LifeCycleTest + + Source_Files { + LifeCycleTest.cpp + } +} + +project(IdAssignment): notifytest { + exename = IdAssignment + + Source_Files { + IdAssignment.cpp + } +} + +project(Events_Test): notifytest { + exename = Events_Test + + Source_Files { + Events_Test.cpp + } +} + +project(AdminProperties_Test): notifytest { + exename = AdminProperties_Test + + Source_Files { + AdminProperties_Test.cpp + } +} + +project(Simple): notifytest { + exename = Simple + + Source_Files { + Simple.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index 7b728e9c800..a518e2928c2 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -1,6 +1,7 @@ project: server, namingexe { depends += CosProperty libs += TAO_CosProperty + comps += Property Source_Files { server.cpp @@ -11,6 +12,7 @@ project(client): server, namingexe { depends += CosProperty libs += TAO_CosProperty exename = client + comps += Property Source_Files { server.cpp diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc index dae839dfb5d..2bb97fe9c19 100644 --- a/TAO/orbsvcs/tests/Sched/Sched.mpc +++ b/TAO/orbsvcs/tests/Sched/Sched.mpc @@ -2,4 +2,5 @@ project(Sched): server, namingexe { depends += RTSched libs += TAO_RTSched exename = Sched + comps += Sched } diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc index 422c31af14b..0ea29a538af 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc @@ -2,6 +2,7 @@ project(Sched Conf): server, namingexe { depends += RTSched libs += TAO_RTSched exename = Sched_Conf + comps += Sched Source_Files { Sched_Conf.cpp diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc index 893b749f09d..14f7af4e7a0 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc +++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc @@ -1,4 +1,6 @@ project: server { + requires += ssl + Source_Files { TX_Object_i.cpp server.cpp @@ -6,6 +8,8 @@ project: server { } project: client { + requires += ssl + Source_Files { TX_ObjectC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc index 5ca22ac8b3e..88373bd45c1 100644 --- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc +++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc @@ -1,4 +1,6 @@ project: server { + requires += ssl + IDL_Files { server.idl client.idl @@ -14,7 +16,8 @@ project: server { } project(client): server { - exename = client + exename = client + requires += ssl IDL_Files { server.idl diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc index ff315dc282d..c1b8b1dfbba 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc @@ -1,7 +1,9 @@ project: server, orbsvcsexe { - ssl = 1 - depends += Security - libs += TAO_Security + ssl = 1 + depends += Security + libs += TAO_Security + requires += ssl + Source_Files { Foo_i.cpp server.cpp @@ -9,8 +11,9 @@ project: server, orbsvcsexe { } project: client, orbsvcsexe { - depends += Security - libs += TAO_Security + depends += Security + libs += TAO_Security + requires += ssl Source_Files { FooC.cpp diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc index 311f7bf8dc2..91adbf9986c 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc @@ -1,7 +1,8 @@ project: server, orbsvcsexe { - ssl = 1 - depends += Security - libs += TAO_Security + ssl = 1 + depends += Security + libs += TAO_Security + requires += ssl Source_Files { SLevel1_Test_i.cpp server.cpp @@ -9,9 +10,9 @@ project: server, orbsvcsexe { } project: client, orbsvcsexe { - depends += Security - libs += TAO_Security - + depends += Security + libs += TAO_Security + requires += ssl Source_Files { SLevel1_TestC.cpp client.cpp diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index d07f779cc80..9bab3528979 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,7 +1,5 @@ -project(Simple Naming Client) : orbsvcsexe { - depends += CosNaming Svc_Utils IORTable PortableServer +project(Simple Naming Client) : namingexe { exename = client - libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { client.cpp diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc index 70469bedde0..3aebba805f0 100644 --- a/TAO/orbsvcs/tests/Time/Time.mpc +++ b/TAO/orbsvcs/tests/Time/Time.mpc @@ -2,4 +2,5 @@ project(client): server, namingexe { depends += CosTime libs += TAO_CosTime exename = client + comps += Time } diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index 1cd5f5c457c..3bf2fe1a905 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -2,6 +2,7 @@ project(Trading Test Lib): orbsvcslib { depends += CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer TAO libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO sharedname = TTest + comps += Trader Source_Files { TT_Info.cpp @@ -16,6 +17,7 @@ project(export test): namingexe { depends += "Trading Test Lib" CosTrading DynamicAny libs += TTest TAO_CosTrading TAO_DynamicAny exename = export_test + comps += Trader IDL_Files { } @@ -29,6 +31,7 @@ project(import test): namingexe { depends += "Trading Test Lib" CosTrading DynamicAny libs += TTest TAO_CosTrading TAO_DynamicAny exename = import_test + comps += Trader IDL_Files { } @@ -42,6 +45,7 @@ project(colocated test): namingexe { depends += "Trading Test Lib" CosTrading DynamicAny libs += TTest TAO_CosTrading TAO_DynamicAny exename = colocated_test + comps += Trader IDL_Files { } 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 a8f87249a81..04f5f1b0448 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc @@ -1,3 +1,3 @@ -project(tests svc loader): taoexe { +project(tests svc loader): taoexe, minimum_corba { exename = tests_svc_loader -}
\ No newline at end of file +} diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc index 606c5be67a2..694a3a5d5e9 100644 --- a/TAO/tests/AMI/AMI.mpc +++ b/TAO/tests/AMI/AMI.mpc @@ -1,6 +1,7 @@ project: messaging { idlflags -= -Sc idlflags += -GC + requires += ami Source_Files { ami_test_i.cpp @@ -12,6 +13,7 @@ project(client): messaging { exename = client idlflags -= -Sc idlflags += -GC + requires += ami Source_Files { client.cpp @@ -22,6 +24,7 @@ project(simple_client): messaging { exename = simple_client idlflags -= -Sc idlflags += -GC + requires += ami Source_Files { simple_client.cpp diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc index 821605cd9f1..13f76fd88ba 100644 --- a/TAO/tests/BiDirectional/BiDirectional.mpc +++ b/TAO/tests/BiDirectional/BiDirectional.mpc @@ -1,16 +1,18 @@ -project: server { +project: server, minimum_corba { depends += BiDir_GIOP libs += TAO_BiDirGIOP + Source_Files { test_i.cpp server.cpp } } -project(client): server { +project(client): server, minimum_corba { depends += BiDir_GIOP libs += TAO_BiDirGIOP exename = client + Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc index 821605cd9f1..13f76fd88ba 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDirectional_NestedUpcall.mpc @@ -1,16 +1,18 @@ -project: server { +project: server, minimum_corba { depends += BiDir_GIOP libs += TAO_BiDirGIOP + Source_Files { test_i.cpp server.cpp } } -project(client): server { +project(client): server, minimum_corba { depends += BiDir_GIOP libs += TAO_BiDirGIOP exename = client + Source_Files { test_i.cpp client.cpp diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc index e9396864cb4..bf3042ea604 100644 --- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc +++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc @@ -1,11 +1,11 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Payload_Receiver.cpp server.cpp } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc index 00487457700..29aaf7b2e87 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc @@ -1,11 +1,11 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Blocking_Sync_None.cpp server.cpp } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc index e12305ab000..70164d2bab1 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc @@ -1,11 +1,11 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Service.cpp server.cpp } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index 18a78155025..83982b31ae0 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -1,4 +1,4 @@ -project: messaging { +project: messaging, minimum_corba { depends += Dynamic_Interface libs += TAO_DynamicInterface @@ -8,7 +8,7 @@ project: messaging { } } -project(client): messaging { +project(client): messaging, minimum_corba { exename = client depends += Dynamic_Interface libs += TAO_DynamicInterface @@ -19,7 +19,7 @@ project(client): messaging { } } -project(gateway): messaging { +project(gateway): messaging, minimum_corba { exename = gateway depends += Dynamic_Interface libs += TAO_DynamicInterface diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc index 051a351bdb1..8bf74add2da 100644 --- a/TAO/tests/Faults/Faults.mpc +++ b/TAO/tests/Faults/Faults.mpc @@ -1,4 +1,4 @@ -project: server { +project: server, minimum_corba { IDL_Files { test.idl } @@ -11,7 +11,7 @@ project: server { } } -project(middle): server { +project(middle): server, minimum_corba { exename = middle IDL_Files { @@ -26,7 +26,7 @@ project(middle): server { } } -project(client): server { +project(client): server, minimum_corba { exename = client IDL_Files { @@ -41,7 +41,7 @@ project(client): server { } } -project(ping): server { +project(ping): server, minimum_corba { exename = ping IDL_Files { @@ -56,7 +56,7 @@ project(ping): server { } } -project(pong): server { +project(pong): server, minimum_corba { exename = pong IDL_Files { diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 83f9cf6b28d..04a5303a1d7 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -1,11 +1,11 @@ -project: server { +project: server, minimum_corba { Source_Files { File_i.cpp server.cpp } } -project: client { +project: client, minimum_corba { Source_Files { FileC.cpp client.cpp diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc index b947356c7e7..0558cb6c877 100644 --- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc +++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc @@ -1,18 +1,18 @@ -project: server { +project: server, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project: client { +project: client, minimum_corba { Source_Files { testC.cpp client.cpp } } -project(Manager): server { +project(Manager): server, minimum_corba { depends += IORManpulation libs += TAO_IORManip exename = Manager diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc index f0413b5a2e2..e3893e84a84 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -1,4 +1,4 @@ -project: server { +project: server, minimum_corba { depends += BiDir_GIOP libs += TAO_BiDirGIOP Source_Files { @@ -11,7 +11,7 @@ project: server { } } -project(client): server { +project(client): server, minimum_corba { depends += BiDir_GIOP libs += TAO_BiDirGIOP exename = client diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc index 54c91b5e2b2..d8b966c9274 100644 --- a/TAO/tests/MT_Timeout/MT_Timeout.mpc +++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc @@ -1,4 +1,4 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Sleep_Service.cpp Server_Task.cpp @@ -6,7 +6,7 @@ project: messaging { } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc index a2b78ef450e..bdee99b7da0 100644 --- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc +++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc @@ -1,5 +1,6 @@ project: server { - idlflags = -Ge 0 -Sc + idlflags = -Ge 0 -Sc + requires += exceptions Source_Files { test_i.cpp @@ -8,7 +9,8 @@ project: server { } project: client { - idlflags = -Ge 0 -Sc + idlflags = -Ge 0 -Sc + requires += exceptions Source_Files { testC.cpp diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc index 57a65a26fa9..4a87af9a12d 100644 --- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc +++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc @@ -1,11 +1,11 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Server_Peer.cpp server.cpp } } -project(scavenger): messaging { +project(scavenger): messaging, corba_messaging { exename = scavenger Source_Files { @@ -13,7 +13,7 @@ project(scavenger): messaging { } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index 785bf4667fd..a78fe5f9de7 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -1,4 +1,6 @@ project: server { + requires += interceptors + Source_Files { ORT_test_i.cpp ORT_test_IORInterceptor_ORBInitializer.cpp @@ -8,6 +10,8 @@ project: server { } project: client { + requires += interceptors + Source_Files { ORT_testC.cpp client.cpp diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc index e87ba830779..667b2844d14 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc @@ -1,11 +1,11 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Oneway_Buffering.cpp server.cpp } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { @@ -14,7 +14,7 @@ project(client): messaging { } } -project(admin): messaging { +project(admin): messaging, corba_messaging { exename = admin Source_Files { diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc index cde0d7b2e4a..cf35ddc6902 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.mpc +++ b/TAO/tests/POA/Etherealization/Etherealization.mpc @@ -1,3 +1,3 @@ -project(Etherealization): server { +project(Etherealization): server, minimum_corba { exename = Etherealization -}
\ No newline at end of file +} 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 4d5b175ff42..d1817ee998e 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc @@ -1,3 +1,3 @@ project(Excessive Object Deactivations): server { exename = Excessive_Object_Deactivations -}
\ No newline at end of file +} diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc index 57c384a3b81..37a1bc5ed18 100644 --- a/TAO/tests/POA/Identity/Identity.mpc +++ b/TAO/tests/POA/Identity/Identity.mpc @@ -1,3 +1,3 @@ project(Identity): server { exename = Identity -}
\ No newline at end of file +} diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc index 18c586cc5cc..119f0e8e94a 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc @@ -1,3 +1,3 @@ project(Non Servant Upcalls): server { exename = Non_Servant_Upcalls -}
\ No newline at end of file +} diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc index 5a16fb3135a..edfccaff8aa 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc @@ -1,3 +1,3 @@ project(Object Reactivation): server { exename = Object_Reactivation -}
\ No newline at end of file +} diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc index efa52cdc2b0..1e69e041e19 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc @@ -1,3 +1,3 @@ project(POA Destruction): server { exename = POA_Destruction -}
\ No newline at end of file +} 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 8bb0406cbb9..8d187955440 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc @@ -1,3 +1,3 @@ -project(Single Threaded POA): server { +project(Single Threaded POA): server, minimum_corba { exename = Single_Threaded_POA -}
\ No newline at end of file +} diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc index 4d06971fff3..988d98b7df7 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc @@ -1,3 +1,3 @@ project(wait for completion): server { exename = wait_for_completion -}
\ No newline at end of file +} diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 44ac1f386a3..ac4851f93f7 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -1,4 +1,4 @@ -project: messaging { +project: messaging, minimum_corba { Source_Files { param_test_i.cpp tmplinst @@ -6,7 +6,7 @@ project: messaging { } } -project(client): messaging { +project(client): messaging, minimum_corba { depends += DynamicInterface libs += TAO_DynamicInterface exename = client @@ -58,7 +58,7 @@ project(client): messaging { } } -project(anyop): messaging { +project(anyop): messaging, minimum_corba { exename = anyop Source_Files { diff --git a/TAO/tests/Policies/Policies.mpc b/TAO/tests/Policies/Policies.mpc index 66945e07bef..94697b4dc6f 100644 --- a/TAO/tests/Policies/Policies.mpc +++ b/TAO/tests/Policies/Policies.mpc @@ -1,3 +1,3 @@ -project(Manipulation): messaging { +project(Manipulation): messaging, corba_messaging { exename = Manipulation -}
\ No newline at end of file +} diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc index e7488f429d3..ed24ad3636e 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc +++ b/TAO/tests/Portable_Interceptors/Benchmark/Portable_Interceptors_Benchmark.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors Source_Files { test_i.cpp interceptors.cpp @@ -10,6 +11,7 @@ project: server { } project: client { + requires += interceptors Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc index 0e75fe65d3b..fd4c3d05dc5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc +++ b/TAO/tests/Portable_Interceptors/Dynamic/Portable_Interceptors_Dynamic.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors Source_Files { test_i.cpp interceptors.cpp @@ -8,6 +9,7 @@ project: server { } project: client { + requires += interceptors Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc index 0f5df6512bf..2577db8eb56 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Portable_Interceptors_ForwardRequest.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors idlflags += -Gv -DCORBA3 -I$(TAO_ROOT) Source_Files { @@ -10,6 +11,7 @@ project: server { } project: client { + requires += interceptors idlflags += -Gv -DCORBA3 -I$(TAO_ROOT) Source_Files { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc index 285a3b1949f..9ad575e8368 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/Portable_Interceptors_IORInterceptor.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors idlflags += -I$(TAO_ROOT) Source_Files { @@ -10,6 +11,7 @@ project: server { } project: client { + requires += interceptors idlflags += -I$(TAO_ROOT) Source_Files { diff --git a/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc index 35437faf494..f10392bed35 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc +++ b/TAO/tests/Portable_Interceptors/PICurrent/Portable_Interceptors_PICurrent.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors Source_Files { test_i.cpp ServerORBInitializer.cpp @@ -9,6 +10,7 @@ project: server { } project: client { + requires += interceptors Source_Files { testC.cpp ClientORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc index 37885b49753..8763c33a3c8 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Portable_Interceptors_Request_Interceptor_Flow.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors Source_Files { test_i.cpp Server_ORBInitializer.cpp @@ -9,6 +10,7 @@ project: server { } project: client { + requires += interceptors Source_Files { testC.cpp Client_ORBInitializer.cpp diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc index d75a3ae4d8f..0123080ff4a 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Portable_Interceptors_Service_Context_Manipulation.mpc @@ -1,4 +1,5 @@ project: server { + requires += interceptors Source_Files { test_i.cpp Server_ORBInitializer.cpp @@ -8,6 +9,7 @@ project: server { } project: client { + requires += interceptors Source_Files { testC.cpp Client_ORBInitializer.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index f14566240a6..500f0d85da7 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -5,6 +5,7 @@ project: rt_server { } project: client { + requires += rt_corba Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc index a9c2e5f4d6c..4a5236da836 100644 --- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc +++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc @@ -1,4 +1,4 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { Oneway_Receiver.cpp Shutdown_Helper.cpp @@ -6,7 +6,7 @@ project: messaging { } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc index d44e15b1e77..1815be35ffc 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc +++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc @@ -1,11 +1,11 @@ -project: messaging { +project: messaging, corba_messaging { Source_Files { test_i.cpp server.cpp } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index f197f1146d0..ff7a72465dc 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -1,11 +1,11 @@ -project: server { +project: server, corba_messaging { Source_Files { test_i.cpp server.cpp } } -project(client): messaging { +project(client): messaging, corba_messaging { exename = client Source_Files { |