diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-06-24 15:09:39 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-06-24 15:09:39 +0000 |
| commit | 994621115dae8aef3ebbd4d6b1e98997d8a140e9 (patch) | |
| tree | 6532be9a4ee5ceb6d6e458508e9d6a03a0468ee8 | |
| parent | 567f8b133639e5ccdf59cf6332903ee3f033c1cb (diff) | |
| download | ATCD-994621115dae8aef3ebbd4d6b1e98997d8a140e9.tar.gz | |
Adding more mpc files; Change some source to make things work a little better
136 files changed, 1426 insertions, 397 deletions
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 3139c9cac7d..779f3ac91e4 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -1,10 +1,10 @@ project(TAO_IDL_EXE) : aceexe { exename = tao_idl - libs = TAO_IDL_BE TAO_IDL_FE + libs += TAO_IDL_BE TAO_IDL_FE includes += include be_include fe install = ../../bin libflags += TAO_AS_STATIC_LIBS - depends = TAO_IDL_BE TAO_IDL_FE + depends += gperf TAO_IDL_BE TAO_IDL_FE idlpreprocessor = 1 Source_Files { @@ -24,11 +24,11 @@ project(TAO_IDL_EXE) : aceexe { project(TAO_IDL_BE) : acelib { sharedname = TAO_IDL_BE - libs = TAO_IDL_FE + libs += TAO_IDL_FE includes += include be_include fe dllflags = TAO_IDL_BE_BUILD_DLL libflags += TAO_AS_STATIC_LIBS - depends = TAO_IDL_FE + depends += gperf TAO_IDL_FE Source_Files { be/be_array.cpp @@ -110,6 +110,7 @@ project(TAO_IDL_FE) : acelib { includes += include fe dllflags = TAO_IDL_FE_BUILD_DLL libflags += TAO_AS_STATIC_LIBS + depends += gperf Source_Files { fe/fe_declarator.cpp diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 577ddad01a5..608a99654d8 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer exename = Concurrency_Service - libs = TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer } diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc index dd0cc10f66c..e3471507bf6 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += CosEvent CosNaming Svc_Utils IORTable Messaging PortableServer exename = CosEvent_Service - libs = TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_Messaging TAO_PortableServer TAO + libs += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_Messaging TAO_PortableServer } diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc index 68704099aa2..16641c37460 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += RTSched CosNaming Svc_Utils IORTable PortableServer exename = Dump_Schedule - libs = TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer } diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc index 48018d839ac..93d25edba83 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.mpc +++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += RTOLDEvent RTEvent RTSched CosNaming Svc_Utils IORTable Messaging PortableServer exename = Event_Service - libs = TAO_RTOLDEvent TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_Messaging TAO_PortableServer TAO + libs += TAO_RTOLDEvent TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_Messaging TAO_PortableServer } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 161a7f4c178..8da44bcd258 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -1,7 +1,7 @@ project(IFR_Service) : orbsvcsexe { depends += IFRService TypeCodeFactory Svc_Utils IFR_Client IORTable PortableServer exename = IFR_Service - libs = TAO_IFRService TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO + libs += TAO_IFRService TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer Source_Files { IFR_Server.cpp @@ -13,7 +13,7 @@ project(IFR_Service) : orbsvcsexe { project(TAO_IFR_BE) : taolib { depends += TAO_IDL_FE TAO_IFR_Client sharedname = TAO_IFR_BE - libs = TAO_IDL_FE TAO_IFR_Client TAO + libs += TAO_IDL_FE TAO_IFR_Client TAO includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe Source_Files { @@ -34,8 +34,8 @@ project(TAO_IFR_EXE) : taoexe { depends += TAO_IFR_BE IFR_Client TAO_IDL_FE exename = tao_ifr idlpreprocessor = 1 - libs = TAO_IFR_BE TAO_IFR_Client TAO TAO_IDL_FE - includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe + libs += TAO_IFR_BE TAO_IFR_Client TAO TAO_IDL_FE + includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe Source_Files { tao_ifr.cpp diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 29d9e0c6aba..cfd08343826 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,7 +1,7 @@ project : orbsvcsexe { depends += Svc_Utils IORTable PortableServer exename = ImplRepo_Service - libs = TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { Adapter_Activator.cpp @@ -19,7 +19,7 @@ project : orbsvcsexe { project(tao_imr) : orbsvcsexe { depends += Svc_Utils IORTable PortableServer exename = tao_imr - libs = TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { tao_imr.cpp diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index bfac2851b09..b1eb9fbd2df 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += CosLifeCycle CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer exename = LifeCycle_Service - libs = TAO_CosLifeCycle TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO + libs += TAO_CosLifeCycle TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer } diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc index 252a13e04ac..70dea9a4f32 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += LoadBalancing PortableServer exename = LoadBalancer_Service - libs = TAO_LoadBalancing TAO_PortableServer TAO + libs += TAO_LoadBalancing TAO_PortableServer } diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Logging_Service.mpc index 678b8abd9b1..a0a206d9cfd 100644 --- a/TAO/orbsvcs/Logging_Service/Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Logging_Service.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += DsLogAdmin CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer exename = Logging_Service - libs = TAO_DsLogAdmin TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO + libs += TAO_DsLogAdmin TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc index 5ae5ad39ac9..2774265f594 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc @@ -1,7 +1,7 @@ project : orbsvcsexe { depends += CosNaming Svc_Utils IORTable PortableServer exename = Naming_Service - libs = TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { Naming_Server.cpp @@ -12,7 +12,7 @@ project : orbsvcsexe { project(NT_Naming_Service) : orbsvcsexe { depends += CosNaming Svc_Utils IORTable PortableServer exename = NT_Naming_Service - libs = TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { Naming_Service.cpp diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc index 668cd6db8cc..af3304d24b4 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc @@ -1,7 +1,7 @@ project : orbsvcsexe { depends += CosNotification ETCL CosNaming Svc_Utils DynamicAny IORTable PortableServer exename = Notify_Service - libs = TAO_CosNotification TAO_ETCL TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_IORTable TAO_PortableServer TAO + libs += TAO_CosNotification TAO_ETCL TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_IORTable TAO_PortableServer Source_Files { Notify_Server.cpp diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc index a2d89ea8e46..5e5f2f2469c 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc @@ -1,5 +1,5 @@ project : orbsvcsexe { depends += RTSched CosNaming Svc_Utils IORTable PortableServer exename = Scheduling_Service - libs = TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer } diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc index d20c92b983e..5d5b8cdaa1d 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service.mpc +++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc @@ -1,7 +1,7 @@ project(Time_Service_Server) : orbsvcsexe { depends += CosTime CosNaming Svc_Utils IORTable PortableServer exename = Time_Service_Server - libs = TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { Server_i.cpp @@ -12,7 +12,7 @@ project(Time_Service_Server) : orbsvcsexe { project(Time_Service_Clerk) : orbsvcsexe { depends += CosTime CosNaming Svc_Utils IORTable PortableServer exename = Time_Service_Clerk - libs = TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + libs += TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer Source_Files { Clerk_i.cpp diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc index 3062c5c2e3e..52497b4a875 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc @@ -1,6 +1,6 @@ project : orbsvcsexe { depends += CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer exename = Trading_Service - libs = TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO + libs += TAO_CosTrading TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer } diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index ee30b64a0c9..b09c229607e 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -1,7 +1,7 @@ project(AV) : orbsvcslib { depends += CosProperty CosNaming Svc_Utils PortableServer sharedname = TAO_AV - libs = TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index d3c2c9209ff..463f81c0738 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -3,6 +3,8 @@ #include "Fill_ACE_QoS.h" +#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) + ACE_RCSID(QOS, Fill_ACE_QoS,"$Id$") const iovec Fill_ACE_QoS::iov_ = {0,0}; @@ -84,3 +86,5 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Flow_Spec *, AC #pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h index af8bdd3fab8..edec3a1b093 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h @@ -14,6 +14,10 @@ #ifndef FILL_ACE_QOS_H #define FILL_ACE_QOS_H +#include "ace/config-all.h" + +#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) + #include "ace/SString.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Synch.h" @@ -72,4 +76,5 @@ private: FLOW_SPEC_HASH_MAP flow_spec_map_; }; +#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ #endif /* FILL_ACE_QOS_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 8c85366a53d..2b60a1f33be 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -1,6 +1,9 @@ // $Id$ #include "QoS_UDP.h" + +#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) + #include "UDP.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/MCast.h" @@ -1497,3 +1500,5 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_UDP_QoS_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) + +#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 2e08905eeca..c04e9877107 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -20,6 +20,10 @@ #include "ace/pre.h" +#include "ace/config-all.h" + +#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) + #include "ace/OS.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Decorator.h" @@ -293,5 +297,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory) #include "QoS_UDP.i" #endif /* __ACE_INLINE__ */ +#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ + #include "ace/post.h" #endif /* TAO_AV_QOS_UDP_H */ diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index f1fc757dd72..1c376834464 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -1,7 +1,7 @@ project(CosConcurrency) : orbsvcslib { depends += PortableServer sharedname = TAO_CosConcurrency - libs = TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 12e170e9a4c..7c3f263244f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,7 +1,7 @@ project(CosEvent) : orbsvcslib { depends += CosNaming Svc_Utils PortableServer sharedname = TAO_CosEvent - libs = TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index 1e1bcd1365e..5e108aa841e 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -1,7 +1,7 @@ project(CosLifeCycle) : orbsvcslib { depends += CosNaming Svc_Utils PortableServer sharedname = TAO_CosLifeCycle - libs = TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index e770a771e49..847c77004e3 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,7 +1,7 @@ project(CosNaming) : orbsvcslib { depends += Svc_Utils IORTable PortableServer sharedname = TAO_CosNaming - libs = TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 8e584fb4085..42dff5e6f0d 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -1,7 +1,7 @@ project(CosNotification) : orbsvcslib { depends += Svc_Utils ETCL DynamicAny PortableServer sharedname = TAO_CosNotification - libs = TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index 29f32fe53a2..cefe8de39a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -1,7 +1,7 @@ project(CosProperty) : orbsvcslib { depends += PortableServer sharedname = TAO_CosProperty - libs = TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 028e7746b8b..04c9f46d7ea 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,7 +1,7 @@ project(CosTime) : orbsvcslib { depends += PortableServer sharedname = TAO_CosTime - libs = TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 13e8bad83a2..3db64b44019 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,7 +1,7 @@ project(CosTrading) : orbsvcslib { depends += CosNaming Svc_Utils DynamicAny PortableServer sharedname = TAO_CosTrading - libs = TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 196c301d996..e89600c7b99 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,7 +1,7 @@ project(DsLogAdmin) : orbsvcslib { depends += CosTrading Svc_Utils PortableServer sharedname = TAO_DsLogAdmin - libs = TAO_CosTrading TAO_Svc_Utils TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc index 5904eb601be..3cf86b8fdab 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -1,6 +1,6 @@ project(ETCL) : orbsvcslib { sharedname = TAO_ETCL - libs = TAO + libs += TAO dllflags = TAO_ETCL_BUILD_DLL IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index f4ab29fd196..56a8257281e 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,7 +1,7 @@ project(FTORB) : orbsvcslib { depends += IORManipulation PortableServer sharedname = TAO_FTORB - libs = TAO_IORManip TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 9e5b43d2780..8339b127493 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,7 +1,7 @@ project(FaultTolerance) : orbsvcslib { depends += FTORB CosNaming CosNotification Svc_Utils IORManipulation PortableServer sharedname = TAO_FaultTolerance - libs = TAO_FTORB TAO_CosNaming TAO_CosNotification TAO_Svc_Utils TAO_IORManip TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 37e58454e6c..d3ce4677f11 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,7 +1,7 @@ project(IFRService) : orbsvcslib { depends += TypeCodeFactory Svc_Utils IFR_Client IORTable PortableServer sharedname = TAO_IFRService - libs = TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO + libs += TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO dllflags = TAO_IFRSERVICE_BUILD_DLL IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc b/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc index 447acd63fe8..4d58bad1fdb 100644 --- a/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/Loadbalancing.mpc @@ -1,7 +1,7 @@ project(LoadBalancing) : orbsvcslib { depends += PortableServer sharedname = TAO_LoadBalancing - libs = TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 677827cdaec..9033185e80b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,7 +1,7 @@ project(PortableGroup) : orbsvcslib { depends += CosNaming Svc_Utils PortableServer sharedname = TAO_PortableGroup - libs = TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 25e0b1cd0a2..56bbbdacd49 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -1,7 +1,7 @@ project(RTCORBAEvent) : orbsvcslib { depends += RTEvent CosNaming Svc_Utils IORTable RTPortableServer PortableServer RTCORBA sharedname = TAO_RTCORBAEvent - libs = TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_RTPortableServer TAO_PortableServer TAO_RTCORBA TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 6aba990a3ac..3112a85ea8e 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -1,7 +1,7 @@ project(RTEvent) : orbsvcslib { depends += Svc_Utils Messaging PortableServer sharedname = TAO_RTEvent - libs = TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index 22b8a5abfa2..be00e0764b8 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -1,7 +1,7 @@ project(RTOLDEvent) : orbsvcslib { depends += RTEvent RTSched CosNaming Svc_Utils PortableServer sharedname = TAO_RTOLDEvent - libs = TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO dllflags = TAO_RTOLDEVENT_BUILD_DLL IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 7fd442dfb77..50cfb0c2c71 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -1,7 +1,7 @@ project(RTSched) : orbsvcslib { depends += CosNaming TAO_Svc_Utils PortableServer sharedname = TAO_RTSched - libs = TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index 5fefc20ae86..f9c4525c40f 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -1,7 +1,7 @@ project(RTSchedEvent) : orbsvcslib { depends += RTEvent RTSched CosNaming Svc_Utils PortableServer sharedname = TAO_RTSchedEvent - libs = TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO dllflags = TAO_RTSCHEDEVENT_BUILD_DLL IDL_Files { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 6107925192d..32586d0b544 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -2,7 +2,7 @@ project(SSLIOP) : orbsvcslib { ssl = 1 depends += Security PortableServer ssl sharedname = TAO_SSLIOP - libs = TAO_Security TAO_PortableServer TAO ACE_SSL + 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 diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 19c6bdc082a..0341ba08e63 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -397,7 +397,7 @@ TAO_SSLIOP_Transport::get_listen_point ( } ACE_Event_Handler * -TAO_IIOP_Transport::invalidate_event_handler_i (void) +TAO_SSLIOP_Transport::invalidate_event_handler_i (void) { ACE_Event_Handler * eh = this->connection_handler_; this->connection_handler_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 108ef4f854e..f5cfece2915 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,7 +1,7 @@ project(Security) : orbsvcslib { depends += PortableServer sharedname = TAO_Security - libs = TAO_PortableServer TAO + 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 diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 0266a0f67b3..4c29ef0f10f 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,7 +1,7 @@ project(Svc_Utils) : orbsvcslib { depends += PortableServer sharedname = TAO_Svc_Utils - libs = TAO_PortableServer TAO + libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h dllflags = TAO_SVC_UTILS_BUILD_DLL 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 new file mode 100644 index 00000000000..d85f7d336c4 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc @@ -0,0 +1,27 @@ +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + Connection_Manager.cpp + sender.cpp + } +} + +project(distributer): orbsvcsexe, avstreamsexe { + exename = distributer + + Source_Files { + Connection_Manager.cpp + distributer.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + Connection_Manager.cpp + receiver.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc new file mode 100644 index 00000000000..3fafd05d6f0 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc @@ -0,0 +1,16 @@ +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + sender.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + receiver.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc new file mode 100644 index 00000000000..4d4eb2bf3ed --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc @@ -0,0 +1,27 @@ +project(sender): orbsvcsexe, avstreamsexe, strategies { + exename = sender + + Source_Files { + Connection_Manager.cpp + sender.cpp + } +} + +project(distributer): orbsvcsexe, avstreamsexe, strategies { + exename = distributer + + Source_Files { + Connection_Manager.cpp + distributer.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe, strategies { + exename = receiver + + Source_Files { + Connection_Manager.cpp + receiver.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc new file mode 100644 index 00000000000..fb88d5acec7 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc @@ -0,0 +1,16 @@ +project(server): orbsvcsexe, avstreamsexe { + exename = server + + Source_Files { + server.cpp + } +} + +project(ftp): orbsvcsexe, avstreamsexe { + exename = ftp + + Source_Files { + ftp.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc new file mode 100644 index 00000000000..711cd9d29c4 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc @@ -0,0 +1,24 @@ +project(ping): orbsvcsexe, avstreamsexe, strategies { + exename = ping + + Source_Files { + ping.cpp + } +} + +project(pong): orbsvcsexe, avstreamsexe, strategies { + exename = pong + + Source_Files { + pong.cpp + } +} + +project(control): orbsvcsexe, avstreamsexe, strategies { + exename = control + + Source_Files { + control.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc new file mode 100644 index 00000000000..3fafd05d6f0 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc @@ -0,0 +1,16 @@ +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + sender.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + receiver.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc new file mode 100644 index 00000000000..16bcdf02d48 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc @@ -0,0 +1,16 @@ +project(server): orbsvcsexe, avstreamsexe, strategies { + exename = server + + Source_Files { + server.cpp + } +} + +project(ftp): orbsvcsexe, avstreamsexe, strategies { + exename = ftp + + Source_Files { + ftp.cpp + } +} + 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 new file mode 100644 index 00000000000..fb88d5acec7 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc @@ -0,0 +1,16 @@ +project(server): orbsvcsexe, avstreamsexe { + exename = server + + Source_Files { + server.cpp + } +} + +project(ftp): orbsvcsexe, avstreamsexe { + exename = ftp + + Source_Files { + ftp.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc new file mode 100644 index 00000000000..3fafd05d6f0 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc @@ -0,0 +1,16 @@ +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + sender.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + receiver.cpp + } +} + diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc new file mode 100644 index 00000000000..fb88d5acec7 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc @@ -0,0 +1,16 @@ +project(server): orbsvcsexe, avstreamsexe { + exename = server + + Source_Files { + server.cpp + } +} + +project(ftp): orbsvcsexe, avstreamsexe { + exename = ftp + + Source_Files { + ftp.cpp + } +} + 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 new file mode 100644 index 00000000000..64014297999 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc @@ -0,0 +1,26 @@ +project(avstreams ts) : orbsvcslib { + sharedname = TAO_TS + dllflags = TAO_AV_BUILD_DLL + install = + + Source_Files { + TimeStamp.cpp + } +} + +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + sender.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + receiver.cpp + } +} + 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 new file mode 100644 index 00000000000..14656da768d --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc @@ -0,0 +1,24 @@ +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + sender.cpp + } +} + +project(distributer): orbsvcsexe, avstreamsexe { + exename = distributer + + Source_Files { + distributer.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + receiver.cpp + } +} + 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 new file mode 100644 index 00000000000..3fafd05d6f0 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc @@ -0,0 +1,16 @@ +project(sender): orbsvcsexe, avstreamsexe { + exename = sender + + Source_Files { + sender.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + exename = receiver + + Source_Files { + receiver.cpp + } +} + 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 new file mode 100644 index 00000000000..d5ea16da14d --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc @@ -0,0 +1,20 @@ +project(sender): orbsvcsexe, avstreamsexe { + depends += QoS + libs += ACE_QoS + exename = sender + + Source_Files { + sender.cpp + } +} + +project(receiver): orbsvcsexe, avstreamsexe { + depends += QoS + libs += ACE_QoS + exename = receiver + + Source_Files { + receiver.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc new file mode 100644 index 00000000000..5d3a7bf18fe --- /dev/null +++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc @@ -0,0 +1,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 diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp deleted file mode 100644 index 16dea85c540..00000000000 --- a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/bin/Naming_Service/TAO -// -// = FILENAME -// clnt.cpp -// -// = DESCRIPTION -// This class implements a simple CORBA client for the CosNaming -// example using stubs generated by the TAO ORB IDL compiler. -// -// = AUTHORS -// Sergio Flores-Gaitan <sergio@cs.wustl.edu> -// Torben Worm <tworm@cs.wustl.edu> -// -// ============================================================================ - -#include "NS_client.h" -#include "tao/debug.h" -#include <stdio.h> - -ACE_RCSID(Concurrency, NS_client, "$Id$") - -// constructor - -CosNaming_Client::CosNaming_Client (void) - : list_contents_ (0), - resolve_name_ (0), - name_to_resolve_ (0), - context_to_resolve_ (0), - argc_ (0), - argv_ (0), - exit_later_ (0) -{ -} - -// Parses the command line arguments and returns an error status. - -int -CosNaming_Client::parse_args (void) -{ - ACE_Get_Opt get_opts (argc_, argv_, "dxn:c:l"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'd': // debug flag - TAO_debug_level++; - break; - case 'l': - this->list_contents_ = 1; - break; - case 'x': - this->exit_later_++; - break; - case 'n': - this->resolve_name_ = 1; - this->name_to_resolve_ = get_opts.opt_arg (); - break; - case 'c': - this->resolve_name_ = 1; - this->context_to_resolve_ = get_opts.opt_arg (); - break; - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s" - " [-d]" - " [-x]" - "\n", - this->argv_ [0]), - -1); - } - - // Indicates successful parsing of command line. - return 0; -} - -// Execute client example code. - -int -CosNaming_Client::run (void) -{ - // @@ TODO, add some interesting test here, maybe creating some - // nested naming contexts and registering a number of objreferences - // in there. We could even use the iterators. - - if (this->resolve_name_) - resolve_name (this->context_to_resolve_, - this->name_to_resolve_); - - if (this->list_contents_) - list_contents (); - - return 0; -} - -CosNaming_Client::~CosNaming_Client (void) -{ -} - -int -CosNaming_Client::resolve_name (char *c, char *n) -{ - TAO_TRY - { - CosNaming::Name name (2); - name.length (2); - name[0].id = CORBA::string_dup (c); - name[1].id = CORBA::string_dup (n); - CORBA::Object_var obj = this->my_name_client_->resolve (name, - TAO_TRY_ENV); - TAO_CHECK_ENV; - - if (CORBA::is_nil (obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve name in Naming service <%s>\n"), - -1); - } - TAO_CATCHANY - { - TAO_TRY_ENV.print_exception ("init"); - return -1; - } - TAO_ENDTRY; - return 0; -} - -void -CosNaming_Client::list_contents (void) -{ - CosNaming::BindingIterator_var bi; - CosNaming::BindingList_var li; - CORBA::ULong how_many = 0; - CosNaming::Binding_var b; - CosNaming::Name n; - CORBA::ULong names = 0; - - TAO_TRY - { - this->my_name_client_->list (how_many, li, bi, TAO_TRY_ENV); - - while (bi->next_one (b, TAO_TRY_ENV)) - { - n = b->binding_name; - names = n.length (); - ACE_DEBUG ((LM_DEBUG, - " (%i) Name: ", - names)); - - for (CORBA::ULong i = 0; i < names; i++) - ACE_DEBUG ((LM_DEBUG, - "%s ", - n[i].id._retn ())); - - ACE_DEBUG ((LM_DEBUG, "type: %s\n", - b->binding_type == CosNaming::ncontext ? "C" : "O")); - } - } - TAO_CATCHANY - { - } - TAO_ENDTRY; -} - -int -CosNaming_Client::init (int argc, char *argv[]) -{ - this->argc_ = argc; - this->argv_ = argv; - - TAO_TRY - { - // Initialize ORB. - this->orb_ = CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV); - TAO_CHECK_ENV; - - // Initialize the naming services - if (my_name_client_.init (orb_) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize " - "the TAO_Naming_Client. \n"), - -1); - - // Parse command line and verify parameters. - if (this->parse_args () == -1) - return -1; - } - TAO_CATCHANY - { - TAO_TRY_ENV.print_exception ("init"); - return -1; - } - TAO_ENDTRY; - - return 0; -} - -// This function runs the test. - -int -main (int argc, char **argv) -{ - CosNaming_Client cosnaming_client; - - if (cosnaming_client.init (argc, argv) == -1) - return 1; - - return cosnaming_client.run (); -} diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.h b/TAO/orbsvcs/tests/Concurrency/NS_client.h deleted file mode 100644 index 6c6407511e8..00000000000 --- a/TAO/orbsvcs/tests/Concurrency/NS_client.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests -// -// = FILENAME -// NS_client.h -// -// = DESCRIPTION -// This class tests the facilities to connect to the naming -// service and to resolve the name for the concurrency service client. -// -// = AUTHORS -// Sergio Flores-Gaitan <sergio@cs.wustl.edu> -// Torben Worm <tworm@cs.wustl.edu> -// -// ============================================================================ - -#include "ace/Get_Opt.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/corba.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" - -class CosNaming_Client -{ - // = TITLE - // Defines a class that encapsulates behaviour of the CosNaming - // client example. Provides a better understanding of the logic - // in an object oriented way. - // - // = DESCRIPTION - // This class declares an interface to run the example client for - // CosNaming CORBA server. All the complexity for initializing - // the server is hidden in the class. Just the run() interface - // is needed. -public: - // = Initialization and termination methods. - CosNaming_Client (void); - // Constructor. - - ~CosNaming_Client (void); - // Destructor. - - int run (void); - // Execute client example code. - - int init (int argc, char **argv); - // Initialize the client communication endpoint with server. - -private: - int parse_args (void); - // Parses the arguments passed on the command line. - - int resolve_name(char *c, char *n); - // Resolves the name given on the command-line (-n option). - - void list_contents(void); - // Lists the contents of the naming service. - - CORBA::ORB_var orb_; - // Our ORB. - - TAO_Naming_Client my_name_client_; - // And our Naming Client! - - int list_contents_; - // Iterate through the naming service and list the contents. - - int resolve_name_; - // Flag set by the -n option. - - char *name_to_resolve_; - // Parameter given to the -n option. - - char *context_to_resolve_; - // Parameter given to the -c option. - - int argc_; - // # of arguments on the command line. - - char **argv_; - // arguments from command line. - - int exit_later_; - // Flag to tell server to not exit immediately. -}; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc new file mode 100644 index 00000000000..90695b413b6 --- /dev/null +++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc @@ -0,0 +1,66 @@ +project(Disconnect): orbsvcsexe, messaging { + depends += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable + libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Disconnect + + Source_Files { + Disconnect.cpp + } +} + +project(MT_Disconnect): orbsvcsexe, messaging { + depends += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable + libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = MT_Disconnect + + Source_Files { + MT_Disconnect.cpp + } +} + +project(Push_Event): orbsvcsexe, messaging { + depends += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable + libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Push_Event + + Source_Files { + Push_Event.cpp + } +} + +project(Pull_Push_Event): orbsvcsexe, messaging { + depends += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable + libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Pull_Push_Event + + Source_Files { + Pull_Push_Event.cpp + } +} + +project(Shutdown): orbsvcsexe, messaging { + depends += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable + libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Shutdown + + Source_Files { + Shutdown.cpp + } +} + +project(Random): orbsvcsexe, messaging { + depends += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable + libs += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Random + + Source_Files { + Random.cpp + } +} + diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc new file mode 100644 index 00000000000..90aead5a8fb --- /dev/null +++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc @@ -0,0 +1,10 @@ +project(CosEvent Test Lib): orbsvcslib { + sharedname = CECTests + depends += CosEvent CosNaming Svc_Utils IORTable PortableServer + libs += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer + dllflags = CEC_TEST_BUILD_DLL + + Header_Files { + cectest_export.h + } +} diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc new file mode 100644 index 00000000000..f57e45eed91 --- /dev/null +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc @@ -0,0 +1,22 @@ +project(ECM Supplier): rteventexe { + depends += RTSched CosNaming IORTable Messaging + libs += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging + exename = ECM_Supplier + + Source_Files { + ECM_Data.cpp + ECM_Supplier.cpp + } +} + +project(ECM Consumer): rteventexe { + depends += RTSched CosNaming IORTable Messaging + libs += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging + exename = ECM_Consumer + + Source_Files { + ECM_Data.cpp + ECM_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc new file mode 100644 index 00000000000..e28a97a6e44 --- /dev/null +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc @@ -0,0 +1,5 @@ +project: rteventexe { + depends += Messaging + libs += TAO_Messaging + exename = EC_Mcast +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc new file mode 100644 index 00000000000..9edd85ae9e9 --- /dev/null +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc @@ -0,0 +1,5 @@ +project: rteventexe { + depends += RTOLDEvent RTSchedEvent RTSched CosNaming IORTable Messaging + libs += TAO_RTOLDEvent TAO_RTSchedEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging + exename = EC_Multiple +} diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc new file mode 100644 index 00000000000..6c565916946 --- /dev/null +++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc @@ -0,0 +1,36 @@ +project(ECT Supplier): rteventexe { + depends += RTOLDEvent RTSched CosNaming IORTable Messaging + libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging + exename = ECT_Supplier + + Source_Files { + ECT_Driver.cpp + ECT_Supplier_Driver.cpp + ECT_Supplier.cpp + } +} + +project(ECT Consumer): rteventexe { + depends += RTOLDEvent RTSched CosNaming IORTable Messaging + libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging + exename = ECT_Consumer + + Source_Files { + ECT_Driver.cpp + ECT_Consumer_Driver.cpp + ECT_Consumer.cpp + } +} + +project(ECT Throughput): rteventexe { + depends += RTOLDEvent RTSched CosNaming IORTable Messaging + libs += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging + exename = ECT_Throughput + + Source_Files { + ECT_Driver.cpp + ECT_Consumer.cpp + 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 new file mode 100644 index 00000000000..eae39280a71 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -0,0 +1,165 @@ +project(Reconnect): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Reconnect + + Source_Files { + Reconnect.cpp + } +} + +project(Shutdown): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Shutdown + + Source_Files { + Shutdown.cpp + } +} + +project(Observer): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Observer + + Source_Files { + Observer.cpp + } +} + +project(BCast): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = BCast + + Source_Files { + BCast.cpp + } +} + +project(Timeout): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Timeout + + Source_Files { + Timeout.cpp + } +} + +project(Wildcard): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Wildcard + + Source_Files { + Wildcard.cpp + } +} + +project(Negation): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Negation + + Source_Files { + Negation.cpp + } +} + +project(Disconnect): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Disconnect + + Source_Files { + Disconnect.cpp + } +} + +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 + includes += ../lib + exename = MT_Disconnect + + Source_Files { + MT_Disconnect.cpp + } +} + +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 + includes += ../lib + exename = Atomic_Reconnect + + Source_Files { + Atomic_Reconnect.cpp + } +} + +project(Bitmask): orbsvcsexe, messaging { + depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Bitmask + + Source_Files { + Bitmask.cpp + } +} + +project(Complex): orbsvcsexe, messaging { + depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Complex + + Source_Files { + Complex.cpp + } +} + +project(Gateway): orbsvcsexe, messaging { + depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Gateway + + Source_Files { + Gateway.cpp + } +} + +project(Control): orbsvcsexe, messaging { + depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Control + + Source_Files { + Control.cpp + } +} + +project(Random): orbsvcsexe, messaging { + depends += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Random + + Source_Files { + Random.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc new file mode 100644 index 00000000000..647ba0c8c91 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc @@ -0,0 +1,55 @@ +project(Throughput): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Throughput + + Source_Files { + Throughput.cpp + } +} + +project(Connect): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Connect + + Source_Files { + Connect.cpp + } +} + +project(Inversion): orbsvcsexe, messaging { + depends += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable + libs += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable + includes += ../lib + exename = Inversion + + Source_Files { + Inversion.cpp + } +} + +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 + includes += ../lib + exename = Latency + + Source_Files { + Latency.cpp + } +} + +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 + includes += ../lib + exename = Latency_Server + + Source_Files { + Latency_Server.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc new file mode 100644 index 00000000000..57cd7116b69 --- /dev/null +++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc @@ -0,0 +1,10 @@ +project(Event Test Lib): orbsvcslib { + sharedname = ECTests + depends += RTEvent CosNaming Svc_Utils IORTable PortableServer + libs += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer + dllflags = EC_TEST_BUILD_DLL + + 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 new file mode 100644 index 00000000000..d50500423ad --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc @@ -0,0 +1,21 @@ +project: server, orbsvcsexe { + depends += FTORB IORManip + libs += TAO_FTORB TAO_IORManip + + Source_Files { + test_i.cpp + server.cpp + } +} + +project(Manager): server, orbsvcsexe { + depends += FTORB IORManip + libs += TAO_FTORB TAO_IORManip + exename = Manager + + Source_Files { + testC.cpp + Manager.cpp + } +} + diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc new file mode 100644 index 00000000000..d7f22d77b16 --- /dev/null +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc @@ -0,0 +1,5 @@ +project(IOGRTest): server, orbsvcsexe { + depends += FTORB IORManip + libs += TAO_FTORB TAO_IORManip + exename = IOGRTest +} diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc new file mode 100644 index 00000000000..4495317318e --- /dev/null +++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc @@ -0,0 +1,19 @@ +project: namingexe { + Source_Files { + server_i.cpp + MCast_Server_i.cpp + server.cpp + } +} + +project(client): namingexe { + exename = client + + Source_Files { + ior_mcast_client_i.cpp + server_i.cpp + MCast_Server_i.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc new file mode 100644 index 00000000000..e8c53b5d38d --- /dev/null +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -0,0 +1,70 @@ +project(airplane server) : server, orbsvcsexe { + depends += IORTable + libs += TAO_IORTable + exename = airplane_server + + IDL_Files { + Airplane.idl + } + + Source_Files { + AirplaneC.cpp + AirplaneS.cpp + airplane_i.cpp + airplane_server_i.cpp + airplane_server.cpp + } +} + +project(airplane client) : server, orbsvcsexe { + depends += IORTable + libs += TAO_IORTable + exename = airplane_client + + IDL_Files { + Airplane.idl + } + + Source_Files { + AirplaneC.cpp + AirplaneS.cpp + airplane_client_i.cpp + airplane_client.cpp + } +} + +project(nestea server) : server, orbsvcsexe { + depends += IORTable + libs += TAO_IORTable + exename = nestea_server + + IDL_Files { + Nestea.idl + } + + Source_Files { + NesteaC.cpp + NesteaS.cpp + nestea_i.cpp + nestea_server_i.cpp + nestea_server.cpp + } +} + +project(nestea client) : server, orbsvcsexe { + depends += IORTable + libs += TAO_IORTable + exename = nestea_client + + IDL_Files { + Nestea.idl + } + + Source_Files { + NesteaC.cpp + NesteaS.cpp + nestea_client_i.cpp + nestea_client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc new file mode 100644 index 00000000000..7e7367b39be --- /dev/null +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -0,0 +1,4 @@ +project(ImplRepo NameService) : namingexe { + exename = test +} + diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc new file mode 100644 index 00000000000..8a641176f7e --- /dev/null +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc @@ -0,0 +1,22 @@ +project: server { + depends += IFR_Client + libs += TAO_IFR_Client + + Source_Files { + test_i.cpp + server.cpp + } +} + +project(client): server { + depends += IFR_Client DynamicInterface + libs += TAO_IFR_Client TAO_DynamicInterface + + IDL_Files { + } + + Source_Files { + ifr_dii_client.cpp + client.cpp + } +} diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc new file mode 100644 index 00000000000..247e13d8593 --- /dev/null +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc @@ -0,0 +1,5 @@ +project(InterfaceRepo IFR Test): taoexe { + depends += IFR_Client + libs += TAO_IFR_Client + exename = IFR_Test +} diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc new file mode 100644 index 00000000000..6e421a842a0 --- /dev/null +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc @@ -0,0 +1,5 @@ +project(InterfaceRepo Persistence Test): taoexe { + depends += IFR_Client + libs += TAO_IFR_Client + exename = Persistence_Test +} diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc new file mode 100644 index 00000000000..8ab0054fcdd --- /dev/null +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc @@ -0,0 +1,3 @@ +project(Interoperable Naming): namingexe { + exename = client +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc new file mode 100644 index 00000000000..71b2d35bfe5 --- /dev/null +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc @@ -0,0 +1,22 @@ +project: server, orbsvcsexe { + depends += LoadBalancing + libs += TAO_LoadBalancing + + Source_Files { + Hash_ReplicaControl.cpp + Hash_Replica_i.cpp + server.cpp + } +} + +project(client): server, orbsvcsexe { + depends += LoadBalancing + libs += TAO_LoadBalancing + exename = client + + Source_Files { + Hash_ReplicaC.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc new file mode 100644 index 00000000000..2ad4d82a178 --- /dev/null +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc @@ -0,0 +1,14 @@ +project: server { + Source_Files { + McastHello.cpp + server.cpp + } +} + +project: client { + Source_Files { + TestC.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc new file mode 100644 index 00000000000..8a9b37f4cee --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc @@ -0,0 +1,19 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Structured_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc new file mode 100644 index 00000000000..737753c82e1 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc @@ -0,0 +1,38 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Structured_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + +project(Sequence Supplier): notifytest { + exename = Sequence_Supplier + + Source_Files { + Sequence_Supplier.cpp + } +} + +project(Sequence Consumer): notifytest { + exename = Sequence_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Sequence_Push_Consumer.cpp + Sequence_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc new file mode 100644 index 00000000000..fc4556e54d0 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc @@ -0,0 +1,18 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + goC.cpp + Notify_Structured_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc new file mode 100644 index 00000000000..737753c82e1 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc @@ -0,0 +1,38 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Structured_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + +project(Sequence Supplier): notifytest { + exename = Sequence_Supplier + + Source_Files { + Sequence_Supplier.cpp + } +} + +project(Sequence Consumer): notifytest { + exename = Sequence_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Sequence_Push_Consumer.cpp + Sequence_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequenc_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequenc_Multi_ETCL_Filter.mpc new file mode 100644 index 00000000000..a0d6a42a016 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequenc_Multi_ETCL_Filter.mpc @@ -0,0 +1,19 @@ +project(Sequence Supplier): notifytest { + exename = Sequence_Supplier + + Source_Files { + Sequence_Supplier.cpp + } +} + +project(Sequence Consumer): notifytest { + exename = Sequence_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Sequence_Push_Consumer.cpp + Sequence_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc new file mode 100644 index 00000000000..a0d6a42a016 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc @@ -0,0 +1,19 @@ +project(Sequence Supplier): notifytest { + exename = Sequence_Supplier + + Source_Files { + Sequence_Supplier.cpp + } +} + +project(Sequence Consumer): notifytest { + exename = Sequence_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Sequence_Push_Consumer.cpp + Sequence_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc new file mode 100644 index 00000000000..bc010fa07a2 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc @@ -0,0 +1,18 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + controlC.cpp + Notify_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc new file mode 100644 index 00000000000..90b199f6874 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc @@ -0,0 +1,19 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Notify_Push_Supplier.cpp + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + controlC.cpp + Notify_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc new file mode 100644 index 00000000000..e73f58d7c19 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc @@ -0,0 +1,3 @@ +project(Notify Lib): orbsvcslib, notify { + sharedname = NotifyTests +}
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc new file mode 100644 index 00000000000..737753c82e1 --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc @@ -0,0 +1,38 @@ +project(Structured Supplier): notifytest { + exename = Structured_Supplier + + Source_Files { + Structured_Supplier.cpp + } +} + +project(Structured Consumer): notifytest { + exename = Structured_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Structured_Push_Consumer.cpp + Structured_Consumer.cpp + } +} + +project(Sequence Supplier): notifytest { + exename = Sequence_Supplier + + Source_Files { + Sequence_Supplier.cpp + } +} + +project(Sequence Consumer): notifytest { + exename = Sequence_Consumer + + Source_Files { + goC.cpp + common.cpp + Notify_Sequence_Push_Consumer.cpp + Sequence_Consumer.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc new file mode 100644 index 00000000000..71a8b8973df --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc @@ -0,0 +1,3 @@ +project(RedGreen): notifytest { + exename = RedGreen_Test +} diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc new file mode 100644 index 00000000000..3279c094b0b --- /dev/null +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc @@ -0,0 +1,5 @@ +project(Throughput): notifytest, strategies { + depends += Messaging + libs += TAO_Messaging + exename = Throughput +} diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc new file mode 100644 index 00000000000..7b728e9c800 --- /dev/null +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -0,0 +1,19 @@ +project: server, namingexe { + depends += CosProperty + libs += TAO_CosProperty + + Source_Files { + server.cpp + } +} + +project(client): server, namingexe { + depends += CosProperty + libs += TAO_CosProperty + exename = client + + Source_Files { + server.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index 6db75fdfd4e..9a97aba8c46 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Strategy_Scheduler.h" +#include "orbsvcs/Sched/Strategy_Scheduler.h" #include "orbsvcs/Time_Utilities.h" #if defined (ACE_HAS_QUANTIFY) # include <quantify.h> diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc new file mode 100644 index 00000000000..dae839dfb5d --- /dev/null +++ b/TAO/orbsvcs/tests/Sched/Sched.mpc @@ -0,0 +1,5 @@ +project(Sched): server, namingexe { + depends += RTSched + libs += TAO_RTSched + exename = Sched +} diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc new file mode 100644 index 00000000000..422c31af14b --- /dev/null +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc @@ -0,0 +1,9 @@ +project(Sched Conf): server, namingexe { + depends += RTSched + libs += TAO_RTSched + exename = Sched_Conf + + 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 new file mode 100644 index 00000000000..893b749f09d --- /dev/null +++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc @@ -0,0 +1,14 @@ +project: server { + Source_Files { + TX_Object_i.cpp + server.cpp + } +} + +project: client { + 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 new file mode 100644 index 00000000000..5ca22ac8b3e --- /dev/null +++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc @@ -0,0 +1,32 @@ +project: server { + IDL_Files { + server.idl + client.idl + } + + Source_Files { + clientC.cpp + serverC.cpp + serverS.cpp + server_i.cpp + server.cpp + } +} + +project(client): server { + exename = client + + IDL_Files { + server.idl + client.idl + } + + Source_Files { + clientC.cpp + clientS.cpp + serverC.cpp + client_i.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc new file mode 100644 index 00000000000..36887871fbb --- /dev/null +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc @@ -0,0 +1,16 @@ +project: server { + Source_Files { + Server_Worker.cpp + test_i.cpp + server.cpp + } +} + +project: client { + Source_Files { + testC.cpp + Client_Worker.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc new file mode 100644 index 00000000000..ff315dc282d --- /dev/null +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc @@ -0,0 +1,20 @@ +project: server, orbsvcsexe { + ssl = 1 + depends += Security + libs += TAO_Security + Source_Files { + Foo_i.cpp + server.cpp + } +} + +project: client, orbsvcsexe { + depends += Security + libs += TAO_Security + + Source_Files { + FooC.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc new file mode 100644 index 00000000000..311f7bf8dc2 --- /dev/null +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc @@ -0,0 +1,20 @@ +project: server, orbsvcsexe { + ssl = 1 + depends += Security + libs += TAO_Security + Source_Files { + SLevel1_Test_i.cpp + server.cpp + } +} + +project: client, orbsvcsexe { + depends += Security + libs += TAO_Security + + Source_Files { + SLevel1_TestC.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 540c8ffae78..d07f779cc80 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,7 +1,7 @@ project(Simple Naming Client) : orbsvcsexe { depends += CosNaming Svc_Utils IORTable PortableServer exename = client - libs = TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + 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 new file mode 100644 index 00000000000..70469bedde0 --- /dev/null +++ b/TAO/orbsvcs/tests/Time/Time.mpc @@ -0,0 +1,5 @@ +project(client): server, namingexe { + depends += CosTime + libs += TAO_CosTime + exename = client +} diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc new file mode 100644 index 00000000000..1cd5f5c457c --- /dev/null +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -0,0 +1,53 @@ +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 + + Source_Files { + TT_Info.cpp + Service_Type_Exporter.cpp + Offer_Exporter.cpp + Offer_Importer.cpp + Simple_Dynamic.cpp + } +} + +project(export test): namingexe { + depends += "Trading Test Lib" CosTrading DynamicAny + libs += TTest TAO_CosTrading TAO_DynamicAny + exename = export_test + + IDL_Files { + } + + Source_Files { + export_test.cpp + } +} + +project(import test): namingexe { + depends += "Trading Test Lib" CosTrading DynamicAny + libs += TTest TAO_CosTrading TAO_DynamicAny + exename = import_test + + IDL_Files { + } + + Source_Files { + import_test.cpp + } +} + +project(colocated test): namingexe { + depends += "Trading Test Lib" CosTrading DynamicAny + libs += TTest TAO_CosTrading TAO_DynamicAny + exename = colocated_test + + IDL_Files { + } + + Source_Files { + colocated_test.cpp + } +} + diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc new file mode 100644 index 00000000000..d30a93ca5f5 --- /dev/null +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc @@ -0,0 +1,20 @@ +project: namingexe { + depends += CosNaming + libs += TAO_CosNaming + + Source_Files { + status_i.cpp + server.cpp + } +} + +project(client): namingexe { + exename = client + + Source_Files { + status_i.cpp + ior_corbaname_client_i.cpp + client.cpp + } +} + diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc new file mode 100644 index 00000000000..a8f87249a81 --- /dev/null +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc @@ -0,0 +1,3 @@ +project(tests svc loader): taoexe { + exename = tests_svc_loader +}
\ No newline at end of file diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index de7d09fb781..ce8016a96b3 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_BiDirGIOP - libs = TAO + libs += TAO dllflags = TAO_BIDIRGIOP_BUILD_DLL libout = .. } diff --git a/TAO/tao/Domain/Domain.mpc b/TAO/tao/Domain/Domain.mpc index 2d372044cc2..85044e3384e 100644 --- a/TAO/tao/Domain/Domain.mpc +++ b/TAO/tao/Domain/Domain.mpc @@ -1,7 +1,7 @@ project : taolib { depends += IFR_Client PortableServer sharedname = TAO_Domain - libs = TAO_IFR_Client TAO_PortableServer TAO + libs += TAO_IFR_Client TAO_PortableServer TAO dllflags = TAO_DOMAIN_BUILD_DLL libout = .. } diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index 61575796fb4..40f7dca844c 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_DynamicAny - libs = TAO + libs += TAO dllflags = TAO_DYNAMICANY_BUILD_DLL libout = .. } diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc index 77e74f0bc80..f6c9de427b9 100644 --- a/TAO/tao/DynamicInterface/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_DynamicInterface - libs = TAO + libs += TAO dllflags = TAO_DYNAMICINTERFACE_BUILD_DLL libout = .. } diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc index 49c65fd3880..03478066c0d 100644 --- a/TAO/tao/IFR_Client/IFR_Client.mpc +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_IFR_Client - libs = TAO + libs += TAO dllflags = TAO_IFR_CLIENT_BUILD_DLL libout = .. } diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 5e58a043000..29e75d698af 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_IORManip - libs = TAO + libs += TAO dllflags = TAO_IORMANIP_BUILD_DLL libout = .. } diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index dfba6ef187b..24ca8803bfa 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_IORTable - libs = TAO + libs += TAO dllflags = TAO_IORTABLE_BUILD_DLL libout = .. } diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 999f106194c..99f4a6a7eaf 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -1,7 +1,7 @@ project : taolib { depends += PortableServer sharedname = TAO_Messaging - libs = TAO_PortableServer TAO + libs += TAO_PortableServer TAO dllflags = TAO_MESSAGING_BUILD_DLL libout = .. } diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc index 5c0794df981..378a4485cf7 100644 --- a/TAO/tao/PortableServer/PortableServer.mpc +++ b/TAO/tao/PortableServer/PortableServer.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_PortableServer - libs = TAO + libs += TAO dllflags = TAO_PORTABLESERVER_BUILD_DLL libout = .. } diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc index d3fc38ed073..d6f4a8cb2b5 100644 --- a/TAO/tao/RTCORBA/RTCORBA.mpc +++ b/TAO/tao/RTCORBA/RTCORBA.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_RTCORBA - libs = TAO + libs += TAO dllflags = TAO_RTCORBA_BUILD_DLL libout = .. } diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc index 0a5f018e4db..214b21999ff 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc @@ -1,7 +1,7 @@ project : taolib { depends += RTCORBA PortableServer sharedname = TAO_RTPortableServer - libs = TAO_RTCORBA TAO_PortableServer TAO + libs += TAO_RTCORBA TAO_PortableServer TAO dllflags = TAO_RTPORTABLESERVER_BUILD_DLL libout = .. } diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc index 5ad6d06623a..967a78f1004 100644 --- a/TAO/tao/SmartProxies/SmartProxies.mpc +++ b/TAO/tao/SmartProxies/SmartProxies.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_SmartProxies - libs = TAO + libs += TAO dllflags = TAO_SMARTPROXIES_BUILD_DLL libout = .. } diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index 373992108d8..c27a62a1b99 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -1,6 +1,6 @@ project : taolib { sharedname = TAO_Strategies - libs = TAO + libs += TAO dllflags = TAO_STRATEGIES_BUILD_DLL libout = .. } diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 56ec696cc03..6a635f14c3a 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -1,7 +1,7 @@ project : taolib { depends += IFR_Client sharedname = TAO_TypeCodeFactory - libs = TAO_IFR_Client TAO + libs += TAO_IFR_Client TAO dllflags = TAO_TYPECODEFACTORY_BUILD_DLL libout = .. } diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc index dd0b0f46c51..69b50986244 100644 --- a/TAO/tests/Collocation/Collocation.mpc +++ b/TAO/tests/Collocation/Collocation.mpc @@ -1,6 +1,6 @@ project(Collocation Test Stub): taolib_with_idl { sharedname = Collocation_Test_Stub - libs = TAO + libs += TAO idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd dllflags = MY_STUB_BUILD_DLL @@ -12,7 +12,7 @@ project(Collocation Test Stub): taolib_with_idl { project(Collocation Diamond) : taolib_with_idl { depends += PortableServer "Collocation Test Stub" sharedname = Collocation_Diamond - libs = Collocation_Test_Stub TAO_PortableServer TAO + libs += Collocation_Test_Stub TAO_PortableServer TAO idlflags += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd dllflags = DIAMOND_BUILD_DLL @@ -25,7 +25,7 @@ project(Collocation Diamond) : taolib_with_idl { project(Collocation) : strategies, server { depends += "Collocation Test Stub" "Collocation Diamond" exename = Collocation - libs += Collocation_Test_Stub Collocation_Diamond + libs += Collocation_Test_Stub Collocation_Diamond IDL_Files { } diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc index b9bc65db312..4785a6eb897 100644 --- a/TAO/tests/DLL_ORB/DLL_ORB.mpc +++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc @@ -1,6 +1,6 @@ project(Test Client Module): taolib_with_idl { sharedname = Test_Client_Module - libs = TAO + libs += TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h dllflags = TEST_CLIENT_MODULE_BUILD_DLL @@ -13,7 +13,7 @@ project(Test Client Module): taolib_with_idl { project(Test Server Module) : taolib_with_idl { depends += PortableServer sharedname = Test_Server_Module - libs = TAO_PortableServer TAO + libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h dllflags = TEST_SERVER_MODULE_BUILD_DLL diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc index 469e003bcc2..1e71392cbb5 100644 --- a/TAO/tests/Object_Loader/Object_Loader.mpc +++ b/TAO/tests/Object_Loader/Object_Loader.mpc @@ -1,7 +1,7 @@ project(Test DLL): taolib_with_idl { sharedname = Test_DLL depends += PortableServer - libs = TAO_PortableServer TAO + libs += TAO_PortableServer TAO idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h dllflags = OLT_BUILD_DLL diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc.mpc b/TAO/tests/ior_corbaloc/ior_corbaloc.mpc index a826babb9c3..67edd0abd8b 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc.mpc +++ b/TAO/tests/ior_corbaloc/ior_corbaloc.mpc @@ -1,16 +1,11 @@ -project: server { - depends += CosNaming - libs += TAO_CosNaming - +project: namingexe { Source_Files { status_i.cpp server.cpp } } -project(client): server { - depends += CosNaming - libs += TAO_CosNaming +project(client): namingexe { exename = client Source_Files { diff --git a/ace/Map.cpp b/ace/Map.cpp index daa8b29dc70..1faa6c18f23 100644 --- a/ace/Map.cpp +++ b/ace/Map.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "ace/Map.h" +#include "ace/Map_T.h" ACE_RCSID(ace, Map, "$Id$") diff --git a/ace/Map_T.h b/ace/Map_T.h index 9b4dd6038ad..7730d9686d7 100644 --- a/ace/Map_T.h +++ b/ace/Map_T.h @@ -14,8 +14,7 @@ #define ACE_MAP_T_H #include "ace/pre.h" -#include "ace/Map.h" -#include "ace/Pair.h" +#include "ace/Pair_T.h" #include "ace/Map_Manager.h" #include "ace/Hash_Map_Manager.h" #include "ace/Active_Map_Manager.h" diff --git a/ace/Pair.cpp b/ace/Pair.cpp index 7b595e8b3c7..fce14f96302 100644 --- a/ace/Pair.cpp +++ b/ace/Pair.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "ace/Pair.h" +#include "ace/Pair_T.h" ACE_RCSID(ace, Pair, "$Id$") diff --git a/ace/Pair_T.h b/ace/Pair_T.h index 1e4000789c5..8fb8ac1d5f5 100644 --- a/ace/Pair_T.h +++ b/ace/Pair_T.h @@ -15,7 +15,7 @@ #define ACE_PAIR_T_H #include "ace/pre.h" -#include "ace/Pair.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/bin/MakeProjectCreator/config/avstreamsexe.mpb b/bin/MakeProjectCreator/config/avstreamsexe.mpb new file mode 100644 index 00000000000..645cfd57f0d --- /dev/null +++ b/bin/MakeProjectCreator/config/avstreamsexe.mpb @@ -0,0 +1,5 @@ +project { + depends += AV CosProperty CosNaming Svc_Utils IORTable PortableServer + libs += TAO_AV TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer +} + diff --git a/bin/MakeProjectCreator/config/namingexe.mpb b/bin/MakeProjectCreator/config/namingexe.mpb new file mode 100644 index 00000000000..9ed6a25ee5b --- /dev/null +++ b/bin/MakeProjectCreator/config/namingexe.mpb @@ -0,0 +1,4 @@ +project : server, orbsvcsexe { + depends += CosNaming Svc_Utils IORTable + libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable +} diff --git a/bin/MakeProjectCreator/config/notify.mpb b/bin/MakeProjectCreator/config/notify.mpb new file mode 100644 index 00000000000..ec7c0021297 --- /dev/null +++ b/bin/MakeProjectCreator/config/notify.mpb @@ -0,0 +1,4 @@ +project { + depends += CosNotification ETCL CosNaming Svc_Utils IORTable DynamicAny PortableServer TAO + libs += TAO_CosNotification TAO_ETCL TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO +} diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb new file mode 100644 index 00000000000..6ce2b4f6636 --- /dev/null +++ b/bin/MakeProjectCreator/config/notifytest.mpb @@ -0,0 +1,6 @@ +project: orbsvcsexe, notify { + depends += "Notify Lib" + libs += NotifyTests + libpaths += $(TAO_ROOT)/orbsvcs/tests/Notify/lib + includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib +}
\ No newline at end of file diff --git a/bin/MakeProjectCreator/config/rteventexe.mpb b/bin/MakeProjectCreator/config/rteventexe.mpb new file mode 100644 index 00000000000..c2fbb8dc552 --- /dev/null +++ b/bin/MakeProjectCreator/config/rteventexe.mpb @@ -0,0 +1,4 @@ +project: orbsvcsexe { + depends += RTEvent Svc_Utils PortableServer + libs += TAO_RTEvent TAO_Svc_Utils TAO_PortableServer +} diff --git a/tests/RMCast/tests.mpc b/tests/RMCast/tests.mpc index a8352d68f30..a0471143e49 100644 --- a/tests/RMCast/tests.mpc +++ b/tests/RMCast/tests.mpc @@ -1,7 +1,7 @@ project(RMCast Fragment Test) : aceexe { depends += rmcast exename = RMCast_Fragment_Test - libs = ACE_RMCast + libs += ACE_RMCast Source_Files { RMCast_Fragment_Test.cpp @@ -11,7 +11,7 @@ project(RMCast Fragment Test) : aceexe { project(RMCast Membership Test) : aceexe { depends += rmcast exename = RMCast_Membership_Test - libs = ACE_RMCast + libs += ACE_RMCast Source_Files { RMCast_Membership_Test.cpp @@ -21,7 +21,7 @@ project(RMCast Membership Test) : aceexe { project(RMCast Reassembly Test) : aceexe { depends += rmcast exename = RMCast_Reassembly_Test - libs = ACE_RMCast + libs += ACE_RMCast Source_Files { RMCast_Reassembly_Test.cpp @@ -31,7 +31,7 @@ project(RMCast Reassembly Test) : aceexe { project(RMCast Reordering Test) : aceexe { depends += rmcast exename = RMCast_Reordering_Test - libs = ACE_RMCast + libs += ACE_RMCast Source_Files { RMCast_Reordering_Test.cpp @@ -41,7 +41,7 @@ project(RMCast Reordering Test) : aceexe { project(RMCast Retransmission Test) : aceexe { depends += rmcast exename = RMCast_Retransmission_Test - libs = ACE_RMCast + libs += ACE_RMCast Source_Files { RMCast_Retransmission_Test.cpp @@ -51,7 +51,7 @@ project(RMCast Retransmission Test) : aceexe { project(RMCast UDP Best Effort Test) : aceexe { depends += rmcast exename = RMCast_UDP_Best_Effort_Test - libs = ACE_RMCast + libs += ACE_RMCast Source_Files { RMCast_UDP_Best_Effort_Test.cpp diff --git a/tests/SSL/tests.mpc b/tests/SSL/tests.mpc index 5aa31367613..c36dab9c595 100644 --- a/tests/SSL/tests.mpc +++ b/tests/SSL/tests.mpc @@ -2,7 +2,7 @@ project(Thread Pool Reactor SSL Test) : aceexe { ssl = 1 depends += ssl exename = Thread_Pool_Reactor_SSL_Test - libs = ACE_SSL + libs += ACE_SSL Source_Files { Thread_Pool_Reactor_SSL_Test.cpp |