Fri Apr 14 14:50:47 UTC 2006 Wallace Zhang <zhangw@ociweb.com>

10 files changed, 59 insertions, 11 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index c4d501a9706..4386196a112 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Fri Apr 14 14:50:47 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * examples/BasicSP/BMClosedED/BMClosedED.mpc:
+        * examples/BasicSP/BMDisplay/BMDisplay.mpc:
+        * examples/Display/GPS/GPS.mpc:
+        * examples/Display/RateGen/RateGen.mpc:
+        * examples/Hello/Sender/Sender.mpc:
+        * examples/Swapping/Sender/Sender.mpc:
+        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc:
+        * tests/CIDL/CodeGen/CodeGen.mpc:
+        * tests/Minimum/Receiver/Receiver.mpc:
+
+          Avoids building with ace_for_tao.
+
 Thu Apr 13 19:18:22 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * docs/tutorials/Quoter/Simple/Broker/Broker.mpc:
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 652dab2f7a3..d08061594a0 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -3,6 +3,7 @@
 // This file has been manually modified to add a second component implementation.
 
 project(BMClosedED_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
 
@@ -25,6 +26,7 @@ project(BMClosedED_DnC_stub): ciao_client_dnc {
 }
 
 project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_svnt BMClosedED_DnC_stub
 
   sharedname = BMClosedED_svnt
@@ -56,6 +58,7 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMClosedED_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after      += BMClosedED_DnC_svnt
 
   sharedname = BMClosedED_exec
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 5a28ed1b783..35e0c3196f0 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay"
 
 project(BMDisplay_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
   sharedname = BMDisplay_stub
@@ -24,6 +25,7 @@ project(BMDisplay_DnC_stub): ciao_client_dnc {
 }
 
 project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_svnt BMDisplay_DnC_stub
 
   sharedname  = BMDisplay_svnt
@@ -54,6 +56,7 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMDisplay_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after += BMDisplay_DnC_svnt
 
   sharedname = BMDisplay_exec
diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index 9722a2747b9..179370dc95b 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p HUDisplay GPS"
 
 project(GPS_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = GPS_DnC_stub
   idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
@@ -19,6 +20,7 @@ project(GPS_DnC_stub): ciao_client_dnc {
 }
 
 project(GPS_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += GPS_DnC_svnt GPS_DnC_stub HUDisplay_DnC_svnt
   sharedname  = GPS_DnC_svnt
   libs    += GPS_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -43,6 +45,7 @@ project(GPS_DnC_svnt) : ciao_servant_dnc {
 
 
 project(GPS_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += GPS_DnC_svnt
   sharedname = GPS_DnC_exec
   libs      += GPS_DnC_stub GPS_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
index d063453a020..5cdab590983 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p HUDisplay RateGen"
 
 project(RateGen_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = RateGen_DnC_stub
   idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
@@ -17,6 +18,7 @@ project(RateGen_DnC_stub): ciao_client_dnc {
 }
 
 project(RateGen_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_svnt RateGen_DnC_stub
   sharedname  = RateGen_DnC_svnt
   libs    += RateGen_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -41,6 +43,7 @@ project(RateGen_DnC_svnt) : ciao_servant_dnc {
 
 
 project(RateGen_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += RateGen_DnC_svnt
   sharedname = RateGen_DnC_exec
   libs      += RateGen_DnC_stub RateGen_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -60,19 +63,20 @@ project(RateGen_DnC_exec) : ciao_component_dnc {
 
 
 
-   project (RateGen_DnC_controller) : ciao_client_dnc, valuetype {
-   exename = controller
-   after += RateGen_DnC_stub
-  libs += RateGen_DnC_stub HUDisplay_DnC_stub
-   libpaths += ..
+project (RateGen_DnC_controller) : ciao_client_dnc, valuetype {
+  avoids += ace_for_tao
+    exename = controller
+    after += RateGen_DnC_stub
+    libs += RateGen_DnC_stub HUDisplay_DnC_stub
+    libpaths += ..
 
-   IDL_Files {
-			        }
+    IDL_Files {
+    }
 
   Source_Files {
-      controller.cpp
-        }
+    controller.cpp
+  }
 }
-					
+
 
 
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 45b4dd2db78..0b4473033c8 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
 project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Sender_DnC_stub
   idlflags += -Sc \
@@ -30,6 +31,7 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
 }
 
 project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_svnt \
            Hello_Base_Sender_DnC_stub
   sharedname  = Sender_DnC_svnt
@@ -69,6 +71,7 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
 }
 
 project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += Hello_Base_Sender_DnC_svnt
   sharedname = Sender_DnC_exec
   libs      += Sender_DnC_stub \
@@ -94,6 +97,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
 }
 
 project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
+  avoids += ace_for_tao
   exename = starter
   after += Hello_Base_Sender_DnC_stub
   libs += Sender_DnC_stub Hello_Base_DnC_stub
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
index e58bb9438cc..d0d42c7c8bc 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
 project(HelloB_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_stub
   sharedname = Sender_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
@@ -19,6 +20,7 @@ project(HelloB_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
 }
 
 project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_svnt \
            HelloB_Sender_DnC_Upgradeable_stub
   sharedname  = Sender_DnC_Upgradeable_svnt
@@ -46,6 +48,7 @@ project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
 }
 
 project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += HelloB_Sender_DnC_Upgradeable_svnt
   sharedname = Sender_DnC_Upgradeable_exec
   libs      += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
@@ -62,6 +65,7 @@ project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
 }
 
 project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += HelloB_Sender_DnC_Upgradeable_svnt \
              HelloB_Sender_DnC_Upgradeable_exec
   sharedname = Sender_DnC_Upgradeable_exec_1
@@ -82,6 +86,7 @@ project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
 }
 
 project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += HelloB_Sender_DnC_Upgradeable_svnt \
              HelloB_Sender_DnC_Upgradeable_exec
   sharedname = Sender_DnC_Upgradeable_exec_2
@@ -102,6 +107,7 @@ project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
 }
 
 project (Hello_DnC_Upgradeable_Starter) : ciao_client_dnc, valuetype{
+  avoids += ace_for_tao
   exename = Upgradeable_starter
   after += HelloB_Sender_DnC_Upgradeable_stub
   libs += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 793f486cbbf..3a6e310d8ae 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p Benchmark -i -c RoundTrip"
 
 project(RoundTrip_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Benchmark_stub
   sharedname = RoundTrip_stub
 
@@ -24,6 +25,7 @@ project(RoundTrip_stub): ciao_client_dnc {
 }
 
 project(RoundTrip_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Benchmark_svnt RoundTrip_stub
   sharedname  = RoundTrip_svnt
 
@@ -53,6 +55,7 @@ project(RoundTrip_svnt) : ciao_servant_dnc {
 
 
 project(RoundTrip_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after += RoundTrip_svnt
   sharedname = RoundTrip_exec
 
@@ -77,6 +80,7 @@ project(RoundTrip_exec) : ciao_component_dnc {
 
 
 project (RoundTrip_client) : ciao_client_dnc, valuetype, strategies{
+  avoids += ace_for_tao
   exename = client
   after += RoundTrip_stub
   libs += RoundTrip_stub Benchmark_stub
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index faf1f9917b2..46cd2ef5573 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(CIDL_Basic_stub): ciao_component_dnc {
-
+  avoids += ace_for_tao
   sharedname = CIDL_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags   = BASIC_STUB_BUILD_DLL
@@ -21,6 +21,7 @@ project(CIDL_Basic_stub): ciao_component_dnc {
 }
 
 project(CIDL_Basic_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after +=  CIDL_Basic_stub
   sharedname = CIDL_Basic_svnt
   libs    += CIDL_Basic_stub
@@ -43,6 +44,7 @@ project(CIDL_Basic_svnt) : ciao_servant_dnc {
 }
 
 project(CodeGen_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += CIDL_Basic_stub
   libs    += CIDL_Basic_stub
   sharedname = CodeGen_stub
@@ -64,6 +66,7 @@ project(CodeGen_stub): ciao_client_dnc {
 }
 
 project(CodeGen_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += CIDL_Basic_svnt CodeGen_stub
   sharedname  = CodeGen_svnt
   libs    += CodeGen_stub CIDL_Basic_stub CIDL_Basic_svnt
@@ -96,6 +99,7 @@ project(CodeGen_svnt) : ciao_servant_dnc {
 
 
 project(CodeGen_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += CodeGen_svnt CodeGen_stub
   sharedname = CodeGen_exec
   libs      += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt
diff --git a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 3b7d613143d..0fc995db8e8 100644
--- a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Receiver"
 
 project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Minimum_Base_DnC_stub
   sharedname = Minimum_Receiver_DnC_stub
   idlflags += -Sc \
@@ -30,6 +31,7 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
 }
 
 project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Minimum_Base_DnC_svnt \
            Minimum_Base_Receiver_DnC_stub
   sharedname  = Minimum_Receiver_DnC_svnt
@@ -70,6 +72,7 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
 
 
 project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += Minimum_Base_Receiver_DnC_svnt
   sharedname = Minimum_Receiver_DnC_exec
   libs      += Minimum_Receiver_DnC_stub \