diff options
| author | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-17 02:38:08 +0000 |
|---|---|---|
| committer | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-17 02:38:08 +0000 |
| commit | 6ee2d7126c97153ee55b154a2399a6d5923b8696 (patch) | |
| tree | 68d263d96dc77e5bd08afb17e00013333ed3519a | |
| parent | e3cd799f497e3ba0e3b75369a55be3e7761e8d7a (diff) | |
| download | ATCD-6ee2d7126c97153ee55b154a2399a6d5923b8696.tar.gz | |
Mon Apr 17 02:33:44 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc | 2 | ||||
| -rw-r--r-- | TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 4386196a112..ede854e562f 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Apr 17 02:33:44 UTC 2006 Wallace Zhang <zhangw@ociweb.com> + + * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc: + * tools/Config_Handlers/Config_Handlers.mpc: + + Avoids building with ace_for_tao. + Fri Apr 14 14:50:47 UTC 2006 Wallace Zhang <zhangw@ociweb.com> * examples/BasicSP/BMClosedED/BMClosedED.mpc: diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc index 8e69a6d96a7..76bcf38962f 100644 --- a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc +++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc @@ -3,6 +3,7 @@ // This file is generated with "generate_component_mpc.pl -p Planner_Interface SimpleBinPacker" project(SimpleBinPacker_stub): ciao_deployment_stub { + avoids += ace_for_tao after += Planner_Interface_stub Planner_stub sharedname = SimpleBinPacker_stub idlflags += -Sc \ @@ -76,6 +77,7 @@ project(SimpleBinPacker_svnt) : ciao_servant_dnc { project(SimpleBinPacker_exec) : ciao_component_dnc { + avoids += ace_for_tao after += SimpleBinPacker_svnt sharedname = SimpleBinPacker_exec libs += SimpleBinPacker_stub \ diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc index 4c65199b147..6dc6a7c23d3 100644 --- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc +++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc @@ -1,6 +1,7 @@ //$Id$ project (XSC_XML_Handlers) : acelib, xerces { + avoids += ace_for_tao verbatim(gnuace, macros) { override no_hidden_visibility = 1 @@ -31,6 +32,7 @@ project (XSC_XML_Handlers) : acelib, xerces { } project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory { + avoids += ace_for_tao verbatim(gnuace, macros) { override no_hidden_visibility = 1 @@ -90,6 +92,7 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typeco } project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client { + avoids += ace_for_tao requires += dummy_label includes += $(CIAO_ROOT)/tools/Config_Handlers exename = test |