ChangeLogTag: Fri Dec 17 06:45:19 2004 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 55 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 50ebd9f93c0..2bd10ecdb1b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Fri Dec 17 06:45:19 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/IFR_Service/drv_args.cpp:
+        * orbsvcs/IFR_Service/drv_preproc.cpp:
+        * orbsvcs/IFR_Service/tao_idl.cpp:
+
+          Created IFR_Service counterparts to these files that only #include
+          the original from TAO_IDL.  This has been brought about due to the
+          differences between BE_GlobalData from the TAO_IDL_BE and the
+          TAO_IFR_BE.  VPATH, which was previously used, causes the object
+          files from these files to be taken from the TAO_IDL build which
+          do not work when tao_ifr is created from them.  See the comment in
+          each of these files for more detail.
+
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+
+          Removed the VPATH portion and changed to reference the new files
+          instead of the ones from TAO_IDL.
+
 Thu Dec 16 09:41:35 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * examples/Simple/time-date/svc.conf:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index 24be752e996..85c9f9b9ddb 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -55,14 +55,12 @@ project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba {
     else
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(subst \\,\\,$(TAO_IDL_PREPROCESSOR))\\\"
     endif
-    
-    VPATH = $(TAO_ROOT)/TAO_IDL $(TAO_ROOT)/TAO_IDL/driver
   }
 
   Source_Files {
-    $(TAO_ROOT)/TAO_IDL/driver/drv_args.cpp
-    $(TAO_ROOT)/TAO_IDL/driver/drv_preproc.cpp
-    $(TAO_ROOT)/TAO_IDL/tao_idl.cpp
+    drv_args.cpp
+    drv_preproc.cpp
+    tao_idl.cpp
   }
   
   Header_Files {
diff --git a/TAO/orbsvcs/IFR_Service/drv_args.cpp b/TAO/orbsvcs/IFR_Service/drv_args.cpp
new file mode 100644
index 00000000000..d7f5a0951ff
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/drv_args.cpp
@@ -0,0 +1,11 @@
+// -*- C++ -*-
+// $Id$
+
+// This file is here to avoid the use of VPATH.  Since the TAO_IDL
+// counterparts are built with a different BE_GlobalData definition, the
+// object files built in the TAO_IDL directory are not usable in the
+// IFRService.  The BE_GlobalData is larger in TAO_IDL than it is in
+// IFRService which causes problems when be_global is deleted.
+//  -- Chad Elliott 12/16/2004
+
+#include "TAO_IDL/driver/drv_args.cpp"
diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
new file mode 100644
index 00000000000..a277283542d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
@@ -0,0 +1,11 @@
+// -*- C++ -*-
+// $Id$
+
+// This file is here to avoid the use of VPATH.  Since the TAO_IDL
+// counterparts are built with a different BE_GlobalData definition, the
+// object files built in the TAO_IDL directory are not usable in the
+// IFRService.  The BE_GlobalData is larger in TAO_IDL than it is in
+// IFRService which causes problems when be_global is deleted.
+//  -- Chad Elliott 12/16/2004
+
+#include "TAO_IDL/driver/drv_preproc.cpp"
diff --git a/TAO/orbsvcs/IFR_Service/tao_idl.cpp b/TAO/orbsvcs/IFR_Service/tao_idl.cpp
new file mode 100644
index 00000000000..90a26b11e50
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/tao_idl.cpp
@@ -0,0 +1,11 @@
+// -*- C++ -*-
+// $Id$
+
+// This file is here to avoid the use of VPATH.  Since the TAO_IDL
+// counterparts are built with a different BE_GlobalData definition, the
+// object files built in the TAO_IDL directory are not usable in the
+// IFRService.  The BE_GlobalData is larger in TAO_IDL than it is in
+// IFRService which causes problems when be_global is deleted.
+//  -- Chad Elliott 12/16/2004
+
+#include "TAO_IDL/tao_idl.cpp"