diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 12:30:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 12:30:15 +0000 |
| commit | 7ca9330c7572bb62000fa7d31d6d09e785c65e4a (patch) | |
| tree | 1bf8e10d54a8905add713226726b443242a738ac | |
| parent | c5269f17c71e4baebf90a1e55f42cdfa8ba73430 (diff) | |
| download | ATCD-7ca9330c7572bb62000fa7d31d6d09e785c65e4a.tar.gz | |
Mon Dec 4 12:29:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/TargetManager/DomainDataManager.h | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/TargetManager/TargetManager.mpc | 16 |
3 files changed, 14 insertions, 16 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 84aeeb30a83..967cf770dca 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Dec 4 12:29:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/TargetManager/DomainDataManager.h: + Documentation changes + + * DAnCE/TargetManager/TargetManager.mpc: + Simplified this file using more base projects + Mon Dec 4 12:24:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * MPC diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h index a376cb6995c..7b12b52d226 100644 --- a/CIAO/DAnCE/TargetManager/DomainDataManager.h +++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h @@ -5,7 +5,7 @@ * * @brief Maintains the Domain Information * - * It contains the entire Domain information.Both the + * It contains the entire Domain information. Both the * initial domain as well as the current available domain. * * @author Nilabja Roy nilabjar@dre.vanderbilt.edu @@ -181,7 +181,6 @@ namespace CIAO * @param deployed The deployed Properties * @param available The available Properties */ - void match_properties ( ::Deployment::Properties deployed, ::Deployment::SatisfierProperties& available); @@ -201,8 +200,7 @@ namespace CIAO * when the deployed resources exceeds * the available resource. */ - - void commit_release_resource ( ::Deployment::Property & deployed, + void commit_release_resource ( ::Deployment::Property & deployed, ::Deployment::SatisfierProperty & available); /** diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc index a755ffae6c6..11d1bd518b9 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -1,7 +1,6 @@ // $Id$ -project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub { - after += NodeManager_stub +project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_nodemanager_stub { sharedname = TargetManager_stub idlflags += -Wb,stub_export_macro=TARGETMANAGER_STUB_Export \ -Wb,stub_export_include=TargetManager_stub_export.h \ @@ -9,8 +8,6 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub { -Wb,skel_export_include=TargetManager_svnt_export.h dynamicflags = TARGETMANAGER_STUB_BUILD_DLL - libs += NodeManager_stub - IDL_Files { TargetManagerImpl.idl TargetManagerExt.idl @@ -24,13 +21,12 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub { } } -project(CIAO_TargetManager_svnt) : ciao_servant_dnc { - after += CIAO_TargetManager_stub +project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub { sharedname = TargetManager_svnt - libs += TargetManager_stub NodeManager_stub idlflags += -Wb,export_macro=TARGETMANAGER_SVNT_Export \ -Wb,export_include=TargetManager_svnt_export.h + dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL CIDL_Files { @@ -51,13 +47,9 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc { } -project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc { - after += CIAO_TargetManager_svnt +project(CIAO_TargetManager_exec) : ciao_component_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc, ciao_targetmanager_svnt { sharedname = TargetManager_exec - libs += TargetManager_stub TargetManager_svnt NodeManager_stub - idlflags += -Wb,export_macro=TARGETMANAGER_EXEC_Export \ - -Wb,export_include=TargetManager_exec_export.h dynamicflags = TARGETMANAGER_EXEC_BUILD_DLL Source_Files { |