ChangeLogTag: Mon Jan 26 09:32:58 2004 Chad Elliott <elliott_c@ociweb.com>

7 files changed, 79 insertions, 82 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dc8bdca4adf..1711f775a76 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,15 +1,36 @@
+Mon Jan 26 09:32:58 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc:
+
+          Used the utils and ftrteventchannel base projects instead of
+          duplicating the information in this mpc file.
+
+        * orbsvcs/orbsvcs/FTORB.mpc:
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+
+          Cleaned up these mpc files in hopes to fix some build problems.
+
+        * tao/Utils/Utils.mpc:
+
+          Updated this file to take template files into account.
+
+        * tao/Utils/tao_Utils.mpc:
+
+          Removed this file.  It was redundant.
+
 Sun Jan 25 10:25:07 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* orbsvcs/examples/ORT/Object_Factory_i.cpp:
+        * orbsvcs/examples/ORT/Object_Factory_i.cpp:
 
-	  Fixed compilation errors in VC6 builds.
+          Fixed compilation errors in VC6 builds.
 
 Sun Jan 25 11:16:43 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	* examples/Simple/time-date/Simple_time_date.mpc:
-	* tests/Smart_Proxies/Smart_Proxies.mpc:
-	  Use taoserver and taoclient so that executable names are in the
-	  way the run_test.pl scripts expects them.
+        * examples/Simple/time-date/Simple_time_date.mpc:
+        * tests/Smart_Proxies/Smart_Proxies.mpc:
+          Use taoserver and taoclient so that executable names are in the
+          way the run_test.pl scripts expects them.
 
 Fri Jan 23 11:10:00 2004  Gary Maxey <gary.maxey@hp.com>
 
@@ -30,12 +51,12 @@ Fri Jan 23 11:43:25 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
           Thu Jan 22 16:14:49 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-		  to the necessary class signatures.
+                  to the necessary class signatures.
 
-		* TAO_IDL/be/be_visitor_arg_traits (visit_array):
+                * TAO_IDL/be/be_visitor_arg_traits (visit_array):
 
-		  Added code generation for the tag template parameter corresponding
-		  to the changes listed above.
+                  Added code generation for the tag template parameter corresponding
+                  to the changes listed above.
 
 Thu Jan 22 19:37:21 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -128,7 +149,7 @@ Wed Jan 22 11:33:47 2004  Scott Harris <harris_s@ociweb.com>
 
         * utils/utils.mwc:
           Added wxNamingViewer. must have wxwindows=1 in default.features
-	  to generate the Makefile.
+          to generate the Makefile.
 
           Also see $ACE_ROOT/OCIChangeLog for files changed to
           support wxwindows base project for MPC.
@@ -167,38 +188,38 @@ Wed Jan 21 16:35:47 2004  Scott Harris <harris_s@ociweb.com>
         * orbsvcs/orbsvcs/IFRService/Options.h:
         * orbsvcs/orbsvcs/IFRService/Options.cpp:
           Added "-m" option to IFR_Service to enable multicast discovery
-	  of the service.  Earlier "-m" was used to enable locking but
-	  that option has been changed to "-l".
+          of the service.  Earlier "-m" was used to enable locking but
+          that option has been changed to "-l".
 
           Note: IFR_Service was changed to not support multicast discovery
-	  as part of a large change:
+          as part of a large change:
 
           Wed Mar 12 09:49:00 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-	  after the 1.3.1 release by changing the default value of
+          after the 1.3.1 release by changing the default value of
           the use_multicast_server parameter of
-	  TAO_IFR_Server::init_with_orb in
-	  orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h.
+          TAO_IFR_Server::init_with_orb in
+          orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h.
 
         * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
         * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:
           Fixed test scripts so they would find tao_ifr.exe in
-	  %ACE_ROOT%\bin or %TAO_ROOT%\orbsvcs\IFR_Service since the
-	  *.DSPs in the repository put it in one place and the *.DSPs
-	  generated by MPC put it in another. This technique also works on
-	  Unix builds.
+          %ACE_ROOT%\bin or %TAO_ROOT%\orbsvcs\IFR_Service since the
+          *.DSPs in the repository put it in one place and the *.DSPs
+          generated by MPC put it in another. This technique also works on
+          Unix builds.
 
         * orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:
         * orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl:
         * orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:
           Add " -o $iorfile" to command line of IFR_Service so if $iorfile
-	  is changed from if_repo.ior in the run_test.pl script it will
-	  still work.
+          is changed from if_repo.ior in the run_test.pl script it will
+          still work.
 
         * orbsvcs/tests/InterfaceRepo/IFR_Test/README:
         * orbsvcs/tests/InterfaceRepo/Persistence_Test/README:
           Updated tests and test documentation to work with IFR_Service
-	  that does not default to multicast discovery support.
+          that does not default to multicast discovery support.
 
 Wed Jan 21 11:26:10 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
index f79eae47ee3..dfda930d86d 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
@@ -1,12 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRT_Event_Service) : orbsvcsexe,  rtschedevent, ftrtevent, ftorbutils {
-  exename = ftrt_eventservice
-  includes += $(TAO_ROOT)/orbsvcs $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel
-  after += FTRT_EventChannel
-  libs += TAO_Utils TAO_FTRT_EventChannel
-  specific(gnuace) {
-   lit_libs += TAO_Strategies
-  }
-}
\ No newline at end of file
+project(FTRT_Event_Service): orbsvcsexe, utils, rtschedevent, ftrteventchannel, ftorbutils {
+  exename   = ftrt_eventservice
+  includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
+}
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 833bca1ad3b..f263a6814b8 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,22 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver {
+project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, minimum_corba {
   sharedname   = TAO_FTORB_Utils
   idlflags    += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
   tagchecks   += FTORB_Utils
-  // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
-  avoids      += minimum_corba
 
   IDL_Files {
     PortableGroup_Simple_DS.idl
   }
 
   IDL_Files {
-  idlflags    += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h
-  FT_CORBA_ORB.idl 
+    idlflags += -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance/FT_ORB_Utils_export.h
+    FT_CORBA_ORB.idl 
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
@@ -29,15 +26,11 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver {
   }
 }
 
-project(FT_ClientORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup{
+project(FT_ClientORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup, minimum_corba {
   sharedname   = TAO_FT_ClientORB
-  idlflags    += -Wb,export_macro=TAO_FT_ServerORB_Export -Wb,export_include=FaultTolerance/FT_ServerORB_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL
   tagchecks   += FT_ClientORB
   libs        += TAO_FTORB_Utils
-  // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
-  avoids      += minimum_corba
 
   IDL_Files {
   }
@@ -57,15 +50,11 @@ project(FT_ClientORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, porta
   }
 }
 
-project(FT_ServerORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup{
+project(FT_ServerORB) : orbsvcslib, ftorbutils, core, iormanip, messaging, portablegroup, minimum_corba {
   sharedname   = TAO_FT_ServerORB
-  idlflags    += -Wb,export_macro=TAO_FT_ServerORB_Export -Wb,export_include=FaultTolerance/FT_ServerORB_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_SERVERORB_BUILD_DLL
   tagchecks   += FT_ServerORB
   libs        += TAO_FTORB_Utils
-  // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
-  avoids      += minimum_corba
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 4c9d45f98c6..5daddacf7de 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -2,11 +2,10 @@
 // $Id$
 
 project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming {
-
-  sharedname = TAO_FtRtEvent
-  idlflags   += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h
+  sharedname   = TAO_FtRtEvent
+  idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h
   dynamicflags = TAO_FTRTEVENT_BUILD_DLL
-  tagchecks   = FtRtEvent
+  tagchecks    = FtRtEvent
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
@@ -36,12 +35,14 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming {
 }
 
 project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
-  sharedname = TAO_FTRT_ClientORB
+  sharedname   = TAO_FTRT_ClientORB
   dynamicflags = TAO_FTRT_BUILD_DLL
-  tagchecks   = FTRT_ClientORB
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB
+  tagchecks    = FTRT_ClientORB
+  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/ClientORB
+
   IDL_Files {
   }
+
   Source_Files  (ORBSVCS_COMPONENTS) {
     FTRT_ClientORB {
       FtRtEvent/ClientORB
@@ -49,13 +50,13 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, core {
   }
 }
 
-project (FTRT_EventChannel) :  orbsvcslib, ftrtevent {
-  sharedname = TAO_FTRT_EventChannel
+project (FTRT_EventChannel) :  orbsvcslib, ftrtevent, utils {
+  sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
-  tagchecks   = FTRT_EventChannel
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
-  after    += Utils
-  libs     += TAO_Utils
+  tagchecks    = FTRT_EventChannel
+  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel
+  after       += FTORB_Utils
+
   IDL_Files {
   }
 
@@ -66,11 +67,9 @@ project (FTRT_EventChannel) :  orbsvcslib, ftrtevent {
     }
   }
   Template_Files {
-    default {
-      FtRtEvent/EventChannel/ConnectionHandler_T.cpp
-      FtRtEvent/EventChannel/Fault_Detector_T.cpp
-      FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
-    }
+    FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+    FtRtEvent/EventChannel/Fault_Detector_T.cpp
+    FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
   }
 
   Header_Files {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index d1856e4dc47..53b16857a6d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, messaging, iormanip {
+project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, messaging, iormanip, minimum_corba {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
   tagchecks   += PortableGroup
-  avoids      += minimum_corba
   after       += FTORB_Utils
 
   IDL_Files {
@@ -16,7 +15,6 @@ project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, me
   IDL_Files {
     idlflags += -GC
     PortableGroup.idl
-    PortableGroup_Simple_DS.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
diff --git a/TAO/tao/Utils/Utils.mpc b/TAO/tao/Utils/Utils.mpc
index 565f93808d9..ba2c6abd840 100644
--- a/TAO/tao/Utils/Utils.mpc
+++ b/TAO/tao/Utils/Utils.mpc
@@ -1,6 +1,13 @@
+// -*- MPC -*-
 // $Id$
 
 project : taolib, core, portableserver {
   sharedname    = TAO_Utils
   dynamicflags  = TAO_UTILS_BUILD_DLL
+
+  Template_Files {
+    RIR_Narrow.cpp
+    Servant_Var.cpp
+    Server_Main.cpp
+  }
 }
diff --git a/TAO/tao/Utils/tao_Utils.mpc b/TAO/tao/Utils/tao_Utils.mpc
deleted file mode 100644
index 2af9d69b6f8..00000000000
--- a/TAO/tao/Utils/tao_Utils.mpc
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, portableserver {
-  sharedname = TAO_Utils
-  dynamicflags = TAO_UTILS_BUILD_DLL
-  source_files {
-   ORB_Destroyer.cpp
-   Implicit_Deactivator.cpp
-   PolicyList_Destroyer.cpp
-  }
-}