ChangeLogTag: Mon Apr 10 06:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 37 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 5092c9c17e4..efaea8d1337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Mon Apr 10 06:23:00 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_container_dnc.mpb:
+          New file, matches library name
+
+        * bin/MakeProjectCreator/config/ciao_xml_utils.mpb:
+          Use exceptions as base project
+
+        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
+          Use ciao_events_dnc as base project
+
+        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
+          Add ciao_container_dnc and ciao_client_dnc to make things easier to
+          maintain. Also use the CIAO_Dnc_Events library instead of the
+          two seperate libs
+
+        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
+        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
+          Removed CIAO_DnC_Events as seperate lib
+
 Sun Apr  9 12:00:00 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
 	* docs/ACE-bug-process.html: Updated this page to more accurately
@@ -7,17 +27,17 @@ Sun Apr  9 12:00:00 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
 Sat Apr  8 18:32:29 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-	* ace/Shared_Memory_MM.h (ACE_Shared_Memory_MM): 
+	* ace/Shared_Memory_MM.h (ACE_Shared_Memory_MM):
 	* ace/Shared_Memory_SV.h (ACE_Shared_Memory_SV):
 	  Added comments that underscore that these classes should not be
  	  used and instead ACE_Malloc or ACE_Mem_Map should be used.
   	  Thanks to Qingbo Cai <qingbo dot cai at case dot edu> for motivating these
-	  comments. 
+	  comments.
 
 Fri Apr  7 19:56:03 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * bin/MakeProjectCreator/config/ciao_events_dnc.mpb
-        
+
           Modified to make CIAO_DnC_Events_Base and CIAO_RT_Event
           libraries explicitly specified in "libs +=" to resolve
           linking errors in BC compilers.
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index 449ab2becbe..0f2590b315c 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_DnC_Events) : orbsvcslib, rtevent_serv, ciao_events_dnc {
+project (CIAO_DnC_Events) : orbsvcslib, rtevent_serv {
 
   after += CIAO_DnC_Events_Base CIAO_RTEvent
   sharedname  = CIAO_DnC_Events
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
index 7374147c444..3254723f95c 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
@@ -2,13 +2,11 @@
 // $Id$
 
 
-project (CIAO_DnC_Events_Base) : orbsvcslib {
+project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_container_dnc, ciao_client_dnc {
 
-  after += CIAO_DnC_Container
   sharedname  = CIAO_DnC_Events_Base
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
   dynamicflags = CIAO_EVENTS_BUILD_DLL
-  libs     += CIAO_DnC_Client CIAO_DnC_Container
 
   IDL_Files {
     CIAO_Events.idl
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
index dcd7487b0cb..595c9cfe8cd 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_RTEvent) : rtevent_serv, ciao_events_dnc {
+project (CIAO_RTEvent) : rtevent_serv {
 
   after += CIAO_DnC_Events_Base
   sharedname  = CIAO_RTEvent
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index 559a9df73b4..ae995bc1548 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
@@ -3,7 +3,7 @@
 
 project : ciao_client_dnc {
   after += Deployment_stub
-  libs  += CIAO_Deployment_stub CIAO_DnC_Events
+  libs  += CIAO_Deployment_stub
   includes += $(CIAO_ROOT)/DAnCE
   idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
 }
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
index 54b45923230..8af458326d8 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -3,7 +3,7 @@
 
 project : ciao_deployment_stub, portableserver {
   after += Deployment_svnt
-  libs  += CIAO_Deployment_svnt CIAO_DnC_Events
+  libs  += CIAO_Deployment_svnt
   includes += $(CIAO_ROOT)/DAnCE/ciao
   idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
 }
diff --git a/bin/MakeProjectCreator/config/ciao_events_dnc.mpb b/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
index 6862a658f8b..cb10421b617 100644
--- a/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : security, ifr_client, valuetype, pi, codecfactory {
-  after    += CIAO_DnC_Container
-  includes   += $(CIAO_ROOT) $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)/ciaosvcs/Events
-  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/ciaosvcs/Events -Sc
-  libs     += CIAO_DnC_Client CIAO_DnC_Container CIAO_DnC_Events_Base CIAO_RTEvent
+project : security, ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc {
+  includes   += $(CIAO_ROOT)/ciaosvcs/Events
+  idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events -Sc
+  libs     += CIAO_DnC_Events
+  after    += CIAO_DnC_Events
 }
diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index abbb05bd2bb..6bc5c8d52a0 100644
--- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_component_dnc, ciao_deployment_svnt, ciaocidldefaults, utils, naming {
+project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming {
   after += CIAO_DnC_Server
-  libs  += CIAO_DnC_Server CIAO_DnC_Events
-
+  libs  += CIAO_DnC_Server
 }
diff --git a/bin/MakeProjectCreator/config/ciao_xml_utils.mpb b/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
index d597fd6e9e6..1167281994f 100644
--- a/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
+++ b/bin/MakeProjectCreator/config/ciao_xml_utils.mpb
@@ -1,9 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : xerces {
+project : xerces, exceptions {
   includes += $(CIAO_ROOT)/tools
   after += CIAO_XML_Utils
-  requires += exceptions
   libs += CIAO_XML_Utils
-}
\ No newline at end of file
+}