diff options
24 files changed, 37 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog index 6aeb4ceed90..e3c98bdb6bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon May 23 10:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/ftrtevent.mpb: + * bin/MakeProjectCreator/config/rtcorbaevent.mpb: + Use rtevent_serv as base project. These projects use some rtevent + implementation stuff so just the client side stubs are not enough. + + * bin/MakeProjectCreator/config/rteventexe.mpb: + Use rtevent_skel as base project + Mon May 23 10:24:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/rtevent_serv.mpb: diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc index c66e7a65a85..00fc51207c2 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.mpc +++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, rtevent, rtschedevent, bidir_giop { +project : orbsvcsexe, core, rtevent_serv, rtschedevent, bidir_giop { exename = Event_Service } diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 94f315339cb..dde95197d6c 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -115,7 +115,6 @@ RTEvent_Logging_Service::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); - if (1) // this->event_service_type_ == ES_OLD_REACTIVE // || this->event_service_type_ == ES_OLD_MT) { diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc index 2a2ae0447e1..90456a4dc0a 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc @@ -1,5 +1,5 @@ // $Id$ -project: namingexe, core, rteventlogadmin { +project: namingexe, core, rteventlogadmin, rtevent_serv { exename = RTEvent_Logging_Service } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc index 246f2e8cbd7..be02495ba03 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, rtevent, event, event_skel, naming { +project : orbsvcsexe, rtevent_serv, event_skel, naming { after += CosEC_RtEC_Based_lib includes += ../lib libs += CosEC_RtEC_Based diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc index 41a07f0f3b6..8d6627c4a00 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, event_skel, rtevent { +project : orbsvcslib, event_skel, rtevent_serv { sharedname = CosEC_RtEC_Based dynamicflags += TAO_RTEC_COSEC_BUILD_DLL } diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc index b14e76f4e9e..83fed7aa672 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc +++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : orbsvcsexe, rtevent, naming, rteventlogadmin { +project(*Consumer) : orbsvcsexe, rtevent_skel, naming, rteventlogadmin { exename = RTEvent_Consumer source_files { RTEvent_Consumer.cpp } } -project(*Supplier) : orbsvcsexe, rtevent, naming, rteventlogadmin { +project(*Supplier) : orbsvcsexe, rtevent_skel, naming, rteventlogadmin { exename = RTEvent_Supplier source_files { RTEvent_Supplier.cpp diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc index 4d0421d72fc..2ece2c2a38d 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc @@ -17,7 +17,7 @@ project(*Supplier): messaging, rteventexe, naming { } } -project(*): messaging, rteventexe, naming { +project(*): messaging, rteventexe, rtevent_serv, naming { requires += corba_messaging Source_Files { @@ -25,7 +25,7 @@ project(*): messaging, rteventexe, naming { } } -project(*EC): messaging, rteventexe, naming { +project(*EC): messaging, rteventexe, rtevent_serv, naming { requires += corba_messaging Source_Files { diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc index 4c3885cc624..bc413050b1a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc @@ -1,4 +1,4 @@ // $Id$ -project: orbsvcsexe, rtkokyuevent { - includes += $(TAO_ROOT)/orbsvcs $(TAO_ROOT)/orbsvcs/orbsvcs/Sched +project: orbsvcsexe, rtkokyuevent, rtevent_serv { + includes += $(TAO_ROOT)/orbsvcs/orbsvcs/Sched } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc index 4394b471fcf..ebe69a8ddbc 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc +++ b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, rtevent, rtsched { +project : orbsvcsexe, rtevent_serv, rtsched { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc index 4394b471fcf..ebe69a8ddbc 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc +++ b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, rtevent, rtsched { +project : orbsvcsexe, rtevent_serv, rtsched { } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc index 2735b33ac5d..b98ff0f88e4 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc +++ b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc @@ -1,19 +1,19 @@ // -*- MPC -*- // $Id$ -project(*Service) : orbsvcsexe, rtevent, naming { +project(*Service) : orbsvcsexe, rtevent_serv, naming { source_files { Service.cpp } } -project(*Supplier) : orbsvcsexe, rtevent, naming { +project(*Supplier) : orbsvcsexe, rtevent_skel, naming { source_files { Supplier.cpp } } -project(*Consumer) : orbsvcsexe, rtevent, naming { +project(*Consumer) : orbsvcsexe, rtevent_skel, naming { source_files { Consumer.cpp } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc index e6245d0eac1..c73d8a6a356 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc @@ -1,4 +1,5 @@ // $Id$ + project(RTEC_Perf): strategies, rtcorbaevent, minimum_corba { sharedname = TAO_RTEC_Perf idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc index ea28d588dda..d32146f4edd 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(EC_MT_Mcast): rteventexe, messaging { +project(EC_MT_Mcast): rteventexe, rtevent_serv, messaging { exename = MCast } diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc index ea3e0969fd5..76d669aa442 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(EC_Mcast): rteventexe, messaging { +project(EC_Mcast): rteventexe, rtevent_serv, messaging { exename = EC_Mcast } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc index f243a21e37a..fc410ce421e 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(EC_Multiple): rteventexe, rtevent, rtschedevent, naming, iortable, messaging { +project(EC_Multiple): rteventexe, rtevent_serv, rtschedevent, naming, iortable, messaging { exename = EC_Multiple } diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc index 7fe3c0aa853..8eff053fc67 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc +++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc @@ -21,7 +21,7 @@ project(ECT Consumer): rteventexe, rtevent, rtsched, naming, iortable, messaging } } -project(ECT Throughput): rteventexe, rtevent, rtsched, naming, iortable, messaging { +project(ECT Throughput): rteventexe, rtevent_serv, rtsched, naming, iortable, messaging { exename = ECT_Throughput Source_Files { diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb index 1162c1584ec..b1e00841286 100644 --- a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb +++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : messaging, rteventexe, naming, iortable { +project : messaging, rteventexe, rtevent_serv, naming, iortable { after += Event_Test_Lib libs += ECTests includes += ../lib diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc index ab40d9b39e5..c4f9d3da7a4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: rtevent { +project: rtevent_serv { sharedname = ECMcastTests dynamicflags = ECMCASTTESTS_BUILD_DLL Header_Files { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc index 500e75406ab..d3050e8792b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc @@ -12,7 +12,7 @@ project(*supplier): messaging, rteventexe, naming { } } -project(*consumer): messaging, rteventexe, naming { +project(*consumer): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests includes += ../Common diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc index 53bffe5851f..d5051d0f2d2 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc @@ -12,7 +12,7 @@ project(*supplier): messaging, rteventexe, naming { } } -project(*consumer): messaging, rteventexe, naming { +project(*consumer): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_Lib libs += ECMcastTests includes += ../Common diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc index 35609aefabf..4abce4c9607 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*application): messaging, rteventexe, naming { +project(*application): messaging, rteventexe, rtevent_serv, naming { after += ECMcastTests_lib libs += ECMcastTests includes += ../Common diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc index 76297795a54..b0df7a26f09 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc +++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc @@ -29,7 +29,7 @@ project(*Latency): eventperftestexe, strategies { } } -project(*Latency_Server): eventperftestexe, strategies { +project(*Latency_Server): eventperftestexe, rtevent_serv, strategies { 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 index ebbfbdeb915..1e3ca37f7fb 100644 --- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc +++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Event_Test_Lib): rtevent, naming { +project(Event_Test_Lib): rtevent_serv, naming { sharedname = ECTests dynamicflags = EC_TEST_BUILD_DLL Header_Files { |