ChangeLogTag: Fri Feb 25 12:00:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 32 insertions, 55 deletions

diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
index 6964397151e..3cb7b9dcc3b 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
+++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, ami  {
+project(*client) : taoexe, portableserver, ami, exceptions  {
   requires += exceptions
   source_files {
     client.cpp
@@ -9,8 +9,7 @@ project(*client) : taoexe, portableserver, ami  {
   }
 }
 
-project(*server) : taoexe, portableserver, ami {
-  requires += exceptions
+project(*server) : taoserver, ami, exceptions {
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
index edaddf509bd..9dc94002fd8 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba  {
-  requires += exceptions
+project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions {
   source_files {
     client.cpp
     Stock_Consumer.cpp
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba {
-  requires += exceptions
+project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions {
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
index 88549e96b4c..b2c40ecdac1 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : orbsvcsexe, portableserver, naming  {
-  requires += exceptions
+project(*client) : orbsvcsexe, portableserver, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../idl
@@ -11,8 +10,7 @@ project(*client) : orbsvcsexe, portableserver, naming  {
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, naming {
-  requires += exceptions
+project(*server) : orbsvcsexe, portableserver, naming, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../idl
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
index a6df82cb29a..f03c0f6733d 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, naming, ami, minimum_corba  {
-  requires += exceptions
+project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exceptions  {
   source_files {
     client.cpp
     Handler_i.cpp
   }
 }
 
-project(*server) : taoexe, portableserver, naming, ami, minimum_corba {
-  requires += exceptions
+project(*server) : taoserver, naming, ami, minimum_corba, exceptions {
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
index 5134a909130..b28a8ee9d5d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba  {
-  requires += exceptions
+project(*client) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba, exceptions {
   source_files {
     client.cpp
     Stock_Consumer.cpp
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba {
-  requires += exceptions
+project(*server) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba, exceptions {
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
index d07d50d9ded..a77542f12ee 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -1,9 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoexe, portableserver {
+project : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
index 2178e744e80..fb71f91e9f1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
@@ -1,21 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, rtevent, naming  {
+project(*client) : taoexe, portableserver, rtevent, naming, exceptions  {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver, rtevent, naming, iortable {
+project(*server) : taoserver, rtevent, naming, iortable, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index d7152082ec0..984a4c86db8 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -1,7 +1,6 @@
 // $Id$
-project : taoexe, portableserver, minimum_corba {
+project : taoserver, minimum_corba, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
index 22b2c4cb456..28e9ac91d0f 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -1,21 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
+project(*client) : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver {
+project(*server) : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
   source_files {
     server.cpp
     Stock_Factory_i.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
index d07d50d9ded..82e81030a07 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -1,9 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoexe, portableserver {
+project : taoserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
   includes += ../../idl
-  requires += exceptions
 }
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
index 18a928d78f0..f54c3ba2a47 100644
--- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -1,15 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
-  requires += exceptions corba_messaging
+project(*client) : taoclient, exceptions {
+  requires += corba_messaging
   source_files {
+    timeC.cpp
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver {
-  requires += exceptions
+project(*server) : taoserver, exceptions {
   source_files {
     server.cpp
   }
diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
index 80ae0c47358..f27685e74cf 100644
--- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
+++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
@@ -1,15 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
-  requires += exceptions dummy_label
+project(*client) : taoexe, portableserver, exceptions {
+  requires += dummy_label
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver {
-  requires += exceptions dummy_label
+project(*server) : taoserver, exceptions {
+  requires += dummy_label
   source_files {
     server.cpp
     icp.cpp
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index 396f6695099..a10fd0f0bcd 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -12,8 +12,7 @@ project(*Server): orbsvcsexe, fault_tolerance, tmcast {
   }
 }
 
-project(*Client): taoexe, fault_tolerance {
-  requires += exceptions
+project(*Client): taoexe, fault_tolerance, exceptions {
   includes += $(TAO_ROOT)/orbsvcs
 
   Source_Files {
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
index e66a958bbfb..694e649ec4b 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
@@ -1,6 +1,5 @@
 // $Id$
-project : orbsvcsexe, portableserver {
-  requires += exceptions
+project : orbsvcsexe, portableserver, exceptions {
   exename   = combined_service
   source_files {
     combined.cpp
@@ -12,8 +11,7 @@ project : orbsvcsexe, portableserver {
   }
 }
 
-project(*Controller) : orbsvcsexe {
-  requires += exceptions
+project(*Controller) : orbsvcsexe, exceptions {
   exename   = controller
   source_files {
     controller.cpp
@@ -25,8 +23,7 @@ project(*Controller) : orbsvcsexe {
 }
 
 // A client that uses corba to test out basic imr functionality
-project(*Test) : orbsvcsexe {
-  requires += exceptions
+project(*Test) : orbsvcsexe, exceptions {
   source_files {
     test.cpp
     testC.cpp
@@ -39,8 +36,7 @@ project(*Test) : orbsvcsexe {
 // A server to use with the imr
 // The gnuace specific portion is to prevent the test.idl from being compiled
 // multiple times and causing invalid object files to be created.
-project(*TestServer) : orbsvcsexe, portableserver, iortable {
-  requires += exceptions
+project(*TestServer) : orbsvcsexe, portableserver, iortable, exceptions {
   specific(gnuace) {
     after += *Test
   }
@@ -58,8 +54,7 @@ project(*TestServer) : orbsvcsexe, portableserver, iortable {
 // combined_service.
 // The gnuace specific portion is to prevent the test.idl from being compiled
 // multiple times and causing invalid object files to be created.
-project(*DynamicServer) : taolib_with_idl, portableserver, iortable {
-  requires    += exceptions
+project(*DynamicServer) : taolib_with_idl, portableserver, iortable, exceptions {
   dynamicflags = DYNSERVER_BUILD_DLL
   sharedname   = DynServer
   specific(gnuace) {
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index 91a24c347dc..9b53614a46f 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -1,7 +1,6 @@
 // $Id$
-project(*Server): taoexe, loadbalancing {
+project(*Server): taoexe, loadbalancing, exceptions {
   includes += $(TAO_ROOT)/orbsvcs
-  requires += exceptions
   Source_Files {
     ServerRequestInterceptor.cpp
     ORBInitializer.cpp