diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2002-08-25 04:54:50 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2002-08-25 04:54:50 +0000 |
| commit | 53023148751229987bbb82082a7e4611ac29facc (patch) | |
| tree | d92338b811ca0b85b8222741c499e6d921e8d45e | |
| parent | f5db345a0399bd329edc7185fb800a64f6200b23 (diff) | |
| download | ATCD-53023148751229987bbb82082a7e4611ac29facc.tar.gz | |
ChangeLogTag:Sat Aug 24 22:47:22 2002 Christopher Kohlhoff <chris@kohlhoff.com>
58 files changed, 374 insertions, 276 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0bf59b78c88..4af94322c6b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,73 @@ +Sat Aug 24 22:47:22 2002 Christopher Kohlhoff <chris@kohlhoff.com> + + * examples/POA/Loader/Servant_Activator.cpp: + * examples/POA/Loader/Servant_Locator.cpp: + * examples/POA/On_Demand_Loading/Servant_Manager.cpp: + + The explicit call to ACE::ldname() is no longer required since + it will be automatically done by the ACE_DLL_Manager. This + should fix these tests for Borland C++. + + * TAO_IDL/tao_idl.mpc: + * orbsvcs/Concurrency_Service/Concurrency_Service.mpc: + * orbsvcs/CosEvent_Service/CosEvent_Service.mpc: + * orbsvcs/Dump_Schedule/Dump_Schedule.mpc: + * orbsvcs/Event_Service/Event_Service.mpc: + * orbsvcs/IFR_Service/IFR_Service.mpc: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc: + * orbsvcs/LoadBalancer/LoadBalancer.mpc: + * orbsvcs/Logging_Service/Logging_Service.mpc: + * orbsvcs/Naming_Service/Naming_Service.mpc: + * orbsvcs/Notify_Service/Notify_Service.mpc: + * orbsvcs/Scheduling_Service/Scheduling_Service.mpc: + * orbsvcs/TAO_Service/TAO_Service.mpc: + * orbsvcs/Time_Service/Time_Service.mpc: + * orbsvcs/Trading_Service/Trading_Service.mpc: + + Added "core" as a base project. + + * orbsvcs/orbsvcs/AV.mpc: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLifeCycle.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/CosTime.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + * orbsvcs/orbsvcs/ETCL.mpc: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance.mpc: + * orbsvcs/orbsvcs/IFRService.mpc: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/RTCORBAEvent.mpc: + * orbsvcs/orbsvcs/RTEvent.mpc: + * orbsvcs/orbsvcs/RTOLDEvent.mpc: + * orbsvcs/orbsvcs/RTSched.mpc: + * orbsvcs/orbsvcs/RTSchedEvent.mpc: + * orbsvcs/orbsvcs/SSLIOP.mpc: + * orbsvcs/orbsvcs/Security.mpc: + * orbsvcs/orbsvcs/Svc_Utils.mpc: + * tao/tao.mpc: + * tao/BiDir_GIOP/BiDir_GIOP.mpc: + * tao/Domain/Domain.mpc: + * tao/DynamicAny/DynamicAny.mpc: + * tao/DynamicInterface/DynamicInterface.mpc: + * tao/IFR_Client/IFR_Client.mpc: + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/Messaging/Messaging.mpc: + * tao/PortableServer/PortableServer.mpc: + * tao/RTCORBA/RTCORBA.mpc: + * tao/RTPortableServer/RTPortableServer.mpc: + * tao/SmartProxies/SmartProxies.mpc: + * tao/Strategies/Strategies.mpc: + * tao/TypeCodeFactory/TypeCodeFactory.mpc: + + Added "core" as a base project and added "include_dir" value. + Sat Aug 24 16:17:46 2002 Ossama Othman <ossama@uci.edu> * TAOACE_Static.dsw: diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 5dd16df6998..babd8913bf6 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -1,4 +1,4 @@ -project(TAO_IDL_EXE) : aceexe, taoversion { +project(TAO_IDL_EXE) : aceexe, taoversion, core { exename = tao_idl libs += TAO_IDL_BE TAO_IDL_FE includes += include be_include fe @@ -20,7 +20,7 @@ project(TAO_IDL_EXE) : aceexe, taoversion { } -project(TAO_IDL_BE) : acelib, taoversion { +project(TAO_IDL_BE) : acelib, taoversion, core { sharedname = TAO_IDL_BE libs += TAO_IDL_FE includes += include be_include fe @@ -38,7 +38,7 @@ project(TAO_IDL_BE) : acelib, taoversion { } -project(TAO_IDL_FE) : acelib, taoversion { +project(TAO_IDL_FE) : acelib, taoversion, core { sharedname = TAO_IDL_FE includes += include fe dllflags = TAO_IDL_FE_BUILD_DLL diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index a6435b611ba..f3ad061d3e3 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -43,20 +43,16 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - char *function_name = ACE::ldname (factory_function); - void *symbol = this->dll_.symbol (function_name); + void *symbol = this->dll_.symbol (factory_function); long function = ACE_reinterpret_cast (long, symbol); - delete [] function_name; servant_supplier_ = ACE_reinterpret_cast (SERVANT_FACTORY, function); // Obtain the symbol for the function which will destroy the // servant. - function_name = ACE::ldname (garbage_collection_function); - symbol = this->dll_.symbol (function_name); + symbol = this->dll_.symbol (garbage_collection_function); function = ACE_reinterpret_cast (long, symbol); - delete [] function_name; servant_garbage_collector_ = ACE_reinterpret_cast (SERVANT_GARBAGE_COLLECTOR, function); } diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index cf72efd2b92..66186a1a5b1 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -45,20 +45,16 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. // - char *function_name = ACE::ldname (factory_function); - void *symbol = this->dll_.symbol (function_name); + void *symbol = this->dll_.symbol (factory_function); long function = ACE_reinterpret_cast (long, symbol); - delete [] function_name; servant_supplier_ = ACE_reinterpret_cast (SERVANT_FACTORY, function); // Obtain the symbol for the function which will destroy the // servant. - function_name = ACE::ldname (garbage_collection_function); - symbol = this->dll_.symbol (function_name); + symbol = this->dll_.symbol (garbage_collection_function); function = ACE_reinterpret_cast (long, symbol); - delete [] function_name; servant_garbage_collector_ = ACE_reinterpret_cast (SERVANT_GARBAGE_COLLECTOR, function); diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index 28079c137f7..cf52475b7fd 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -80,10 +80,8 @@ ServantManager_i::obtain_servant (const char *str, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - char *function_name = ACE::ldname (create_symbol_.c_str()); - void *symbol = dll->symbol (function_name); + void *symbol = dll->symbol (create_symbol_.c_str ()); long function = ACE_reinterpret_cast (long, symbol); - delete [] function_name; SERVANT_FACTORY servant_creator = ACE_reinterpret_cast (SERVANT_FACTORY, function); diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 608a99654d8..79ffb823596 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer exename = Concurrency_Service 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 e3471507bf6..8dd4688f890 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { 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 diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc index 16641c37460..550115780ab 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { depends += RTSched CosNaming Svc_Utils IORTable PortableServer exename = Dump_Schedule 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 93d25edba83..c7a982c0bde 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.mpc +++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { 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 diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index 2d69e543bb7..ab40ed35f5f 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -1,4 +1,4 @@ -project(IFR_Service) : orbsvcsexe { +project(IFR_Service) : orbsvcsexe, core { 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 @@ -10,7 +10,7 @@ project(IFR_Service) : orbsvcsexe { } -project(TAO_IFR_BE) : taolib { +project(TAO_IFR_BE) : taolib, core { depends += TAO_IDL_FE TAO_IFR_Client sharedname = TAO_IFR_BE libs += TAO_IDL_FE TAO_IFR_Client TAO @@ -30,7 +30,7 @@ project(TAO_IFR_BE) : taolib { } -project(TAO_IFR_EXE) : taoexe { +project(TAO_IFR_EXE) : taoexe, core { depends += TAO_IFR_BE IFR_Client TAO_IDL_FE exename = tao_ifr idlpreprocessor = 1 diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index cfd08343826..c119a9cee7d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { depends += Svc_Utils IORTable PortableServer exename = ImplRepo_Service libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer @@ -16,7 +16,7 @@ project : orbsvcsexe { } -project(tao_imr) : orbsvcsexe { +project(tao_imr) : orbsvcsexe, core { depends += Svc_Utils IORTable PortableServer exename = tao_imr libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index b1eb9fbd2df..c3a6a84cfbb 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { 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 diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc index 85fc4e500f8..ab5877bf7a6 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc @@ -1,4 +1,4 @@ -project(CosLoadManager): namingexe, messaging { +project(CosLoadManager): namingexe, messaging, core { libs += TAO_CosLoadBalancing TAO_PortableGroup depends += LoadBalancing PortableGroup requires += ami interceptors @@ -11,7 +11,7 @@ project(CosLoadManager): namingexe, messaging { } } -project(CosLoadMonitor): namingexe, messaging { +project(CosLoadMonitor): namingexe, messaging, core { libs += TAO_CosLoadBalancing TAO_PortableGroup depends += LoadBalancing PortableGroup requires += ami interceptors diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Logging_Service.mpc index a0a206d9cfd..b7ed570ae19 100644 --- a/TAO/orbsvcs/Logging_Service/Logging_Service.mpc +++ b/TAO/orbsvcs/Logging_Service/Logging_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { 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 diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc index 2774265f594..f3dece5e2f6 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { depends += CosNaming Svc_Utils IORTable PortableServer exename = Naming_Service libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer @@ -9,7 +9,7 @@ project : orbsvcsexe { } } -project(NT_Naming_Service) : orbsvcsexe { +project(NT_Naming_Service) : orbsvcsexe, core { depends += CosNaming Svc_Utils IORTable PortableServer exename = NT_Naming_Service libs += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc index af3304d24b4..2fab5e15927 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { 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 diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc index 5e5f2f2469c..6e816f4f08d 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { depends += RTSched CosNaming Svc_Utils IORTable PortableServer exename = Scheduling_Service libs += TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc index 23313a526da..2bfb7e8fd99 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc @@ -1,3 +1,3 @@ -project : taoexe { +project : taoexe, core { exename = TAO_Service -}
\ No newline at end of file +} diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc index 5d5b8cdaa1d..1d0ca163b3f 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service.mpc +++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc @@ -1,4 +1,4 @@ -project(Time_Service_Server) : orbsvcsexe { +project(Time_Service_Server) : orbsvcsexe, core { depends += CosTime CosNaming Svc_Utils IORTable PortableServer exename = Time_Service_Server libs += TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer @@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe { } } -project(Time_Service_Clerk) : orbsvcsexe { +project(Time_Service_Clerk) : orbsvcsexe, core { depends += CosTime CosNaming Svc_Utils IORTable PortableServer exename = Time_Service_Clerk libs += TAO_CosTime TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc index 52497b4a875..437b62eae49 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc @@ -1,4 +1,4 @@ -project : orbsvcsexe { +project : orbsvcsexe, core { 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 diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index 87468ac4ae0..2589d9ced0f 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -1,10 +1,11 @@ -project(AV) : orbsvcslib { - depends += CosProperty CosNaming Svc_Utils PortableServer - sharedname = TAO_AV - libs += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h - dllflags = TAO_AV_BUILD_DLL - tagchecks = AV +project(AV) : orbsvcslib, core { + depends += CosProperty CosNaming Svc_Utils PortableServer + sharedname = TAO_AV + libs += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h + dllflags = TAO_AV_BUILD_DLL + tagchecks = AV + include_dir = orbsvcs IDL_Files { AVStreams.idl diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 3c1d82fd977..de1c3d49fdf 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -1,10 +1,11 @@ -project(CosConcurrency) : orbsvcslib { - depends += PortableServer - sharedname = TAO_CosConcurrency - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h - dllflags = TAO_CONCURRENCY_BUILD_DLL - tagchecks = Concurrency +project(CosConcurrency) : orbsvcslib, core { + depends += PortableServer + sharedname = TAO_CosConcurrency + libs += TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h + dllflags = TAO_CONCURRENCY_BUILD_DLL + tagchecks = Concurrency + include_dir = orbsvcs IDL_Files { CosConcurrencyControl.idl diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index 6baf99f3d09..0631d10f610 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -1,10 +1,11 @@ -project(CosEvent) : orbsvcslib { - depends += CosNaming Svc_Utils PortableServer - sharedname = TAO_CosEvent - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h - dllflags = TAO_EVENT_BUILD_DLL - tagchecks = CosEvent +project(CosEvent) : orbsvcslib, core { + depends += CosNaming Svc_Utils PortableServer + sharedname = TAO_CosEvent + libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h + dllflags = TAO_EVENT_BUILD_DLL + tagchecks = CosEvent + include_dir = orbsvcs IDL_Files { CosEventComm.idl diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index 4ef4392e10d..3f2eb39b502 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -1,10 +1,11 @@ -project(CosLifeCycle) : orbsvcslib { - depends += CosNaming Svc_Utils PortableServer - sharedname = TAO_CosLifeCycle - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h - dllflags = TAO_LIFECYCLE_BUILD_DLL - tagchecks = LifeCycle +project(CosLifeCycle) : orbsvcslib, core { + depends += CosNaming Svc_Utils PortableServer + sharedname = TAO_CosLifeCycle + libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h + dllflags = TAO_LIFECYCLE_BUILD_DLL + tagchecks = LifeCycle + include_dir = orbsvcs IDL_Files { CosLifeCycle.idl diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index ba3b9832eb1..967de0866c1 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,10 +1,11 @@ -project(CosNaming) : orbsvcslib { - depends += Svc_Utils IORTable PortableServer - sharedname = TAO_CosNaming - libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h - dllflags = TAO_NAMING_BUILD_DLL - tagchecks = Naming +project(CosNaming) : orbsvcslib, core { + depends += Svc_Utils IORTable PortableServer + sharedname = TAO_CosNaming + libs += TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h + dllflags = TAO_NAMING_BUILD_DLL + tagchecks = Naming + include_dir = orbsvcs IDL_Files { CosNaming.idl diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index bf21f0a838a..8e6b5577fef 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -1,10 +1,11 @@ -project(CosNotification) : orbsvcslib { - depends += Svc_Utils ETCL DynamicAny PortableServer - sharedname = TAO_CosNotification - libs += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h - dllflags = TAO_NOTIFY_BUILD_DLL - tagchecks = Notify +project(CosNotification) : orbsvcslib, core { + depends += Svc_Utils ETCL DynamicAny PortableServer + sharedname = TAO_CosNotification + libs += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h + dllflags = TAO_NOTIFY_BUILD_DLL + tagchecks = Notify + include_dir = orbsvcs IDL_Files { CosEventComm.idl diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index 9d6d3f9aafa..5cc94b7cc35 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -1,10 +1,11 @@ -project(CosProperty) : orbsvcslib { - depends += PortableServer - sharedname = TAO_CosProperty - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h - dllflags = TAO_PROPERTY_BUILD_DLL - tagchecks = Property +project(CosProperty) : orbsvcslib, core { + depends += PortableServer + sharedname = TAO_CosProperty + libs += TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h + dllflags = TAO_PROPERTY_BUILD_DLL + tagchecks = Property + include_dir = orbsvcs IDL_Files { CosPropertyService.idl diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 55716d3e0b4..d04b09d4245 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -1,10 +1,11 @@ -project(CosTime) : orbsvcslib { - depends += PortableServer - sharedname = TAO_CosTime - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h - dllflags = TAO_TIME_BUILD_DLL - tagchecks = Time +project(CosTime) : orbsvcslib, core { + depends += PortableServer + sharedname = TAO_CosTime + libs += TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h + dllflags = TAO_TIME_BUILD_DLL + tagchecks = Time + include_dir = orbsvcs IDL_Files { TimeService.idl diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 962a47da1e7..3de89113354 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,10 +1,11 @@ -project(CosTrading) : orbsvcslib { - depends += CosNaming Svc_Utils DynamicAny PortableServer - sharedname = TAO_CosTrading - libs += TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h - dllflags = TAO_TRADING_BUILD_DLL - tagchecks = Trader +project(CosTrading) : orbsvcslib, core { + depends += CosNaming Svc_Utils DynamicAny PortableServer + sharedname = TAO_CosTrading + libs += TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h + dllflags = TAO_TRADING_BUILD_DLL + tagchecks = Trader + include_dir = orbsvcs IDL_Files { CosTrading.idl diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index c687b4c5ee3..cb5a5001f3c 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,10 +1,11 @@ -project(DsLogAdmin) : orbsvcslib { - depends += CosTrading Svc_Utils PortableServer - sharedname = TAO_DsLogAdmin - libs += TAO_CosTrading TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h - dllflags = TAO_LOG_BUILD_DLL - tagchecks = Log +project(DsLogAdmin) : orbsvcslib, core { + depends += CosTrading Svc_Utils PortableServer + sharedname = TAO_DsLogAdmin + libs += TAO_CosTrading TAO_Svc_Utils TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h + dllflags = TAO_LOG_BUILD_DLL + tagchecks = Log + include_dir = orbsvcs IDL_Files { DsLogAdmin.idl diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc index ad850cbf3dc..d1e7f9b8887 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL.mpc +++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc @@ -1,8 +1,9 @@ -project(ETCL) : orbsvcslib { - sharedname = TAO_ETCL - libs += TAO - dllflags = TAO_ETCL_BUILD_DLL - tagchecks = Notify +project(ETCL) : orbsvcslib, core { + sharedname = TAO_ETCL + libs += TAO + dllflags = TAO_ETCL_BUILD_DLL + tagchecks = Notify + include_dir = orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 36004fc8379..69de559de00 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,10 +1,11 @@ -project(FTORB) : orbsvcslib { - depends += IORManipulation PortableServer - sharedname = TAO_FTORB - libs += TAO_IORManip TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h - dllflags = TAO_FT_BUILD_DLL - tagchecks = FTORB +project(FTORB) : orbsvcslib, core { + depends += IORManipulation PortableServer + sharedname = TAO_FTORB + libs += TAO_IORManip TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h + dllflags = TAO_FT_BUILD_DLL + tagchecks = FTORB + include_dir = orbsvcs IDL_Files { FT_CORBA_ORB.idl diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc index 443fa59246f..9a9431e623c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc @@ -1,10 +1,11 @@ -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 - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h - dllflags = TAO_FT_BUILD_DLL - tagchecks = FaultTolerance +project(FaultTolerance) : orbsvcslib, core { + 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 + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h + dllflags = TAO_FT_BUILD_DLL + tagchecks = FaultTolerance + include_dir = orbsvcs IDL_Files { FT_CORBA.idl diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 16609d00e56..64380a89e69 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,9 +1,10 @@ -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 - dllflags = TAO_IFRSERVICE_BUILD_DLL - tagchecks = IFRService +project(IFRService) : orbsvcslib, core { + 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 + dllflags = TAO_IFRSERVICE_BUILD_DLL + tagchecks = IFRService + include_dir = orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index e57d2d3a1c7..bc11732f630 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,10 +1,11 @@ -project(PortableGroup) : orbsvcslib { - depends += CosNaming Svc_Utils PortableServer - sharedname = TAO_PortableGroup - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h - dllflags = TAO_PORTABLEGROUP_BUILD_DLL - tagchecks = PortableGroup +project(PortableGroup) : orbsvcslib, core { + depends += CosNaming Svc_Utils PortableServer + sharedname = TAO_PortableGroup + libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h + dllflags = TAO_PORTABLEGROUP_BUILD_DLL + tagchecks = PortableGroup + include_dir = orbsvcs IDL_Files { miop.idl diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc index 33394200b25..e2298f794f8 100644 --- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc @@ -1,10 +1,11 @@ -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 - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h - dllflags = TAO_RTCORBAEVENT_BUILD_DLL - tagchecks = RTCORBAEvent +project(RTCORBAEvent) : orbsvcslib, core { + 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 + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h + dllflags = TAO_RTCORBAEVENT_BUILD_DLL + tagchecks = RTCORBAEvent + include_dir = orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc index 299479c2a71..8e34f71bbef 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc @@ -1,10 +1,11 @@ -project(RTEvent) : orbsvcslib { - depends += Svc_Utils Messaging PortableServer - sharedname = TAO_RTEvent - libs += TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h - dllflags = TAO_RTEVENT_BUILD_DLL - tagchecks = RTEvent +project(RTEvent) : orbsvcslib, core { + depends += Svc_Utils Messaging PortableServer + sharedname = TAO_RTEvent + libs += TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h + dllflags = TAO_RTEVENT_BUILD_DLL + tagchecks = RTEvent + include_dir = orbsvcs IDL_Files { RtecDefaultEventData.idl diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc index b834592a43e..499ab087191 100644 --- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc @@ -1,9 +1,10 @@ -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 - dllflags = TAO_RTOLDEVENT_BUILD_DLL - tagchecks = RTOLDEvent +project(RTOLDEvent) : orbsvcslib, core { + depends += RTEvent RTSched CosNaming Svc_Utils PortableServer + sharedname = TAO_RTOLDEvent + libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + dllflags = TAO_RTOLDEVENT_BUILD_DLL + tagchecks = RTOLDEvent + include_dir = orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc index 1e8aa0a2244..bbb248c8e8a 100644 --- a/TAO/orbsvcs/orbsvcs/RTSched.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc @@ -1,10 +1,11 @@ -project(RTSched) : orbsvcslib { - depends += CosNaming TAO_Svc_Utils PortableServer - sharedname = TAO_RTSched - libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h - dllflags = TAO_RTSCHED_BUILD_DLL - tagchecks = Sched +project(RTSched) : orbsvcslib, core { + depends += CosNaming TAO_Svc_Utils PortableServer + sharedname = TAO_RTSched + libs += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h + dllflags = TAO_RTSCHED_BUILD_DLL + tagchecks = Sched + include_dir = orbsvcs IDL_Files { RtecScheduler.idl diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc index bef5adaf422..791302737f3 100644 --- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc @@ -1,9 +1,10 @@ -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 - dllflags = TAO_RTSCHEDEVENT_BUILD_DLL - tagchecks = RTSchedEvent +project(RTSchedEvent) : orbsvcslib, core { + depends += RTEvent RTSched CosNaming Svc_Utils PortableServer + sharedname = TAO_RTSchedEvent + libs += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO + dllflags = TAO_RTSCHEDEVENT_BUILD_DLL + tagchecks = RTSchedEvent + include_dir = orbsvcs IDL_Files { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index fcd975735d1..4d310ef1037 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -1,11 +1,12 @@ -project(SSLIOP) : orbsvcslib { - ssl = 1 - depends += Security PortableServer SSL - sharedname = TAO_SSLIOP - libs += TAO_Security TAO_PortableServer TAO ACE_SSL - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h - dllflags = TAO_SSLIOP_BUILD_DLL - tagchecks = SSLIOP +project(SSLIOP) : orbsvcslib, core { + ssl = 1 + depends += Security PortableServer SSL + sharedname = TAO_SSLIOP + libs += TAO_Security TAO_PortableServer TAO ACE_SSL + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h + dllflags = TAO_SSLIOP_BUILD_DLL + tagchecks = SSLIOP + include_dir = orbsvcs IDL_Files { SSLIOP.idl diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 2480bb0b6a6..958a29334de 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,10 +1,11 @@ -project(Security) : orbsvcslib { - depends += PortableServer - sharedname = TAO_Security - libs += TAO_PortableServer TAO - idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h - dllflags = TAO_SECURITY_BUILD_DLL - tagchecks = Security +project(Security) : orbsvcslib, core { + depends += PortableServer + sharedname = TAO_Security + libs += TAO_PortableServer TAO + idlflags += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h + dllflags = TAO_SECURITY_BUILD_DLL + tagchecks = Security + include_dir = orbsvcs IDL_Files { Security.idl diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 4c29ef0f10f..137103f68fa 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,9 +1,10 @@ -project(Svc_Utils) : orbsvcslib { - depends += PortableServer - sharedname = TAO_Svc_Utils - 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 +project(Svc_Utils) : orbsvcslib, core { + depends += PortableServer + sharedname = TAO_Svc_Utils + 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 + include_dir = orbsvcs IDL_Files { TimeBase.idl diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index ce8016a96b3..ac481e6a418 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_BiDirGIOP - libs += TAO - dllflags = TAO_BIDIRGIOP_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_BiDirGIOP + libs += TAO + dllflags = TAO_BIDIRGIOP_BUILD_DLL + libout = .. + include_dir = tao/BiDir_GIOP } diff --git a/TAO/tao/Domain/Domain.mpc b/TAO/tao/Domain/Domain.mpc index 85044e3384e..10e40ec91d9 100644 --- a/TAO/tao/Domain/Domain.mpc +++ b/TAO/tao/Domain/Domain.mpc @@ -1,7 +1,8 @@ -project : taolib { - depends += IFR_Client PortableServer - sharedname = TAO_Domain - libs += TAO_IFR_Client TAO_PortableServer TAO - dllflags = TAO_DOMAIN_BUILD_DLL - libout = .. +project : taolib, core { + depends += IFR_Client PortableServer + sharedname = TAO_Domain + libs += TAO_IFR_Client TAO_PortableServer TAO + dllflags = TAO_DOMAIN_BUILD_DLL + libout = .. + include_dir = tao/Domain } diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index 40f7dca844c..aa1ce364cc7 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_DynamicAny - libs += TAO - dllflags = TAO_DYNAMICANY_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_DynamicAny + libs += TAO + dllflags = TAO_DYNAMICANY_BUILD_DLL + libout = .. + include_dir = tao/DynamicAny } diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc index f6c9de427b9..7c4657100ce 100644 --- a/TAO/tao/DynamicInterface/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_DynamicInterface - libs += TAO - dllflags = TAO_DYNAMICINTERFACE_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_DynamicInterface + libs += TAO TAO_PortableServer + dllflags = TAO_DYNAMICINTERFACE_BUILD_DLL + libout = .. + include_dir = tao/DynamicInterface } diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc index 03478066c0d..98e30f1fad3 100644 --- a/TAO/tao/IFR_Client/IFR_Client.mpc +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_IFR_Client - libs += TAO - dllflags = TAO_IFR_CLIENT_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_IFR_Client + libs += TAO + dllflags = TAO_IFR_CLIENT_BUILD_DLL + libout = .. + include_dir = tao/IFR_Client } diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 29e75d698af..9802365e3d8 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_IORManip - libs += TAO - dllflags = TAO_IORMANIP_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_IORManip + libs += TAO + dllflags = TAO_IORMANIP_BUILD_DLL + libout = .. + include_dir = tao/IORManipulation } diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index 24ca8803bfa..3d3f878d6a2 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_IORTable - libs += TAO - dllflags = TAO_IORTABLE_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_IORTable + libs += TAO + dllflags = TAO_IORTABLE_BUILD_DLL + libout = .. + include_dir = tao/IORTable } diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 99f4a6a7eaf..64f1f8e1221 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -1,7 +1,8 @@ -project : taolib { - depends += PortableServer - sharedname = TAO_Messaging - libs += TAO_PortableServer TAO - dllflags = TAO_MESSAGING_BUILD_DLL - libout = .. +project : taolib, core { + depends += PortableServer + sharedname = TAO_Messaging + libs += TAO_PortableServer TAO + dllflags = TAO_MESSAGING_BUILD_DLL + libout = .. + include_dir = tao/Messaging } diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc index 378a4485cf7..f683c12037a 100644 --- a/TAO/tao/PortableServer/PortableServer.mpc +++ b/TAO/tao/PortableServer/PortableServer.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_PortableServer - libs += TAO - dllflags = TAO_PORTABLESERVER_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_PortableServer + libs += TAO + dllflags = TAO_PORTABLESERVER_BUILD_DLL + libout = .. + include_dir = tao/PortableServer } diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc index d6f4a8cb2b5..aa53a5a3cf6 100644 --- a/TAO/tao/RTCORBA/RTCORBA.mpc +++ b/TAO/tao/RTCORBA/RTCORBA.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_RTCORBA - libs += TAO - dllflags = TAO_RTCORBA_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_RTCORBA + libs += TAO + dllflags = TAO_RTCORBA_BUILD_DLL + libout = .. + include_dir = tao/RTCORBA } diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc index 214b21999ff..c2d863299bd 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc @@ -1,7 +1,8 @@ -project : taolib { - depends += RTCORBA PortableServer - sharedname = TAO_RTPortableServer - libs += TAO_RTCORBA TAO_PortableServer TAO - dllflags = TAO_RTPORTABLESERVER_BUILD_DLL - libout = .. +project : taolib, core { + depends += RTCORBA PortableServer + sharedname = TAO_RTPortableServer + libs += TAO_RTCORBA TAO_PortableServer TAO + dllflags = TAO_RTPORTABLESERVER_BUILD_DLL + libout = .. + include_dir = tao/RTPortableServer } diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc index 967a78f1004..ef3ee2e706d 100644 --- a/TAO/tao/SmartProxies/SmartProxies.mpc +++ b/TAO/tao/SmartProxies/SmartProxies.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_SmartProxies - libs += TAO - dllflags = TAO_SMARTPROXIES_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_SmartProxies + libs += TAO + dllflags = TAO_SMARTPROXIES_BUILD_DLL + libout = .. + include_dir = tao/SmartProxies } diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index c27a62a1b99..cd50b4873da 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -1,6 +1,7 @@ -project : taolib { - sharedname = TAO_Strategies - libs += TAO - dllflags = TAO_STRATEGIES_BUILD_DLL - libout = .. +project : taolib, core { + sharedname = TAO_Strategies + libs += TAO + dllflags = TAO_STRATEGIES_BUILD_DLL + libout = .. + include_dir = tao/Strategies } diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 6a635f14c3a..9212d9db4bb 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -1,7 +1,8 @@ -project : taolib { - depends += IFR_Client - sharedname = TAO_TypeCodeFactory - libs += TAO_IFR_Client TAO - dllflags = TAO_TYPECODEFACTORY_BUILD_DLL - libout = .. +project : taolib, core { + depends += IFR_Client + sharedname = TAO_TypeCodeFactory + libs += TAO_IFR_Client TAO + dllflags = TAO_TYPECODEFACTORY_BUILD_DLL + libout = .. + include_dir = tao/TypeCodeFactory } diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 42b32fd1fae..ec88d1f82ed 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -1,9 +1,10 @@ -project : acelib, taoversion { - tao = 1 - includes += $(TAO_ROOT) $(TAO_ROOT)/tao - sharedname = TAO - libflags += TAO_AS_STATIC_LIBS - dllflags = TAO_BUILD_DLL +project : acelib, taoversion, core { + tao = 1 + includes += $(TAO_ROOT) $(TAO_ROOT)/tao + sharedname = TAO + libflags += TAO_AS_STATIC_LIBS + dllflags = TAO_BUILD_DLL + include_dir = tao // Override the defaults due to the // existence of orb.idl |