Tue Sep 5 23:29:45 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu>

7 files changed, 116 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index 370b0a7733f..6ce48c1d3b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Sep  5 23:29:45 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
+
+        * Controller/Component/Controller.mpc:
+        * Output_Adapters/Component/Output_Manager.mpc:
+        * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc:
+        * Planner_Manager/Component/Planner_Manager.mpc:
+        * Planners/StaticPlanner/StaticPlanner.mpc: Updated the mpc files
+          to prevent linking errors on mac.
+
+        * Controller/Component/Path.idl: Removed this file as it's no
+          longer needed.
+
 Tue Sep  5 21:03:22 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
 
         * descriptors/flattened_deploymentplan.cdp: Removed this file
diff --git a/Controller/Component/Controller.mpc b/Controller/Component/Controller.mpc
index 4c33a09fdd4..98853107607 100644
--- a/Controller/Component/Controller.mpc
+++ b/Controller/Component/Controller.mpc
@@ -1,29 +1,14 @@
-project(Path_stub): taolib_with_idl {
-
-  sharedname = Path_stub
-  idlflags += -Wb,stub_export_macro=PATH_STUB_Export \
-              -Wb,stub_export_include=Path_stub_export.h \
-               -Wb,skel_export_macro=PATH_SVNT_Export \
-               -Wb,skel_export_include=Path_svnt_export.h
-
-  dynamicflags   = PATH_STUB_BUILD_DLL
-
-  IDL_Files {
-    Path.idl
-  }
-
-  Source_Files {
-    PathC.cpp
-  }
-}
 project(Controller_stub): ciao_deployment_stub {
 
   after += CIAO_TargetManager_stub \
+           TargetManager_stub       \
+           NodeManager_stub \
            Monitor_stub
 
   sharedname = Controller_stub
 
   libs += TargetManager_stub \
+          NodeManager_stub \
           Monitor_stub
 
   idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export \
@@ -52,7 +37,9 @@ project(Controller_svnt) : ciao_servant_dnc {
 
   libs    += Controller_stub \
              TargetManager_stub \
-             TargetManager_svnt
+             TargetManager_svnt \
+             NodeManager_stub \
+             Monitor_stub
 
   idlflags  +=  -Wb,export_macro=CONTROLLER_SVNT_Export \
                 -Wb,export_include=Controller_svnt_export.h
@@ -87,7 +74,8 @@ project(Controller_exec) : ciao_component_dnc, ciao_config_handlers {
                Controller_svnt \
                TargetManager_stub \
                TargetManager_svnt \
-               Path_stub
+               NodeManager_stub \
+               Monitor_stub
 
   idlflags  +=  -Wb,export_macro=CONTROLLER_EXEC_Export \
                 -Wb,export_include=Controller_exec_export.h
@@ -110,10 +98,14 @@ project(Controller_exec) : ciao_component_dnc, ciao_config_handlers {
 }
 
 
-project (Controller_Starter) : ciao_client_dnc, valuetype {
+project (Controller_Starter) : ciao_client_dnc, ciao_deployment_stub, valuetype {
   exename = starter
   after += Controller_stub
-  libs += Controller_stub
+  libs += Controller_stub \
+          TargetManager_stub       \
+          NodeManager_stub \
+          Monitor_stub
+
 
   IDL_Files {
   }
diff --git a/Controller/Component/Path.idl b/Controller/Component/Path.idl
deleted file mode 100644
index 93228683465..00000000000
--- a/Controller/Component/Path.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef RACE_PATH_IDL
-#define RACE_PATH_IDL
-
-
-module CIAO
-{
-  module RACE
-  {
-
-    struct Path_Element
-    {
-      /// UUID of the component.
-      string node;
-
-      /// Name of the source port.
-      string src;
-
-      /// Name of the destination port.
-      string dst;
-    };
-
-    /// Type definition for a path sequence.
-    typedef sequence <Path_Element> Critical_Path;
-  };
-
-};
-
-#endif /*RACE_PATH_IDL*/
diff --git a/Output_Adapters/Component/Output_Manager.mpc b/Output_Adapters/Component/Output_Manager.mpc
index cb72faea8ed..2013fabbec5 100644
--- a/Output_Adapters/Component/Output_Manager.mpc
+++ b/Output_Adapters/Component/Output_Manager.mpc
@@ -1,11 +1,16 @@
-// generate_component_mpc.pl,v 1.10 2005/09/27 17:57:44 wotte Exp
-// This file is generated with "generate_component_mpc.pl Output_Manager"
-
 project(Output_Manager_stub): ciao_client_dnc, ciao_race_component  {
-  after += Output_Adapter_Interface_stub  
-  libs += Output_Adapter_Interface_stub  
+
+  after += Output_Adapter_Interface_stub
+
+  libs += Output_Adapter_Interface_stub
+
   sharedname = Output_Manager_stub
-  idlflags += -Wb,stub_export_macro=OUTPUT_MANAGER_STUB_Export -Wb,stub_export_include=Output_Manager_stub_export.h -Wb,skel_export_macro=OUTPUT_MANAGER_SVNT_Export -Wb,skel_export_include=Output_Manager_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=OUTPUT_MANAGER_STUB_Export \
+              -Wb,stub_export_include=Output_Manager_stub_export.h \
+              -Wb,skel_export_macro=OUTPUT_MANAGER_SVNT_Export \
+              -Wb,skel_export_include=Output_Manager_svnt_export.h
+
   dynamicflags   = OUTPUT_MANAGER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -20,9 +25,13 @@ project(Output_Manager_stub): ciao_client_dnc, ciao_race_component  {
 project(Output_Manager_svnt) : ciao_servant_dnc, ciao_race_component  {
   after +=  Output_Manager_stub
   sharedname  = Output_Manager_svnt
-  libs    += Output_Manager_stub Output_Adapter_Interface_svnt  Output_Adapter_Interface_stub
-  
-  idlflags  +=  -Wb,export_macro=OUTPUT_MANAGER_SVNT_Export -Wb,export_include=Output_Manager_svnt_export.h
+  libs    += Output_Manager_stub \
+             Output_Adapter_Interface_stub \
+             Output_Adapter_Interface_svnt
+
+  idlflags  +=  -Wb,export_macro=OUTPUT_MANAGER_SVNT_Export \
+                -Wb,export_include=Output_Manager_svnt_export.h
+
   dynamicflags = OUTPUT_MANAGER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -44,20 +53,22 @@ project(Output_Manager_svnt) : ciao_servant_dnc, ciao_race_component  {
 project(Output_Manager_exec) : ciao_component_dnc, ciao_race_component  {
   after   += Output_Manager_svnt
   sharedname = Output_Manager_exec
-  libs      += Output_Manager_stub Output_Manager_svnt Output_Adapter_Interface_stub
-  
-  idlflags  +=  -Wb,export_macro=OUTPUT_MANAGER_EXEC_Export -Wb,export_include=Output_Manager_exec_export.h
+  libs      += Output_Manager_stub \
+               Output_Manager_svnt \
+               Output_Adapter_Interface_stub \
+               Output_Adapter_Interface_svnt
+
+  idlflags  +=  -Wb,export_macro=OUTPUT_MANAGER_EXEC_Export \
+                -Wb,export_include=Output_Manager_exec_export.h
+
   dynamicflags   = OUTPUT_MANAGER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     Output_Manager_exec.cpp
   }
 }
-
-
-
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
index d2c3baaf248..a44868784a0 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
@@ -1,12 +1,20 @@
-// generate_component_mpc.pl,v 1.10 2005/09/27 17:57:44 wotte Exp
-// This file is generated with "generate_component_mpc.pl DAnCE_Output_Adapter"
-
-project(DAnCE_Output_Adapter_stub): ciao_client_dnc, ciao_race_component {
+project(DAnCE_Output_Adapter_stub): ciao_deployment_stub, ciao_race_component {
   after += Output_Adapter_stub \
-           Controller_stub 
-  libs += Output_Adapter_stub  Controller_stub
+           Controller_stub
+
+  libs += Output_Adapter_stub  \
+          Controller_stub \
+          Output_Adapter_Interface_stub \
+          TargetManager_stub                   \
+          NodeManager_stub \
+          Monitor_stub
+
   sharedname = DAnCE_Output_Adapter_stub
-  idlflags += -Wb,stub_export_macro=DANCE_OUTPUT_ADAPTER_STUB_Export -Wb,stub_export_include=DAnCE_Output_Adapter_stub_export.h -Wb,skel_export_macro=DANCE_OUTPUT_ADAPTER_SVNT_Export -Wb,skel_export_include=DAnCE_Output_Adapter_svnt_export.h
+  idlflags += -Wb,stub_export_macro=DANCE_OUTPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=DAnCE_Output_Adapter_stub_export.h \
+              -Wb,skel_export_macro=DANCE_OUTPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=DAnCE_Output_Adapter_svnt_export.h
+
   dynamicflags   = DANCE_OUTPUT_ADAPTER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,9 +29,20 @@ project(DAnCE_Output_Adapter_stub): ciao_client_dnc, ciao_race_component {
 project(DAnCE_Output_Adapter_svnt) : ciao_servant_dnc, ciao_race_component {
   after +=  DAnCE_Output_Adapter_stub
   sharedname  = DAnCE_Output_Adapter_svnt
-  libs    += Output_Adapter_svnt DAnCE_Output_Adapter_stub  Controller_svnt Output_Adapter_Interface_stub Output_Adapter_Interface_svnt Controller_stub
-  
-  idlflags  +=  -Wb,export_macro=DANCE_OUTPUT_ADAPTER_SVNT_Export -Wb,export_include=DAnCE_Output_Adapter_svnt_export.h
+  libs    += Output_Adapter_svnt \
+             Output_Adapter_stub \
+             Output_Adapter_Interface_stub \
+             DAnCE_Output_Adapter_stub  \
+             Output_Adapter_Interface_stub \
+             Output_Adapter_Interface_svnt \
+             Controller_stub \
+             TargetManager_stub \
+             NodeManager_stub \
+             Monitor_stub
+
+  idlflags  +=  -Wb,export_macro=DANCE_OUTPUT_ADAPTER_SVNT_Export \
+                -Wb,export_include=DAnCE_Output_Adapter_svnt_export.h
+
   dynamicflags = DANCE_OUTPUT_ADAPTER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -42,23 +61,38 @@ project(DAnCE_Output_Adapter_svnt) : ciao_servant_dnc, ciao_race_component {
 }
 
 
-project(DAnCE_Output_Adapter_exec) : ciao_component_dnc, ciao_race_component {
+project(DAnCE_Output_Adapter_exec) : ciao_component_dnc, ciao_race_component, ciao_config_handlers {
   after   += DAnCE_Output_Adapter_svnt
   sharedname = DAnCE_Output_Adapter_exec
-  libs      += DAnCE_Output_Adapter_stub DAnCE_Output_Adapter_svnt Plan_Launcher_Impl Output_Adapter_Interface_stub
-  
-  idlflags  +=  -Wb,export_macro=DANCE_OUTPUT_ADAPTER_EXEC_Export -Wb,export_include=DAnCE_Output_Adapter_exec_export.h
+
+  libs      += DAnCE_Output_Adapter_stub \
+               DAnCE_Output_Adapter_svnt \
+               Plan_Launcher_Impl \
+               ExecutionManager_stub \
+               Output_Adapter_stub \
+               Output_Adapter_Interface_stub \
+               Output_Adapter_svnt \
+               Output_Adapter_stub \
+               Output_Adapter_Interface_stub \
+               DAnCE_Output_Adapter_stub  \
+               Output_Adapter_Interface_stub \
+               Output_Adapter_Interface_svnt \
+               Controller_stub \
+               TargetManager_stub \
+               NodeManager_stub \
+               Monitor_stub
+
+  idlflags  +=  -Wb,export_macro=DANCE_OUTPUT_ADAPTER_EXEC_Export \
+                -Wb,export_include=DAnCE_Output_Adapter_exec_export.h
+
   dynamicflags   = DANCE_OUTPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     DAnCE_Output_Adapter_exec.cpp
   }
 }
-
-
-
diff --git a/Planner_Manager/Component/Planner_Manager.mpc b/Planner_Manager/Component/Planner_Manager.mpc
index ef7bbe9b97e..2699080cd0c 100644
--- a/Planner_Manager/Component/Planner_Manager.mpc
+++ b/Planner_Manager/Component/Planner_Manager.mpc
@@ -1,7 +1,3 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//Planner_Manager.mpc,v 1.3 2005/09/30 20:11:36 wotte Exp
-// This file is generated with "generate_component_mpc.pl Planner_Manager"
-
 project(Planner_Manager_stub): ciao_deployment_stub, ciao_race_component {
   after += Planner_Manager_Interface_stub \
            Planner_Interface_stub \
@@ -47,7 +43,9 @@ project(Planner_Manager_svnt) : ciao_servant_dnc, ciao_race_component {
              Planner_Manager_Interface_svnt \
              Planner_Interface_stub \
              Output_Adapter_Interface_stub \
-             TargetManager_svnt
+             TargetManager_stub \
+             TargetManager_svnt \
+             NodeManager_stub
   idlflags  +=  -Sc \
                 -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
                 -Wb,export_include=Planner_Manager_svnt_export.h
@@ -94,6 +92,7 @@ project(Planner_Manager_exec) : ciao_component_dnc, ciao_race_component {
              Planner_stub \
              Output_Adapter_Interface_stub \
              TargetManager_stub \
+             TargetManager_svnt \
              NodeManager_stub
 
   idlflags  +=  -Sc \
diff --git a/Planners/StaticPlanner/StaticPlanner.mpc b/Planners/StaticPlanner/StaticPlanner.mpc
index b9c11204d29..cdde9cb121c 100644
--- a/Planners/StaticPlanner/StaticPlanner.mpc
+++ b/Planners/StaticPlanner/StaticPlanner.mpc
@@ -1,7 +1,4 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p Planner_Interface -p Planner StaticPlanner"
-
-project(Planner_StaticPlanner_stub): ciao_client_dnc, ciao_race_component {
+project(Planner_StaticPlanner_stub): ciao_deployment_stub, ciao_race_component {
   after += Planner_stub Planner_Interface_stub
   libs += Planner_stub Planner_Interface_stub
   sharedname = StaticPlanner_stub
@@ -21,7 +18,7 @@ project(Planner_StaticPlanner_svnt) : ciao_servant_dnc, ciao_race_component {
   after += Planner_svnt Planner_StaticPlanner_stub Planner_Interface_svnt
   sharedname  = StaticPlanner_svnt
   libs    += StaticPlanner_stub Planner_stub Planner_svnt Planner_Interface_stub Planner_Interface_svnt
-  
+
   idlflags  +=  -Wb,export_macro=STATICPLANNER_SVNT_Export -Wb,export_include=StaticPlanner_svnt_export.h
   dynamicflags = STATICPLANNER_SVNT_BUILD_DLL
 
@@ -51,19 +48,16 @@ project(Planner_StaticPlanner_exec) : ciao_component_dnc, ciao_race_component {
                Planner_stub \
                Planner_svnt \
                RACE_common_stub
-  
+
   idlflags  +=  -Wb,export_macro=STATICPLANNER_EXEC_Export -Wb,export_include=StaticPlanner_exec_export.h
   dynamicflags   = STATICPLANNER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     StaticPlanner_exec.cpp
   }
 }
-
-
-