diff options
| author | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-09-28 16:58:42 +0000 |
|---|---|---|
| committer | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-09-28 16:58:42 +0000 |
| commit | 9126ba818abfc14f00d9165dd8bed3a9386e3c01 (patch) | |
| tree | 7ea21d5d940fd5c617c4ccde19b0a9069d3889f2 | |
| parent | 92059adbd4aa5cfade35648344440b56460c85e4 (diff) | |
| download | ATCD-9126ba818abfc14f00d9165dd8bed3a9386e3c01.tar.gz | |
ChangeLog Tag: Thu Sep 28 16:53:14 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb | 8 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb | 8 | ||||
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc | 14 |
5 files changed, 36 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 039c34991a9..b8dda60e6e3 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 28 16:53:14 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * bin\MakeProjectCreator\config\ciao_executionmanager_stub.mpb + * bin\MakeProjectCreator\config\ciao_plan_generator.mpb + Added the base projects for executionmanager_stub and plan_generator. + Thu Sep 28 14:46:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * bin/diff-builds.pl: diff --git a/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb new file mode 100644 index 00000000000..bea046abd2d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/ExecutionManager + libs += ExecutionManager_stub + after += ExecutionManager_stub +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb new file mode 100644 index 00000000000..e234ead3e67 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc { + includes += $(CIAO_ROOT)/DAnCE/Plan_Generator + libs += Plan_Generator + after += Plan_Generator +} diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 0a9d6110e2a..45aee848c9e 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Sep 28 16:47:58 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + Added the base projects to Plan_Launcher_Impl project to include + required libs. Added null head files to the Plan_Launcher project to + remove the unnecessary dependency on other libs. + Thu Sep 28 15:57:53 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> * DAnCE/Plan_Launcher/Plan_Launcher.mpc diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc index a1dc9dcbf0d..c008bde3fc2 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc @@ -1,22 +1,19 @@ // -*- MPC -*- // $Id$ -project(Plan_Launcher_Impl) : ciao_servant_dnc, ciao_config_handlers { +project(Plan_Launcher_Impl) : ciao_servant_dnc, ciao_config_handlers, ciao_executionmanager_stub, ciao_plan_generator { sharedname = Plan_Launcher_Impl - after += Plan_Generator ExecutionManager_stub - libs += Plan_Generator ExecutionManager_stub - includes += $(CIAO_ROOT)/DAnCE/Plan_Generator - dynamicflags = PLAN_LAUNCHER_IMPL_BUILD_DLL Source_Files { - Plan_Launcher_Impl.cpp ../ExecutionManager/DAM_Map.cpp + Plan_Launcher_Impl.cpp } Header_Files { ../ExecutionManager/DAM_Map.h + Plan_Launcher_Impl.h Plan_Launcher_Impl_Export.h } } @@ -25,9 +22,12 @@ project(Plan_Launcher) : ciao_server_dnc, ciao_config_handlers { exename = plan_launcher after += Plan_Launcher_Impl - libs += Plan_Generator Plan_Launcher_Impl ExecutionManager_stub + libs += Plan_Launcher_Impl Source_Files { Plan_Launcher.cpp } + + Header_Files { + } } |