summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-29 21:58:24 +0000
committermichel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-29 21:58:24 +0000
commit8780a15ee2f0b7356f88353b0bf1b98c414501ea (patch)
tree5f1c11446fa1281193755d67aa0fbda03b0db2dc
parent324b363f827b51643054c5991d1ed41b11c193bf (diff)
downloadATCD-8780a15ee2f0b7356f88353b0bf1b98c414501ea.tar.gz
Fri Aug 29 17:00:00 2003 Justin Michel <michel_j@ociweb.com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc17
2 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 83f4a5a0bc2..3d0c8dcea3a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug 29 17:00:00 2003 Justin Michel <michel_j@ociweb.com>
+
+ * orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc:
+
+ Corrected this to make use of the proper base projects, and added
+ requires += ec_typed_events so that this test won't be built
+ if typed events are disabled.
+
Fri Aug 29 15:18:36 UTC 2003 Don Hinton <dhinton@dresystems.com>
* orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.[h,cpp]:
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
index 7cdc552b7ed..741620168bf 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
@@ -1,18 +1,19 @@
-project(*Consumer) : event, taoserver {
+project(*Consumer) : event, orbsvcsexe, portableserver {
+ requires += ec_typed_events
+ idlflags += -I$(TAO_ROOT)/orbsvcs
source_files {
Consumer.cpp
Country_i.cpp
}
-
- includes += $(TAO_ROOT)/orbsvcs
- idlflags += -I$(TAO_ROOT)/orbsvcs
}
-project(*Supplier) : event, taoserver {
+project(*Supplier) : event, orbsvcsexe, portableserver {
+ requires += ec_typed_events
+ after += CosEC_TypedSimple_Consumer
+ idl_files {
+ }
source_files {
+ CountryC.cpp
Supplier.cpp
}
-
- includes += $(TAO_ROOT)/orbsvcs
- idlflags += -I$(TAO_ROOT)/orbsvcs
} \ No newline at end of file