diff options
27 files changed, 153 insertions, 261 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b1ddb51d905..fb9f4190bb3 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,27 +1,60 @@ +Sun Mar 04 21:43:51 2001 Carlos O'Ryan <coryan@uci.edu> + + * orbsvcs/CosEvent_Service/Makefile: + * orbsvcs/Dump_Schedule/Makefile: + * orbsvcs/Event_Service/Makefile: + * orbsvcs/LifeCycle_Service/Makefile: + * orbsvcs/Logging_Service/Makefile: + * orbsvcs/Notify_Service/Makefile: + * orbsvcs/Scheduling_Service/Makefile: + * orbsvcs/tests/AVStreams/benchmark/Makefile: + * orbsvcs/tests/CosEvent/Basic/Makefile: + * orbsvcs/tests/EC_Basic/Makefile: + * orbsvcs/tests/EC_Custom_Marshal/Makefile: + * orbsvcs/tests/EC_Multiple/Makefile: + * orbsvcs/tests/EC_Throughput/Makefile: + * orbsvcs/tests/Event/Basic/Makefile: + * orbsvcs/tests/Event/Performance/Makefile: + * orbsvcs/tests/Event_Latency/Makefile: + * orbsvcs/tests/FaultTolerance/IOGR/Makefile: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile: + * orbsvcs/tests/Sched/Makefile: + * orbsvcs/tests/Trading/Makefile: + * orbsvcs/tests/ior_corbaname/Makefile: + The libraries added to support QNX were not in the right order, + it should be fixed now. + + * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h: + * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i: + * orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h: + * orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp: + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h: + Several minor cosmetic fixes. + Sun Mar 04 20:15:33 2001 Ossama Othman <ossama@uci.edu> - * examples/Content_Server/SMI_Iterator/client.cpp (retrieve_data): - * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp - (initialize_content_iterator): - * examples/Content_Server/AMI_Observer/Callback_i.cpp - (Callback_i): + * examples/Content_Server/SMI_Iterator/client.cpp (retrieve_data): + * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp + (initialize_content_iterator): + * examples/Content_Server/AMI_Observer/Callback_i.cpp + (Callback_i): - Windows doesn't like the POSIX.1 mode constants I was using in - these files. Use the ACE_DEFAULT_FILE_PERMS macro instead to - work-around Windows-specific stuff like this. + Windows doesn't like the POSIX.1 mode constants I was using in + these files. Use the ACE_DEFAULT_FILE_PERMS macro instead to + work-around Windows-specific stuff like this. - Fixed error messages so that they properly display filename with - which the error was associated. + Fixed error messages so that they properly display filename with + which the error was associated. Sun Mar 4 21:39:03 2001 Frank Hunleth <fhunleth@cs.wustl.edu> - * tao/corbafwd.h: - Commented in TAO_TAG_UDP_PROFILE now that DIOP is being - built regularly. + * tao/corbafwd.h: + Commented in TAO_TAG_UDP_PROFILE now that DIOP is being + built regularly. - * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: - * examples/PluggableUDP/DIOP/DIOP_Transport.cpp: - Fixed compile warnings under Linux. + * examples/PluggableUDP/DIOP/DIOP_Connector.cpp: + * examples/PluggableUDP/DIOP/DIOP_Transport.cpp: + Fixed compile warnings under Linux. Sun Mar 4 19:12:59 2001 Darrell Brunsch <brunsch@uci.edu> @@ -189,37 +222,37 @@ Sun Mar 4 19:12:59 2001 Darrell Brunsch <brunsch@uci.edu> Sun Mar 04 16:01:50 2001 Ossama Othman <ossama@uci.edu> - * tao/RT_Current.h: - * tao/RT_Mutex.h: - * tao/RT_ORB.h: - * tao/RT_Policy_i.h: - - Removed inclusion of `tao/RTCORBAS.h'. The RTCORBA module only - defines local interfaces, so there is no need to include this - header. Included `tao/RTCORBAC.h' instead. This reduces header - dependencies. - - * tao/RTCORBAC.cpp: - * tao/TAOC.cpp: - * tao/TimeBaseC.cpp: - - We should never include a skeleton header for the same IDL in - the corresponding stub sources. Removed those includes - (e.g. removed '#include "tao/TAOS.h"' from TAOC.cpp). - - * tao/Makefile: - * tao/Makefile.bor: - * tao/TAO.dsp: - * tao/TAO_Static.dsp: - - Do not compile the following empty skeleton files: - - CONV_FRAMES - GIOPS - IOPS - PollableS - RTCORBAS - TAOS + * tao/RT_Current.h: + * tao/RT_Mutex.h: + * tao/RT_ORB.h: + * tao/RT_Policy_i.h: + + Removed inclusion of `tao/RTCORBAS.h'. The RTCORBA module only + defines local interfaces, so there is no need to include this + header. Included `tao/RTCORBAC.h' instead. This reduces header + dependencies. + + * tao/RTCORBAC.cpp: + * tao/TAOC.cpp: + * tao/TimeBaseC.cpp: + + We should never include a skeleton header for the same IDL in + the corresponding stub sources. Removed those includes + (e.g. removed '#include "tao/TAOS.h"' from TAOC.cpp). + + * tao/Makefile: + * tao/Makefile.bor: + * tao/TAO.dsp: + * tao/TAO_Static.dsp: + + Do not compile the following empty skeleton files: + + CONV_FRAMES + GIOPS + IOPS + PollableS + RTCORBAS + TAOS Sun Mar 04 13:55:28 2001 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile index f04d9b5ce84..22f4f18cee6 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile +++ b/TAO/orbsvcs/CosEvent_Service/Makefile @@ -6,19 +6,11 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LSRC = CosEvent_Service.cpp \ +LSRC = CosEvent_Service.cpp ES_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_CosEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO BIN_UNCHECKED = CosEvent_Service diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile index 1101ac774b0..24360350d31 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile +++ b/TAO/orbsvcs/Dump_Schedule/Makefile @@ -10,15 +10,7 @@ SRC = $(DUMP_SRCS) SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) DUMP_OBJS = $(DUMP_SRCS:.cpp=.o) -LDLIBS = -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO BIN2 = Dump_Schedule #### If the TAO orbsvcs library wasn't built with sufficient components, diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile index c1fa839f78e..f7be0fcd7a2 100644 --- a/TAO/orbsvcs/Event_Service/Makefile +++ b/TAO/orbsvcs/Event_Service/Makefile @@ -7,15 +7,7 @@ endif LSRC = Event_Service.cpp ES_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO BIN2 = Event_Service diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile index 45243b45a4b..f96fc3802b8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile @@ -24,15 +24,7 @@ LSRC= \ LIFECYCLE_SERVICE_OBJS = LifeCycle_Service.o LifeCycle_Service_i.o \ Factory_Trader.o Criteria_Evaluator.o -LDLIBS = -lTAO_CosLifeCycle -lTAO_CosTrading -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_CosLifeCycle -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO BIN2 = LifeCycle_Service diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile index b077f35ffc5..e88dc691f15 100644 --- a/TAO/orbsvcs/Logging_Service/Makefile +++ b/TAO/orbsvcs/Logging_Service/Makefile @@ -10,15 +10,7 @@ LSRC = Logging_Service.cpp LOG_OBJS=$(LSRC:.cpp=.o) -LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_DsLogAdmin -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO BIN2 = Logging_Service diff --git a/TAO/orbsvcs/Notify_Service/Makefile b/TAO/orbsvcs/Notify_Service/Makefile index 1f6ce4533f1..953f6be0e5e 100644 --- a/TAO/orbsvcs/Notify_Service/Makefile +++ b/TAO/orbsvcs/Notify_Service/Makefile @@ -6,16 +6,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) -LDLIBS+=$(TAO_COS_NOTIFICATION_LIBS) +LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO LSRC = Notify_Service.cpp diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile index fe44fdf5b1e..294b17669b9 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile +++ b/TAO/orbsvcs/Scheduling_Service/Makefile @@ -9,15 +9,7 @@ LSRC = $(SCHEDULE_SRCS) SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) -LDLIBS = -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO BIN2 = Scheduling_Service diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index a4459325de7..8f9700a04c3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -44,7 +44,9 @@ class TAO_Notify_POA_Factory; // portably. I don't mean that you should do that right now, but // consider it in your design. -class TAO_Notify_Export TAO_Notify_EventChannelFactory_i : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory, public virtual PortableServer::RefCountServantBase +class TAO_Notify_Export TAO_Notify_EventChannelFactory_i + : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory + , public virtual PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_EventChannelFactory_i diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index e46c78d1947..a72162954e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h @@ -109,13 +109,18 @@ class TAO_Notify_Export TAO_Notify_Event_Manager // Get the Resource Factory. // = Event forwarding methods. - void process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV); + void process_event (TAO_Notify_Event* event, + TAO_Notify_EventSource* event_source, + CORBA::Environment &ACE_TRY_ENV); // Delivers the event to listeners subscribed for <event> // <event_source> is the <event> source to the Event Manager. - protected: +protected: // = Event dispatching methods. - void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV); + void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, + TAO_Notify_EventType_List& added, + TAO_Notify_EventType_List& removed, + CORBA::Environment &ACE_TRY_ENV); // Dispatch the updates to the <update_listener_list> // = Data members. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i index 869f877e8d1..374b1f2b47d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i @@ -6,13 +6,17 @@ #include "tao/corba.h" ACE_INLINE void -TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, + TAO_Notify_EventSource* event_source, + CORBA::Environment &ACE_TRY_ENV) { if (admin_properties_->reject_new_events () == 1 && admin_properties_->queue_full ()) ACE_THROW (CORBA::IMP_LIMIT ()); - this->event_processor_->evaluate_source_filter (event, event_source, ACE_TRY_ENV); + this->event_processor_->evaluate_source_filter (event, + event_source, + ACE_TRY_ENV); // Start by checking if the event passes through the Source's filter. } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp index 30e6665b254..616daab0ece 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp @@ -46,9 +46,14 @@ TAO_Notify_Event_Processor::shutdown (CORBA::Environment & ACE_TRY_ENV) } void -TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, + TAO_Notify_EventSource* event_source, + CORBA::Environment& ACE_TRY_ENV) { // TODO: use cache allocator here. + // @@ Pradeep: you shouldn't be allocating at all! If this must go + // into a queue then the processing queue should make the + // allocation, that way the single threaded case works just fine. TAO_Notify_Source_Filter_Eval_Command* mb = new TAO_Notify_Source_Filter_Eval_Command (this, event, event_source); @@ -56,7 +61,9 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, TAO } void -TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* /*event_source*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event, + TAO_Notify_EventSource* /*event_source*/, + CORBA::Environment &ACE_TRY_ENV) { TAO_Notify_Lookup_Command* lookup = new TAO_Notify_Lookup_Command (this, event, this->event_manager_->event_map ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h index 22688b5ff46..d42fa98db99 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h @@ -62,19 +62,30 @@ class TAO_Notify_Export TAO_Notify_Event_Processor void shutdown (CORBA::Environment &ACE_TRY_ENV); // Shutdown operations. - void evaluate_source_filter(TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment& ACE_TRY_ENV); + void evaluate_source_filter (TAO_Notify_Event* event, + TAO_Notify_EventSource* event_source, + CORBA::Environment& ACE_TRY_ENV); // Event processing entry point. // = Callbacks for Source/Event Listeners. - void lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV); - // This method is called by an Event_Source after it has successfully evaluated its filter. - - void evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV); - // This method is called by the subscription lookup command asking that <event> be delivered - // to <event_listener>. - - void dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV); - // This method is called by an Event_Listener after it has successfully evaluated its filter. + void lookup_subscriptions (TAO_Notify_Event* event, + TAO_Notify_EventSource* event_source, + CORBA::Environment &ACE_TRY_ENV); + // This method is called by an Event_Source after it has + // successfully evaluated its filter. + + void evaluate_listener_filter (TAO_Notify_Event* event, + TAO_Notify_EventListener* event_listener, + CORBA::Boolean eval_parent, + CORBA::Environment &ACE_TRY_ENV); + // This method is called by the subscription lookup command asking + // that <event> be delivered to <event_listener>. + + void dispatch_event (TAO_Notify_Event* event, + TAO_Notify_EventListener* event_listener, + CORBA::Environment &ACE_TRY_ENV); + // This method is called by an Event_Listener after it has + // successfully evaluated its filter. protected: // = Data Members diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile index e006612ea59..502ad3b7633 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile @@ -9,15 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO SERVER_OBJS = server.o child.o CLIENT_OBJS = client.o diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile index f328c0852da..02b67dd094d 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile @@ -21,15 +21,7 @@ BIN2 = \ Random PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile index 773a233e366..acbda02d056 100644 --- a/TAO/orbsvcs/tests/EC_Basic/Makefile +++ b/TAO/orbsvcs/tests/EC_Basic/Makefile @@ -1,15 +1,7 @@ # $Id$ SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS= -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS= -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile index 8d2d2afd963..e95f013b839 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile @@ -1,14 +1,6 @@ # $Id$ -LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile index 0ca4e97657c..00b36ec7e7d 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile @@ -1,15 +1,7 @@ # $Id$ SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile index f0161e3bbd0..de9152d16b9 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile @@ -1,14 +1,6 @@ # $Id$ -LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile index 3c95cdbe443..111141f60d7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile @@ -29,15 +29,7 @@ BIN2 = Reconnect \ Random PSRC=$(addsuffix .cpp,$(BIN2)) Schedule.cpp -LDLIBS = -lECTests -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile index fc0fc925394..f113a3c47b9 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile @@ -19,15 +19,7 @@ BIN2 = Throughput \ Latency_Server PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lECTests -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Strategies -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Strategies -lTAO CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile index 8078dd87699..ab2a6c4714e 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Makefile +++ b/TAO/orbsvcs/tests/Event_Latency/Makefile @@ -4,15 +4,7 @@ EVENT_LATENCY_SRCS = Event_Latency.cpp LSRC = $(EVENT_LATENCY_SRCS) EVENT_LATENCY_OBJS = $(EVENT_LATENCY_SRCS:.cpp=.o) -LDLIBS = -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO BIN2 = Event_Latency diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile index 3bd8a942e8d..16c9af0b8fa 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -#LDLIBS = -lTAO_FaultTolerance -lTAO -lACE +#LDLIBS = -lTAO_FaultTolerance -lTAO IDL_FILES=test IDL_SRC = testC testS @@ -50,16 +50,7 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext)) TAO_IOR_MANIP_LIBS = -lTAO_IORManip -TAO_FT_LIBS = -lTAO_Svc_Utils -lTAO_PortableServer -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -TAO_FT_LIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_COS_NOTIFICATION_LIBS) $(TAO_FAULT_TOLERANCE_LIBS) - +TAO_FT_LIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_FT_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile index 31e015a830d..6de27c0c820 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile @@ -12,15 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_IORManip -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_COS_NOTIFICATION_LIBS) $(TAO_FAULT_TOLERANCE_LIBS) +LDLIBS = -lTAO_CosFaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORManip -lTAO PROG_SRCS = IOGRTest.cpp diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile index 7310e172715..f9a79d3daf8 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile +++ b/TAO/orbsvcs/tests/Sched/Makefile @@ -1,20 +1,12 @@ # $Id$ -SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS = -lTAO_Svc_Utils -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_RT_SCHED_LIBS) - ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif +SRC = $(BIN:%=%$(VAR).cpp) +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO + CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_ROOT) diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile index 72adcfb7625..9f099bf5081 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile +++ b/TAO/orbsvcs/tests/Trading/Makefile @@ -38,16 +38,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) LSRC = $(addsuffix .cpp,$(FILES)) $(IDL_SRC) PSRC = $(addsuffix .cpp,$(BIN2)) -ACE_SHLIBS = -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_CosTrading -lTAO_DynamicAny -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) $(TAO_COS_TRADING_LIBS) +ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE +LDLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile index 57b607aa472..76a97f6586d 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/Makefile +++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile @@ -15,15 +15,7 @@ endif # ! TAO_ROOT IDL_FILES = corbaname IDL_SRC = corbanameC corbanameS -LDLIBS = -lTAO_PortableServer -lTAO -# -# NOTE -# -# The following macro expands to a series of libraries -# on QNX RTP. It has been introduced to solve a problem -# with the current QNX RTP linker. -# -LDLIBS+=$(TAO_COS_NAMING_LIBS) +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvcs BIN = server client |