From 9223c755e2af32495ff3c9290c5b2acfa43afab7 Mon Sep 17 00:00:00 2001 From: michel_j Date: Thu, 26 Jun 2003 22:38:14 +0000 Subject: Thu Jun 26 17:35:00 2003 Justin Michel --- ChangeLog | 10 +++ Kokyu/Kokyu.mpc | 8 +-- TAO/ChangeLog | 14 ++++ TAO/TAOACE.mwc | 1 + TAO/orbsvcs/orbsvcs/CosNotification.mpc | 89 +++++++++++++++++++++++-- TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc | 1 + TAO/orbsvcs/orbsvcs/RTEvent.mpc | 90 ++++++++++++++++---------- TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc | 19 ++++++ TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc | 5 +- TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc | 9 ++- TAO/orbsvcs/orbsvcs/RT_Notification.mpc | 2 + bin/MakeProjectCreator/config/kokyu.mpb | 4 ++ bin/MakeProjectCreator/config/rtkokyuevent.mpb | 4 ++ bin/create_ace_build.pl | 1 + 14 files changed, 206 insertions(+), 51 deletions(-) create mode 100644 TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc create mode 100644 bin/MakeProjectCreator/config/kokyu.mpb create mode 100644 bin/MakeProjectCreator/config/rtkokyuevent.mpb diff --git a/ChangeLog b/ChangeLog index 3bd69f8b93a..a033e9c65d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jun 26 17:35:00 2003 Justin Michel + + * Kokyu/Kokyu.mpc: + * bin/create_ace_build.pl: + * bin/MakeProjectCreator/config/kokyu.mpb: + * bin/MakeProjectCreator/config/rtkokyuevent.mpb: + + Fixes for mpc generated builds. + create_ace_build won't link .opt files. + Thu Jun 26 16:31:51 2003 Chris Cleeland * ace/QtReactor.h: diff --git a/Kokyu/Kokyu.mpc b/Kokyu/Kokyu.mpc index b796c87fa72..9dafc6ba137 100644 --- a/Kokyu/Kokyu.mpc +++ b/Kokyu/Kokyu.mpc @@ -1,6 +1,4 @@ -project : Kokyulib, core { - sharedname = Kokyu - dynamicflags = KOKYU_BUILD_DLL - libout = .. - include_dir = $(ACE_ROOT)/ace +project : acelib, core { + sharedname = Kokyu + dynamicflags = KOKYU_BUILD_DLL } diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6bdf565852a..2e1bbcf3ba6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Jun 26 17:35:00 2003 Justin Michel + + * TAOACE.mwc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTKokyuEvent.mpc: + * orbsvcs/orbsvcs/RTOLDEvent.mpc: + * orbsvcs/orbsvcs/RTSchedEvent.mpc: + * orbsvcs/orbsvcs/RT_Notification.mpc: + + Fixes for mpc generated builds. + + Thu Jun 26 16:08:03 2003 George Edwards * TAO/tests/OBV/Supports/Supports_Test_impl.cpp: diff --git a/TAO/TAOACE.mwc b/TAO/TAOACE.mwc index b464ed99377..27c0c0c9958 100644 --- a/TAO/TAOACE.mwc +++ b/TAO/TAOACE.mwc @@ -4,6 +4,7 @@ workspace { ../ACEXML/common ../ACEXML/parser/parser ../ACEXML/apps/svcconf + ../Kokyu tao TAO_IDL utils diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index ff3ad2ad275..6889fca0c83 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -18,6 +18,9 @@ project(CosNotification) : orbsvcslib, core, etcl, dynamicany, event { Event_Forwarder.idl } + // The following could be simplified if RT stuff was + // put into another subdirectory. + Source_Files(ORBSVCS_COMPONENTS) { Notify { CosEventCommC.cpp @@ -36,10 +39,88 @@ project(CosNotification) : orbsvcslib, core, etcl, dynamicany, event { NotifyExtS.cpp Event_ForwarderC.cpp Event_ForwarderS.cpp - Notify - Notify/Any - Notify/Sequence - Notify/Structured + Notify/Admin.cpp + Notify/AdminProperties.cpp + Notify/Buffering_Strategy.cpp + Notify/Builder.cpp + Notify/Consumer.cpp + Notify/ConsumerAdmin.cpp + Notify/Container_T.cpp + Notify/CosNotify_Initializer.cpp + Notify/CosNotify_Service.cpp + Notify/Default_Factory.cpp + Notify/ETCL_Filter.cpp + Notify/ETCL_FilterFactory.cpp + Notify/Event.cpp + Notify/EventChannel.cpp + Notify/EventChannelFactory.cpp + Notify/EventType.cpp + Notify/EventTypeSeq.cpp + Notify/Event_Manager.cpp + Notify/Event_Map_Entry_T.cpp + Notify/Event_Map_T.cpp + Notify/FilterAdmin.cpp + Notify/Find_Worker_T.cpp + Notify/ID_Factory.cpp + Notify/Method_Request.cpp + Notify/Method_Request_Dispatch.cpp + Notify/Method_Request_Dispatch_T.cpp + Notify/Method_Request_Event.cpp + Notify/Method_Request_Lookup.cpp + Notify/Method_Request_Lookup_T.cpp + Notify/Method_Request_Shutdown.cpp + Notify/Method_Request_Updates.cpp + Notify/Method_Request_Updates_T.cpp + Notify/Notify_Constraint_Interpreter.cpp + Notify/Notify_Constraint_Visitors.cpp + Notify/Notify_Default_Collection_Factory.cpp + Notify/Notify_Default_CO_Factory.cpp + Notify/Notify_Default_EMO_Factory.cpp + Notify/Notify_Default_POA_Factory.cpp + Notify/Notify_EventChannelFactory_i.cpp + Notify/Notify_Extensions.cpp + Notify/Object.cpp + Notify/Peer.cpp + Notify/POA_Helper.cpp + Notify/Properties.cpp + Notify/PropertySeq.cpp + Notify/Property_Boolean.cpp + Notify/Property_T.cpp + Notify/Proxy.cpp + Notify/ProxyConsumer.cpp + Notify/ProxyConsumer_T.cpp + Notify/ProxySupplier.cpp + Notify/ProxySupplier_T.cpp + Notify/Proxy_T.cpp + Notify/QoSProperties.cpp + Notify/Reactive_Task.cpp + Notify/Refcountable.cpp + Notify/Refcountable_Guard_T.cpp + Notify/Seq_Worker_T.cpp + Notify/Subscription_Change_Worker.cpp + Notify/Supplier.cpp + Notify/SupplierAdmin.cpp + Notify/ThreadPool_Task.cpp + Notify/Timer_Queue.cpp + Notify/Timer_Reactor.cpp + Notify/Worker_Task.cpp + Notify/Any/AnyEvent.cpp + Notify/Any/CosEC_ProxyPushConsumer.cpp + Notify/Any/CosEC_ProxyPushSupplier.cpp + Notify/Any/ProxyPushConsumer.cpp + Notify/Any/ProxyPushSupplier.cpp + Notify/Any/PushConsumer.cpp + Notify/Any/PushSupplier.cpp + Notify/Sequence/Batch_Buffering_Strategy.cpp + Notify/Sequence/SequenceProxyPushConsumer.cpp + Notify/Sequence/SequenceProxyPushSupplier.cpp + Notify/Sequence/SequencePushConsumer.cpp + Notify/Sequence/SequencePushSupplier.cpp + Notify/Structured/StructuredEvent.cpp + Notify/Structured/StructuredProxyPushConsumer.cpp + Notify/Structured/StructuredProxyPushSupplier.cpp + Notify/Structured/StructuredPushConsumer.cpp + Notify/Structured/StructuredPushSupplier.cpp } } } diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 88cc86953e4..b7099a1a9d1 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -3,6 +3,7 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, svc_utils, iortable, idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL tagchecks = RTCORBAEvent + includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 0deb0fe0a11..05a53bdb3ec 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -25,51 +25,71 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging, portableserver { RtecEventChannelAdminS.cpp RtecUDPAdminC.cpp RtecUDPAdminS.cpp - Event/EC_Event_Channel.cpp + Event_Utilities.cpp + Event/CRC.cpp + Event/ECG_Adapters.cpp + Event/ECG_Address_Server_Base.cpp + Event/ECG_CDR_Message_Receiver.cpp + Event/ECG_CDR_Message_Sender.cpp + Event/ECG_Complex_Address_Server.cpp + Event/ECG_Mcast_EH.cpp + Event/ECG_Mcast_Gateway.cpp + Event/ECG_Simple_Address_Server.cpp + Event/ECG_Simple_Mcast_EH.cpp + Event/ECG_UDP_EH.cpp + Event/ECG_UDP_Out_Endpoint.cpp + Event/ECG_UDP_Receiver.cpp + Event/ECG_UDP_Sender.cpp + Event/EC_And_Filter.cpp + Event/EC_Basic_Factory.cpp + Event/EC_Basic_Filter_Builder.cpp + Event/EC_Bitmask_Filter.cpp + Event/EC_Busy_Lock.cpp + Event/EC_Channel_Destroyer.cpp + Event/EC_Conjunction_Filter.cpp Event/EC_ConsumerAdmin.cpp - Event/EC_SupplierAdmin.cpp - Event/EC_ProxyConsumer.cpp - Event/EC_ProxySupplier.cpp - Event/EC_Supplier_Filter.cpp - Event/EC_Supplier_Filter_Builder.cpp - Event/EC_Trivial_Supplier_Filter.cpp - Event/EC_Filter.cpp - Event/EC_Filter_Builder.cpp + Event/EC_ConsumerControl.cpp + Event/EC_Default_Factory.cpp + Event/EC_Default_ProxyConsumer.cpp + Event/EC_Default_ProxySupplier.cpp + Event/EC_Disjunction_Filter.cpp Event/EC_Dispatching.cpp + Event/EC_Dispatching_Task.cpp + Event/EC_Event_Channel.cpp + Event/EC_Event_Channel_Base.cpp Event/EC_Factory.cpp - Event/EC_QOS_Info.cpp - Event/EC_Null_Factory.cpp - Event/EC_Disjunction_Filter.cpp - Event/EC_Conjunction_Filter.cpp + Event/EC_Filter.cpp + Event/EC_Filter_Builder.cpp + Event/EC_Gateway.cpp + Event/EC_Group_Scheduling.cpp + Event/EC_Lifetime_Utils.cpp + Event/EC_Lifetime_Utils_T.cpp + Event/EC_Masked_Type_Filter.cpp + Event/EC_MT_Dispatching.cpp Event/EC_Negation_Filter.cpp - Event/EC_Type_Filter.cpp - Event/EC_Basic_Filter_Builder.cpp - Event/EC_Basic_Factory.cpp - Event/EC_Default_Factory.cpp + Event/EC_Null_Factory.cpp + Event/EC_Null_Scheduling.cpp Event/EC_ObserverStrategy.cpp Event/EC_Per_Supplier_Filter.cpp - Event/EC_Timeout_Filter.cpp - Event/EC_Timeout_Generator.cpp + Event/EC_Prefix_Filter_Builder.cpp + Event/EC_ProxyConsumer.cpp + Event/EC_ProxySupplier.cpp + Event/EC_Proxy_Disconnector.cpp + Event/EC_QOS_Info.cpp + Event/EC_Reactive_ConsumerControl.cpp + Event/EC_Reactive_Dispatching.cpp + Event/EC_Reactive_SupplierControl.cpp Event/EC_Reactive_Timeout_Generator.cpp - Event/EC_MT_Dispatching.cpp - Event/EC_Dispatching_Task.cpp Event/EC_Scheduling_Strategy.cpp - Event/EC_Null_Scheduling.cpp - Event/EC_Group_Scheduling.cpp - Event/EC_ConsumerControl.cpp + Event/EC_SupplierAdmin.cpp Event/EC_SupplierControl.cpp - Event/EC_Reactive_ConsumerControl.cpp - Event/EC_Reactive_SupplierControl.cpp - Event/EC_Bitmask_Filter.cpp - Event/EC_Masked_Type_Filter.cpp - Event/EC_Prefix_Filter_Builder.cpp - Event/EC_And_Filter.cpp - Event/EC_Gateway.cpp - Event/EC_Gateway_UDP.cpp - Event/ECG_Mcast_EH.cpp - Event/ECG_UDP_Sender.cpp + Event/EC_Supplier_Filter.cpp + Event/EC_Supplier_Filter_Builder.cpp + Event/EC_Timeout_Filter.cpp + Event/EC_Timeout_Generator.cpp + Event/EC_Trivial_Supplier_Filter.cpp + Event/EC_Type_Filter.cpp Event/EC_UDP_Admin.cpp - Event_Utilities.cpp } } } diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc new file mode 100644 index 00000000000..6930fe73bca --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc @@ -0,0 +1,19 @@ +project : orbsvcslib, core, rtevent, rtsched, kokyu { + sharedname = TAO_RTKokyuEvent + dynamicflags = TAO_RTKOKYUEVENT_BUILD_DLL + tagchecks = RTKokyuEvent + includes += $(TAO_ROOT)/orbsvcs/orbsvcs + + IDL_Files { + } + + Source_Files(ORBSVCS_COMPONENTS) { + RTKokyuEvent { + Event/EC_Kokyu_Dispatching.cpp + Event/EC_Kokyu_Factory.cpp + Event/EC_Kokyu_Filter.cpp + Event/EC_Kokyu_Filter_Builder.cpp + Event/EC_Kokyu_Scheduling.cpp + } + } +} diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index 6cbfeb2ef6e..e1fc1602e6e 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -14,12 +14,13 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, por Event/Dispatching_Modules.cpp Event/Event_Channel.cpp Event/Event_Manip.cpp + Event/GPlot_File.cpp Event/Local_ESTypes.cpp Event/Memory_Pools.cpp - Event/RT_Task.cpp + Event/Module_Factory.cpp Event/ReactorTask.cpp + Event/RT_Task.cpp Event/Timer_Module.cpp - Event/Module_Factory.cpp } } diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index fe63d7c93de..54c00af3412 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -2,7 +2,6 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, p sharedname = TAO_RTSchedEvent dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL tagchecks = RTSchedEvent - // Add this include path for precompiled headers includes += $(TAO_ROOT)/orbsvcs/orbsvcs IDL_Files { @@ -10,12 +9,12 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, p Source_Files(ORBSVCS_COMPONENTS) { RTSchedEvent { - Event/EC_Sched_Filter.cpp - Event/EC_Sched_Filter_Builder.cpp - Event/EC_Priority_Scheduling.cpp + Event/EC_Gateway_Sched.cpp Event/EC_Priority_Dispatching.cpp + Event/EC_Priority_Scheduling.cpp Event/EC_Sched_Factory.cpp - Event/EC_Gateway_Sched.cpp + Event/EC_Sched_Filter.cpp + Event/EC_Sched_Filter_Builder.cpp } } } diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc index 4694675960a..f5e4798a71c 100644 --- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc +++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc @@ -3,6 +3,7 @@ project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, portableserv idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h dynamicflags = TAO_RT_NOTIFY_BUILD_DLL tagchecks = RT_Notify + includes += $(TAO_ROOT)/orbsvcs/orbsvcs include_dir = orbsvcs IDL_Files { @@ -15,6 +16,7 @@ project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, portableserv Notify/RT_Notify_Service.cpp Notify/RT_POA_Helper.cpp Notify/RT_Properties.cpp + Notify/Structured/RT_StructuredProxyPushSupplier.cpp } } } diff --git a/bin/MakeProjectCreator/config/kokyu.mpb b/bin/MakeProjectCreator/config/kokyu.mpb new file mode 100644 index 00000000000..e3de92f0059 --- /dev/null +++ b/bin/MakeProjectCreator/config/kokyu.mpb @@ -0,0 +1,4 @@ +project : acelib { + after += Kokyu + libs += Kokyu +} \ No newline at end of file diff --git a/bin/MakeProjectCreator/config/rtkokyuevent.mpb b/bin/MakeProjectCreator/config/rtkokyuevent.mpb new file mode 100644 index 00000000000..bdeac764121 --- /dev/null +++ b/bin/MakeProjectCreator/config/rtkokyuevent.mpb @@ -0,0 +1,4 @@ +project : rtevent, rtsched, kokyu { + after += RTKokyuEvent + libs += TAO_RTKokyuEvent +} diff --git a/bin/create_ace_build.pl b/bin/create_ace_build.pl index 0891612932e..d017bc97dc9 100755 --- a/bin/create_ace_build.pl +++ b/bin/create_ace_build.pl @@ -271,6 +271,7 @@ sub wanted { ! /^.*\.icc\z/s && ! /^.*\.icp\z/s && ! /^.*\.ncb\z/s && + ! /^.*\.opt\z/s && ! /^\.cvsignore\z/s && ! /^Makefile.*\z/s ); -- cgit v1.2.1