diff options
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosNaming.mpc | 15 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosTrading.mpc | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc | 21 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc | 19 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc | 20 |
7 files changed, 28 insertions, 98 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0e8f92083a0..08e4e9863c9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Mon Feb 28 07:21:14 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc: + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc: + Reverted: + Fri Feb 25 21:58:39 2005 J.T. Conklin <jtc@acorntoolworks.com> + + MPC's custom_only feature does not work with VC71. + + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + + Reverted: + Fri Feb 25 07:00:19 2005 J.T. Conklin <jtc@acorntoolworks.com> + + MPC's custom_only feature does not work with VC71. + Mon Feb 28 14:43:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/ORB_Constants.h: diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index e86766a3722..614cab7ba66 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -1,25 +1,14 @@ // -*- MPC -*- // $Id$ -project(CosNaming_IDL) : orbsvcslib, core { - - custom_only = 1 - - idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h - - IDL_Files { - CosNaming.idl - } -} - - project(CosNaming) : orbsvcslib, core { - after += CosNaming_IDL sharedname = TAO_CosNaming dynamicflags = TAO_NAMING_BUILD_DLL + idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h IDL_Files { + CosNaming.idl } Source_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 3fe8e934b63..86dbc908354 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(CosTrading_IDL) : orbsvcslib, core { - - custom_only = 1 +project(CosTrading) : orbsvcslib, core, utils { + sharedname = TAO_CosTrading + dynamicflags = TAO_TRADING_BUILD_DLL idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h @@ -12,16 +12,6 @@ project(CosTrading_IDL) : orbsvcslib, core { CosTradingRepos.idl CosTradingDynamic.idl } -} - - -project(CosTrading) : orbsvcslib, core, utils { - after += CosTrading_IDL - sharedname = TAO_CosTrading - dynamicflags = TAO_TRADING_BUILD_DLL - - IDL_Files { - } Source_Files { CosTradingC.cpp diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index 4e303242c63..d96bff3f1dc 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project(DsLogAdmin_IDL) : orbsvcslib, core { - - custom_only = 1 +project(DsLogAdmin) : orbsvcslib, core { + sharedname = TAO_DsLogAdmin + dynamicflags = TAO_LOG_BUILD_DLL idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h @@ -11,16 +11,6 @@ project(DsLogAdmin_IDL) : orbsvcslib, core { DsLogAdmin.idl DsLogNotification.idl } -} - - -project(DsLogAdmin) : orbsvcslib, core { - after += DsLogAdmin_IDL - sharedname = TAO_DsLogAdmin - dynamicflags = TAO_LOG_BUILD_DLL - - IDL_Files { - } Source_Files { DsLogAdminC.cpp diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc index 299aa60fc55..4f1c2eb5531 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc @@ -1,22 +1,8 @@ // $Id$ -project(*Performance_IDL): loadbalancing { - - custom_only = 1 - - IDL_Files { - Test.idl - } -} - project(*Performance_Server): loadbalancing, strategies { - after += *Performance_IDL - - IDL_Files { - } + includes += $(TAO_ROOT)/orbsvcs Source_Files { - TestC.cpp - TestS.cpp server.cpp Roundtrip.cpp ORBInitializer.cpp @@ -26,11 +12,6 @@ project(*Performance_Server): loadbalancing, strategies { } project(*Performance_Client): loadbalancing, strategies { - after += *Performance_IDL - - IDL_Files { - } - Source_Files { TestC.cpp client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc index e06d042b76c..21b9f66db74 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc @@ -1,39 +1,20 @@ // $Id$ - -project(*idl): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { - custom_only = 1 - - IDL_Files { - Test.idl - } -} - project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { - after += *idl after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - IDL_Files { - } - Source_Files { server.cpp Roundtrip.cpp - TestS.cpp - TestC.cpp } } project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { - after += *idl after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - IDL_Files { - } - Source_Files { TestC.cpp client.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc index 8481a99a045..b0f8e782677 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc @@ -1,43 +1,23 @@ // $Id$ -project(*idl): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { - custom_only = 1 - - IDL_Files { - Test.idl - } -} - project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { - after += *idl after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - IDL_Files { - } - Source_Files { server.cpp Session.cpp Session_Factory.cpp - TestS.cpp - TestC.cpp } } project(*client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba { - after += *idl after += RTEC_Perf libs += TAO_RTEC_Perf includes += ../lib $(TAO_ROOT)/orbsvcs - IDL_Files { - } - Source_Files { client.cpp Callback.cpp - TestS.cpp - TestC.cpp } } |