summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-08-03 12:34:17 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-08-03 12:34:17 +0000
commit98edb737caee88b17c9e39760397a523a3a1939c (patch)
tree31594e9a091b59797dbfd2b62a49c18711b3fb46
parenta5323a564e05285d2a55e5e95a372fee349ee03a (diff)
downloadATCD-98edb737caee88b17c9e39760397a523a3a1939c.tar.gz
ChangeLogTag: Wed Aug 3 12:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/CIAO/ChangeLog27
-rw-r--r--TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc8
2 files changed, 20 insertions, 15 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 285d118d4ac..dee91a630b7 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,15 +1,20 @@
+Wed Aug 3 12:34:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * DAnCE/Plan_Launcher/Plan_Launcher.mpc:
+ Corrected order of the libraries to resolve static link
+ errors
+
Tue Aug 2 08:36:40 2005 William Otte <wotte@dre.vanderbilt.edu>
* DAnCE/Plan_Launcher/Plan_Launcher.mpc
- Possiible fix for borlan build problem.
+ Possiible fix for borlan build problem.
Mon Aug 01 16:01:43 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
* ChangeLog
- Fixed several incorrect checkin date
-
+ Fixed several incorrect checkin date
Mon Aug 01 14:55:43 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
@@ -20,18 +25,18 @@ Mon Aug 01 14:55:43 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
Mon Aug 1 19:39:30 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
* DAnCE/Plan_Launcher/Plan_Launcher.mpc:
-
+
Removed duplicate 'after' and 'libs' items, and added the
new export macro definition file (see below) to
Header_Files.
-
+
* DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
-
+
Added export macro to class declaration and include of export
macro definitin file.
-
+
* DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h:
-
+
New file to define the export macro for the Plan_Launcher_Impl
library.
@@ -39,19 +44,19 @@ Sun Jul 31 21:56:43 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
* DAnCE/new_RepositoryManager/Options.h
- Improved documentation to meet the requirement of Doxygen
+ Improved documentation to meet the requirement of Doxygen
Sun Jul 31 21:45:43 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
* DAnCE/new_RepositoryManager/RMadmin.cpp
- Fixed C4101 warnings in MSVC
+ Fixed C4101 warnings in MSVC
Sun Jul 31 21:26:43 2005 Ming Xiong <mxiong@dre.vanderbilt.edu>
* DAnCE/new_RepositoryManager/RMadmin.cpp
- Updated RMadmin.cpp to merge latest changes
+ Updated RMadmin.cpp to merge latest changes
Fri Jul 29 15:02:43 2005 Gan Deng <dengg@dre.vanderbilt.edu>
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
index 8a157b4e77d..462999b5008 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -1,5 +1,5 @@
// -*- MPC -*-
-// $Id$
+// $Id$
project(Plan_Launcher_Impl) : naming, ciao_server_dnc, xerces {
@@ -8,9 +8,9 @@ project(Plan_Launcher_Impl) : naming, ciao_server_dnc, xerces {
after += XSC_Config_Handlers ExecutionManager_stub NodeDaemon_stub
libs += XSC_Config_Handlers
libs += ExecutionManager_stub
-
+
dynamicflags = PLAN_LAUNCHER_IMPL_BUILD_DLL
-
+
Source_Files {
Plan_Launcher_Impl.cpp
DAM_Map.cpp
@@ -26,7 +26,7 @@ project(Plan_Launcher) : ciao_server_dnc, taoexe, xerces {
requires += exceptions
after += Plan_Launcher_Impl
- libs += XSC_Config_Handlers Plan_Launcher_Impl ExecutionManager_stub
+ libs += Plan_Launcher_Impl XSC_Config_Handlers ExecutionManager_stub
Source_Files {
Plan_Launcher.cpp