Sun Apr 12 18:55:13 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>

 
        * examples/BasicSP/BMClosedED/BMClosedED.mpc:
        * examples/BasicSP/BMDevice/BMDevice.mpc:
        * examples/BasicSP/BMDisplay/BMDisplay.mpc:
        * examples/BasicSP/BasicSP.mpc:
        * examples/BasicSP/EC/EC.mpc:
         
          Scoreboard clean-up ACE_FOR_TAO does not build CIDLC which is
          required for these examples.

6 files changed, 41 insertions, 30 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 19131fe5540..62d8f87bc5a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,9 +1,20 @@
+Sun Apr 12 18:55:13 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * examples/BasicSP/BMClosedED/BMClosedED.mpc:
+        * examples/BasicSP/BMDevice/BMDevice.mpc:
+        * examples/BasicSP/BMDisplay/BMDisplay.mpc:
+        * examples/BasicSP/BasicSP.mpc:
+        * examples/BasicSP/EC/EC.mpc:
+        
+          Scoreboard clean-up ACE_FOR_TAO does not build CIDLC which is
+          required for these examples.
+
 Sun Apr 12 01:58:41 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * MPC/config/dance_repository_manager.mpb:
 
-          Linking error on static builds. 
-        
+          Linking error on static builds.
+
 Fri Apr 10 17:36:19 UTC 2009  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * DAnCE/ExecutionManager/ExecutionManager.mpc:
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index b111f3fe658..43a41acd68f 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(BMClosedED_stub_gen): ciaoidldefaults,anytypecode {
+project(BMClosedED_stub_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
@@ -13,7 +13,7 @@ project(BMClosedED_stub_gen): ciaoidldefaults,anytypecode {
   }
 }
 
-project(BMClosedED_lem_gen) : ciaocidldefaults, ciaoidldefaults {
+project(BMClosedED_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
   cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
@@ -33,7 +33,7 @@ project(BMClosedED_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 
 }
 
-project(BMClosedED_stub): ccm_stub {
+project(BMClosedED_stub): ccm_stub, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
   after += BasicSP_stub BMClosedED_stub_gen
@@ -60,7 +60,7 @@ project(BMClosedED_stub): ccm_stub {
 }
 
 
-project(BMClosedED_exec) : ciao_executor {
+project(BMClosedED_exec) : ciao_executor, avoids_ace_for_tao {
   after      += BMClosedED_stub BMClosedED_lem_gen BasicSP_exec
   sharedname = BMClosedED_exec
   libs       += BMClosedED_stub
@@ -91,7 +91,7 @@ project(BMClosedED_exec) : ciao_executor {
 
 }
 
-project(BMClosedED_svnt) : ciao_servant {
+project(BMClosedED_svnt) : ciao_servant, avoids_ace_for_tao {
   after += BasicSP_svnt BMClosedED_exec
 
   includes += $(CIAO_ROOT)/examples/BasicSP
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index e1dcdb92c8f..edf9b5ae417 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(BMDevice_stub_gen): ciaoidldefaults,anytypecode {
+project(BMDevice_stub_gen): ciaoidldefaults,anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export
@@ -13,7 +13,7 @@ project(BMDevice_stub_gen): ciaoidldefaults,anytypecode {
   }
 }
 
-project(BMDevice_lem_gen) : ciaocidldefaults, ciaoidldefaults {
+project(BMDevice_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
   cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
@@ -33,7 +33,7 @@ project(BMDevice_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 
 }
 
-project(BMDevice_stub): ccm_stub {
+project(BMDevice_stub): ccm_stub, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
   after += BasicSP_stub BMDevice_stub_gen
@@ -63,7 +63,7 @@ project(BMDevice_stub): ccm_stub {
 
 }
 
-project(BMDevice_exec) : ciao_executor {
+project(BMDevice_exec) : ciao_executor, avoids_ace_for_tao {
   after      += BMDevice_stub BMDevice_lem_gen BasicSP_exec
 
   sharedname = BMDevice_exec
@@ -93,7 +93,7 @@ project(BMDevice_exec) : ciao_executor {
   }
 }
 
-project(BMDevice_svnt) : ciao_servant {
+project(BMDevice_svnt) : ciao_servant, avoids_ace_for_tao {
   after += BasicSP_svnt BMDevice_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
 
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index ddf4d25b60d..a439729a05f 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(BMDisplay_stub_gen): ciaoidldefaults,anytypecode {
+project(BMDisplay_stub_gen): ciaoidldefaults,anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
@@ -13,7 +13,7 @@ project(BMDisplay_stub_gen): ciaoidldefaults,anytypecode {
   }
 }
 
-project(BMDisplay_lem_gen) : ciaocidldefaults, ciaoidldefaults {
+project(BMDisplay_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
   cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
@@ -32,7 +32,7 @@ project(BMDisplay_lem_gen) : ciaocidldefaults, ciaoidldefaults {
   }
 
 }
-project(BMDisplay_stub): ccm_stub {
+project(BMDisplay_stub): ccm_stub, avoids_ace_for_tao {
   after += BasicSP_stub BMDisplay_stub_gen
   sharedname = BMDisplay_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
@@ -63,7 +63,7 @@ project(BMDisplay_stub): ccm_stub {
 
 
 
-project(BMDisplay_exec) : ciao_executor {
+project(BMDisplay_exec) : ciao_executor, avoids_ace_for_tao {
   after      += BMDisplay_stub BMDisplay_lem_gen BasicSP_exec
 
   sharedname = BMDisplay_exec
@@ -97,7 +97,7 @@ project(BMDisplay_exec) : ciao_executor {
 }
 
 
-project(BMDisplay_svnt) : ciao_servant {
+project(BMDisplay_svnt) : ciao_servant, avoids_ace_for_tao {
   after += BasicSP_svnt BMDisplay_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
 
diff --git a/CIAO/examples/BasicSP/BasicSP.mpc b/CIAO/examples/BasicSP/BasicSP.mpc
index 015c6f4ec48..09aaee51d3b 100644
--- a/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/CIAO/examples/BasicSP/BasicSP.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(BasicSP_stub_gen): ciaoidldefaults, anytypecode {
+project(BasicSP_stub_gen): ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export \
            -Wb,stub_export_include=BasicSP_stub_export.h \
@@ -13,7 +13,7 @@ project(BasicSP_stub_gen): ciaoidldefaults, anytypecode {
   }
 }
 
-project(BasicSP_lem_gen) : ciaocidldefaults {
+project(BasicSP_lem_gen) : ciaocidldefaults, avoids_ace_for_tao {
   custom_only = 1
   cidlflags += --lem-force-all
 
@@ -22,7 +22,7 @@ project(BasicSP_lem_gen) : ciaocidldefaults {
   }
 }
 
-project(BasicSP_lem_gen_idl) : ciaoidldefaults {
+project(BasicSP_lem_gen_idl) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   after += BasicSP_lem_gen
   idlflags  += -Wb,stub_export_macro=BASICSP_EXEC_Export \
@@ -34,7 +34,7 @@ project(BasicSP_lem_gen_idl) : ciaoidldefaults {
   }
 }
 
-project(BasicSP_stub): ccm_stub {
+project(BasicSP_stub): ccm_stub, avoids_ace_for_tao {
   after += BasicSP_stub_gen
   sharedname = BasicSP_stub
   dynamicflags = BASICSP_STUB_BUILD_DLL
@@ -54,7 +54,7 @@ project(BasicSP_stub): ccm_stub {
   }
 }
 
-project(BasicSP_exec) : ciao_executor {
+project(BasicSP_exec) : ciao_executor, avoids_ace_for_tao {
   after += BasicSP_stub BasicSP_lem_gen_idl
   sharedname = BasicSP_exec
   libs += BasicSP_stub
@@ -78,7 +78,7 @@ project(BasicSP_exec) : ciao_executor {
   }
 }
 
-project(BasicSP_svnt) : ciao_servant {
+project(BasicSP_svnt) : ciao_servant, avoids_ace_for_tao {
   after +=  BasicSP_exec
   sharedname = BasicSP_svnt
   libs    += BasicSP_stub BasicSP_exec
diff --git a/CIAO/examples/BasicSP/EC/EC.mpc b/CIAO/examples/BasicSP/EC/EC.mpc
index 249d86e50b5..fc59ddf4a96 100644
--- a/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/CIAO/examples/BasicSP/EC/EC.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(EC_stub_gen): ciaoidldefaults, anytypecode {
+project(EC_stub_gen): ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags += -Wb,stub_export_macro=EC_STUB_Export
@@ -13,7 +13,7 @@ project(EC_stub_gen): ciaoidldefaults, anytypecode {
   }
 }
 
-project(EC_lem_gen) : ciaocidldefaults, ciaoidldefaults {
+project(EC_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
   cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
@@ -33,7 +33,7 @@ project(EC_lem_gen) : ciaocidldefaults, ciaoidldefaults {
 
 }
 
-project(EC_stub): ccm_stub {
+project(EC_stub): ccm_stub, avoids_ace_for_tao {
   after += BasicSP_stub EC_stub_gen
   sharedname = EC_stub
   includes += $(CIAO_ROOT)/examples/BasicSP
@@ -63,7 +63,7 @@ project(EC_stub): ccm_stub {
 
 }
 
-project(EC_exec) : ciao_executor {
+project(EC_exec) : ciao_executor, avoids_ace_for_tao {
   after      += EC_stub EC_lem_gen BasicSP_exec
 
   sharedname = EC_exec
@@ -93,7 +93,7 @@ project(EC_exec) : ciao_executor {
   }
 }
 
-project(EC_svnt) : ciao_servant {
+project(EC_svnt) : ciao_servant, avoids_ace_for_tao {
   after += BasicSP_svnt EC_exec
   includes += $(CIAO_ROOT)/examples/BasicSP
 
@@ -124,7 +124,7 @@ project(EC_svnt) : ciao_servant {
 
 }
 
-project (EC_client) : ccm_stub {
+project (EC_client) : ccm_stub, avoids_ace_for_tao {
   after += EC_stub
   exename = client
   libs += EC_stub BasicSP_stub
@@ -149,7 +149,7 @@ project (EC_client) : ccm_stub {
 
 }
 
-project (EC_controller) : ccm_stub {
+project (EC_controller) : ccm_stub, avoids_ace_for_tao {
   after += EC_stub
   exename = controller
   includes += $(CIAO_ROOT)/examples/BasicSP