From c4e83c7c3e6d8bd8cb090f9e8f33271acc0eaf93 Mon Sep 17 00:00:00 2001
From: bala <balanatarajan@users.noreply.github.com>
Date: Sun, 4 Jul 2004 16:15:47 +0000
Subject: ChangeLogTag:Sun Jul  4 11:14:03 2004  Balachandran Natarajan 
 <bala@dre.vanderbilt.edu>

---
 TAO/CIAO/CIAO.mwc                    |  2 +-
 TAO/CIAO/ChangeLog                   | 11 ++++++
 TAO/CIAO/DAnCE/ciao/CCM_Core.mpc     | 66 ++++++++++++++++++++----------------
 TAO/CIAO/DAnCE/ciao/Container_Base.h |  1 +
 4 files changed, 49 insertions(+), 31 deletions(-)

(limited to 'TAO/CIAO')

diff --git a/TAO/CIAO/CIAO.mwc b/TAO/CIAO/CIAO.mwc
index 55f66e36e8b..71765646cf0 100644
--- a/TAO/CIAO/CIAO.mwc
+++ b/TAO/CIAO/CIAO.mwc
@@ -2,7 +2,7 @@
 // $Id$
 
 workspace {
-  DnC
   ciao
   tools
+  DAnCE
 }
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index f6b3ba75cb6..3a5f1ffaa0b 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Sun Jul  4 11:14:03 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* DAnCE/ciao/CCM_Core.mpc:
+
+	  Restructured things so that CIAO_DnC_Server doesn't need to be
+	  linked with stub projects. 
+	
+	* DAnCE/ciao/Container_Base.h:
+
+	  Added an include for the xport file. 
+	
 Sun Jul  4 10:17:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* DAnCE/ciao/CCM_Core.mpc:
diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 27a72e7640f..7d56e4ea23f 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -56,40 +56,12 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, iorintercep
     CCM_ComponentS.cpp
     Cookies.cpp
   }
-}
-
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security {
-  after        += CIAO_DnC_Container
-  sharedname   =  CIAO_DnC_Server
-  libs         += CIAO_DnC_Client CIAO_DnC_Container
-  idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
-  dynamicflags =  CIAO_SERVER_BUILD_DLL
-
-  IDL_Files {
-    Deployment_Core.idl
-  }
-
-  Source_Files {
-    Deployment_CoreC.cpp
-    Deployment_CoreS.cpp
-    Container_Base.cpp
-    NodeApplication_Impl.cpp
-    Server_init.cpp
-    Servant_Impl_Base.cpp
-  }
 
-  Header_Files {
-    CIAO_Server_Export.h
-    CIAO_common.h
-  }
-
-  Template_Files {
-    Servant_Impl_T.cpp
-  }
 }
 
-project(Deployment_stub) : taolib_with_idl, valuetype, ciao_server_dnc {
+project(Deployment_stub) : taolib_with_idl {
   sharedname   =  Deployment_stub
+  after        += CIAO_DnC_Client
 
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
@@ -100,12 +72,14 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ciao_server_dnc {
 
   IDL_Files {
     NodeApplication_CallBack.idl
+    Deployment_Core.idl
     Deployment_Base.idl
     Deployment_Data.idl
     Deployment.idl
   }
 
   Source_Files {
+    Deployment_CoreC.cpp
     Deployment_BaseC.cpp
     Deployment_DataC.cpp
     DeploymentC.cpp
@@ -127,10 +101,42 @@ project(Deployment_svnt) : taolib_with_idl, portableserver{
   }
 
   Source_Files {
+    Deployment_CoreS.cpp
     Deployment_BaseS.cpp
     Deployment_DataS.cpp
     DeploymentS.cpp
     NodeApp_CB_Impl.cpp
     NodeApplication_CallBackS.cpp
   }
+
 }
+
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security {
+  after        += CIAO_DnC_Container Deployment_svnt
+  sharedname   =  CIAO_DnC_Server
+  libs         += CIAO_DnC_Client CIAO_DnC_Container Deployment_svnt Deployment_stub
+  idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
+  dynamicflags =  CIAO_SERVER_BUILD_DLL
+
+  IDL_Files {
+
+  }
+
+  Source_Files {
+    Container_Base.cpp
+    NodeApplication_Impl.cpp
+    Server_init.cpp
+    Servant_Impl_Base.cpp
+  }
+
+  Header_Files {
+    CIAO_Server_Export.h
+    CIAO_common.h
+  }
+
+  Template_Files {
+    Servant_Impl_T.cpp
+  }
+}
+
+
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index fe25c4ab113..2a618114c7d 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -22,6 +22,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "CCM_ContainerC.h"
 #include "Deployment_CoreC.h"
+#include "CIAO_Server_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-- 
cgit v1.2.1