diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-18 05:02:14 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-07-18 05:02:14 +0000 |
| commit | 20f429e402aad17d8e97e87986d5f7cd8b7e672f (patch) | |
| tree | 5ff42d4412cff2a7f458957dae93598ccaab80b1 | |
| parent | 1afcffa2e6bceab40e5feeac7663150c2cd17b09 (diff) | |
| download | ATCD-20f429e402aad17d8e97e87986d5f7cd8b7e672f.tar.gz | |
Sat Jul 18 05:01:32 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 19 | ||||
| -rw-r--r-- | CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc | 3 | ||||
| -rw-r--r-- | CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb | 4 | ||||
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc | 2 | ||||
| -rw-r--r-- | CIAO/DAnCE/TargetManager/TargetManager.mpc | 2 |
5 files changed, 22 insertions, 8 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2acca591813..92d018ea66c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,14 +1,23 @@ +Sat Jul 18 05:01:32 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/ExecutionManager/ExecutionManager.mpc: + * DAnCE/MPC/config/dance_tm_daemon.mpb: + * DAnCE/Plan_Launcher/Plan_Launcher.mpc: + * DAnCE/TargetManager/TargetManager.mpc: + + Static linking fixes. + Sat Jul 18 00:50:20 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/Deployment/CIAO_Interfaces.mpc: - - linker fixes. - + + linker fixes. + * examples/Hello/Receiver/Receiver.mpc: - + this mpc specified more than was generated, causing it to be re-run. - + Fri Jul 17 21:18:11 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc index ef8a26027cf..0b5531f05cb 100644 --- a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc +++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc @@ -11,7 +11,8 @@ project(ExecutionManager_Module): dance_lib, taolib, iortable, ciao_output, util } } -project(Execution_Manager_Exec) : dance_exe, dance_domainapplicationmanager_stub, naming_serv, dance_executionmanager_stub, utils, dance_logger, avoids_minimum_corba { +project(Execution_Manager_Exec) : dance_exe, naming_serv, ciao_executionmanager_skel, \ + dance_domainapplicationmanager, dance_executionmanager_skel, utils, dance_logger, avoids_minimum_corba { exename = dance_execution_manager after += ExecutionManager_Module libs += DAnCE_ExecutionManager diff --git a/CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb b/CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb new file mode 100644 index 00000000000..cd4db18a7ff --- /dev/null +++ b/CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb @@ -0,0 +1,4 @@ +project : dance_deployment_svnt { + after += DAnCE_TargetManagerDaemon_svnt DAnCE_TargetManagerDaemon_stub + libs += DAnCE_TargetManagerDaemon_svnt DAnCE_TargetManagerDaemon_stub +}
\ No newline at end of file diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc index 9047d12e88b..594a66b6bd0 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc @@ -36,7 +36,7 @@ project(Plan_Launcher) : dance_lib, taolib, ciao_output, xerces, naming, dance_d } } -project(Plan_Launcher_Exec) : dance_exe, dance_logger, xerces, naming, dance_executionmanager_stub, ciao_config_handlers { +project(Plan_Launcher_Exec) : dance_exe, dance_logger, xerces, naming, dance_executionmanager_stub, ciao_executionmanager_stub, ciao_config_handlers { after += Plan_Launcher libs += DAnCE_Plan_Launcher DAnCE_Plan_Launcher_Base exename = dance_plan_launcher diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc index 379d4a966b7..d29e929670c 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -60,7 +60,7 @@ project(DAnCE_TargetManagerDaemon_svnt) : dance_lib, dance_deployment_svnt, \ } } -project (DAnCE_TargetManager_Exec) : dance_targetmanager, naming, dance_exe, iortable, utils, dance_logger { +project (DAnCE_TargetManager_Exec) : iortable, utils, naming, dance_logger, dance_tm_daemon, dance_nodemanager_stub, dance_targetmanager, dance_exe { exename = dance_target_manager IDL_Files { } |