summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-01-30 02:00:42 +0000
committerdengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-01-30 02:00:42 +0000
commit3a391d8291fd138011298fc712ec824f2307cedb (patch)
tree17706a07f913864c0a889c4276271fc4e992cddd
parent48a46b3b51bea528312aeb67732bf830f542e473 (diff)
downloadATCD-3a391d8291fd138011298fc712ec824f2307cedb.tar.gz
Mon Jan 30 01:59:23 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog18
-rw-r--r--TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc2
-rw-r--r--TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc8
3 files changed, 23 insertions, 5 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 4ea9562c0a6..f6861439940 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Jan 30 01:59:23 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+
+ Cosmetic change.
+
+ * DAnCE/NodeManager/NodeManager.mpc
+
+ Fixed a typo.
+
+Mon Jan 30 01:47:21 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
+
+ * DAnCE/NodeManager/NodeManager.mpc
+ * DAnCE/NodeManager/NodeManager_Impl.h
+ * DAnCE/NodeManager/NodeManager_Export.h
+
+ Added dll import/export mechanism into NodeManager library.
+
Sat Jan 28 22:24:35 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
* examples/Hello/descriptors/run_test.pl
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index 85d64458aa1..b863419a110 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,4 +1,4 @@
- // -*- MPC -*-
+// -*- MPC -*-
// $Id$
project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt {
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index f6a8307bf17..9d658ff97e0 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -2,12 +2,12 @@
// $Id$
//For static D&C, the NodeManager should be available as a linkable library
-project(NodeManager_Impl): ciao_component_dnc, iortable, ifr_client, dance_extension_stub {
+project(NodeManager_svnt): ciao_component_dnc, iortable, ifr_client, dance_extension_stub {
sharedname = NodeManager
after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub
libs += NodeManager_stub NodeApplicationManager TargetManager_stub
includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/Interfaces $(CIAO_ROOT)/DAnCE/TargetManager
- dynamicflags = CIAO_NodeManager_BUILD_DLL
+ dynamicflags = CIAO_NODEMANAGER_BUILD_DLL
IDL_Files {
}
@@ -22,8 +22,8 @@ project(NodeManager_Impl): ciao_component_dnc, iortable, ifr_client, dance_exten
}
project(NodeManager): ciao_component_dnc, iortable, ifr_client, dance_extension_stub {
- after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_Impl
- libs += NodeManager_stub NodeApplicationManager TargetManager_stub NodeManager
+ after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_svnt
+ libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub
includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/TargetManager
exename = NodeManager