summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2003-09-08 12:08:35 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2003-09-08 12:08:35 +0000
commitb8f37229a533dd74ac3a98e3cfafdcb562c938a8 (patch)
treee5466c1f89e5d5edabc6f4b6947cd543fc13f451
parentd5c1a8ebf866be116cceca0b5504ff294208da8a (diff)
downloadATCD-b8f37229a533dd74ac3a98e3cfafdcb562c938a8.tar.gz
ChangeLogTag: Mon Sep 8 07:06:38 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog17
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc14
2 files changed, 23 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a74d3e49a6e..4dd5d810311 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 8 07:06:38 2003 Chad Elliott <elliott_c@ociweb.com>
+
+ * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+
+ Force the client and admin projects to be built after the server
+ to avoid problems with processing the idl file in parallel.
+
Sun Sep 7 14:15:34 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* tao/ORB.cpp:
@@ -8,18 +15,18 @@ Sun Sep 7 13:59:20 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/orbsvcs/IFRService/tmplinst.cpp:
- Fixed typo and added #include of OperationDef_i.h.
+ Fixed typo and added #include of OperationDef_i.h.
Sun Sep 7 09:50:38 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
- * orbsvcs/orbsvcs/IFRService/tmplinst.cpp:
+ * orbsvcs/orbsvcs/IFRService/tmplinst.cpp:
- Fixed incorrect preprocessor conditional expression.
+ Fixed incorrect preprocessor conditional expression.
Sat Sep 6 08:08:19 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
- * tao/GIOPC.h:
- * tao/target_specification.h:
+ * tao/GIOPC.h:
+ * tao/target_specification.h:
#undef "IOR" (for HPUX) after all headers have been included to
make sure it isn't indirectly redefined by other headers.
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index 5d58c32e4d0..8ed89deda41 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -4,10 +4,18 @@ project(*Server): messaging, taoserver, corba_messaging {
server.cpp
}
}
-
+
+// These next two projects depend on *Server (the above project)
+// due to the possibility of parallelism for the GNUACE type. If
+// -j 2 or more is used to build this project, multiple instances
+// of tao_idl are invoked for Test.idl. They begin to overwrite the
+// generated source files and cause problems for the processes that
+// have gone on to build the generated files. By depending on *Server,
+// only one process is allowed to compile Test.idl and thus the build
+// succeeds.
project(*Client): messaging, taoserver, corba_messaging {
exename = client
-
+ after += *Server
Source_Files {
TestC.cpp
client.cpp
@@ -16,7 +24,7 @@ project(*Client): messaging, taoserver, corba_messaging {
project(*Admin): messaging, taoserver, corba_messaging {
exename = admin
-
+ after += *Server
Source_Files {
Oneway_Buffering_Admin.cpp
admin.cpp