Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com>

26 files changed, 80 insertions, 103 deletions

diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 362f8298df3..02dcbb6fde1 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,4 +1,4 @@
-project(st_server): server, strategies {
+project(*st_server): taoserver, strategies {
   idlflags += -GH
   exename   = st_server
   requires += ami
@@ -11,7 +11,7 @@ project(st_server): server, strategies {
   }
 }
 
-project(mt_server): server, strategies  {
+project(*mt_server): taoserver, strategies  {
   idlflags += -GH
   exename   = mt_server
   requires += ami
@@ -25,7 +25,7 @@ project(mt_server): server, strategies  {
   }
 }
 
-project: client, strategies  {
+project(*client): taoclient, strategies  {
   idlflags += -GH
   requires += ami
 
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 70192acb8d9..124e552d238 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,4 +1,4 @@
-project(progress): server, strategies {
+project(*progress): taoserver, strategies, messaging {
   exename   = progress
   idlflags -= -Sc
   idlflags += -GC
@@ -10,7 +10,7 @@ project(progress): server, strategies {
   }
 }
 
-project(peer): server, strategies {
+project(*peer): taoserver, strategies, messaging {
   exename   = peer
   idlflags -= -Sc
   idlflags += -GC
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index e9b77440891..d71411e1c13 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,4 +1,4 @@
-project(notifier): namingexe {
+project(Callback_Quoter notifier): namingexe {
   exename = notifier
 
   Source_Files {
@@ -8,7 +8,7 @@ project(notifier): namingexe {
   }
 }
 
-project(consumer): namingexe {
+project(Callback_Quoter consumer): namingexe {
   exename = consumer
 
   Source_Files {
@@ -20,7 +20,7 @@ project(consumer): namingexe {
   }
 }
 
-project(supplier): namingexe {
+project(Callback_Quoter supplier): namingexe {
   exename = supplier
 
   Source_Files {
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 5ac07b1b324..627f92f277e 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(*Server): namingexe {
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
@@ -6,7 +6,7 @@ project: namingexe {
   }
 }
 
-project(client): namingexe {
+project(*Client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index b1b1f5da373..dd25d035714 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,4 +1,4 @@
-project(notifier): namingexe {
+project(*notifier): namingexe {
   exename = notifier
 
   Source_Files {
@@ -8,7 +8,7 @@ project(notifier): namingexe {
   }
 }
 
-project(consumer): namingexe {
+project(*consumer): namingexe {
   exename = consumer
 
   Source_Files {
@@ -19,7 +19,7 @@ project(consumer): namingexe {
   }
 }
 
-project(supplier): namingexe {
+project(*supplier): namingexe {
   exename = supplier
 
   Source_Files {
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 21318ae94b9..635e94b0f66 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,4 +1,4 @@
-project: server {
+project(*server): taoserver {
   avoids += repo
 
   IDL_Files {
@@ -15,7 +15,7 @@ project: server {
   }
 }
 
-project(client): server {
+project(*Client): taoserver {
   exename = client
   avoids += repo
 
@@ -31,7 +31,7 @@ project(client): server {
   }
 }
 
-project(load balancer): server {
+project(*Balancer): taoserver {
   exename = load_balancer
   avoids += repo
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index a41882d9b92..082a1d6ab18 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,4 +1,4 @@
-project(load balancer): server {
+project(*balancer): taoserver {
   avoids += minimum_corba repo
   exename = load_balancer
 
@@ -14,7 +14,7 @@ project(load balancer): server {
   }
 }
 
-project: server {
+project(*server): taoserver {
   avoids += minimum_corba repo
 
   Source_Files {
@@ -26,7 +26,7 @@ project: server {
   }
 }
 
-project(client): server {
+project(*client): taoserver {
   avoids += minimum_corba repo
   exename = client
 
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index b22b4d27270..772fee77d2c 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,4 +1,4 @@
-project(Logging Service): namingexe {
+project(*Service): namingexe {
   exename = Logging_Service
   comps  += LifeCycle
 
@@ -9,7 +9,7 @@ project(Logging Service): namingexe {
   }
 }
 
-project(Logging Test): namingexe {
+project(*Test): namingexe {
   exename = Logging_Test
   comps  += LifeCycle
 
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index d7c18dda87c..07d5ab802d5 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,4 +1,6 @@
-project: server {
+project(*server): taoserver {
+  idlflags += -Gv
+
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
@@ -7,8 +9,9 @@ project: server {
   }
 }
 
-project(client): server {
+project(*client): taoserver {
   exename   = client
+  idlflags += -Gv
 
   Source_Files {
     Client_i.cpp
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 92133998162..ed4c9f9a98a 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,4 +1,4 @@
-project: server {
+project(*server): taoserver {
   Source_Files {
     Grid_i.cpp
     Simple_util.cpp
@@ -6,7 +6,7 @@ project: server {
   }
 }
 
-project(client): server {
+project(*client): taoserver {
   exename = client
 
   Source_Files {
@@ -17,7 +17,7 @@ project(client): server {
   }
 }
 
-project(persistent client): server {
+project(*persistent client): taoserver {
   exename = persistent_client
 
   Source_Files {
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
index 14fec0011b0..10149161cbe 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
+++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   idlflags += -Sp -Sd
 
   Source_Files {
@@ -8,7 +8,7 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*client): taoserver, strategies {
   idlflags += -Sp -Sd
   exename   = client
 
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
index 26d2f25a243..368621c5a6a 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   idlflags += -Sd -Sp
 
   Source_Files {
@@ -7,7 +7,7 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*client): taoserver, strategies {
   idlflags += -Sd -Sp
   exename   = client
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
index a021b4a7027..db6fa1ec983 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   idlflags += -Sp -Sd
 
   Source_Files {
@@ -7,7 +7,7 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*client): taoserver, strategies {
   idlflags += -Sp -Sd
   exename   = client
 
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 24b184b267c..95ded085b6e 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -1,47 +1,35 @@
-project: namingexe {
-  libs     += TAO_CosLifeCycle
-  depends  += CosLifeCycle
-  idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
-
+// todo : Once MPC is used for everything, we should consider
+//        removing the includes += lines below, and updating
+//        the source code instead.
+project(*server): namingexe, lifecycle {
+  idlflags += -I../../orbsvcs/orbsvcs
+  includes += ../../orbsvcs/orbsvcs
   Source_Files {
     server.cpp
     Quoter_i.cpp
   }
 }
 
-project(client): namingexe {
-  libs     += TAO_CosLifeCycle
-  depends  += CosLifeCycle
-  idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
-  exename   = client
-
+project(*client): namingexe, lifecycle {
+  idlflags += -I../../orbsvcs/orbsvcs
+  includes += ../../orbsvcs/orbsvcs
   Source_Files {
     client.cpp
   }
 }
 
-project(Factory Finder): namingexe {
-  libs     += TAO_CosLifeCycle
-  depends  += CosLifeCycle
-  idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
-  exename   = Factory_Finder
-
+project(*Factory Finder): namingexe, lifecycle {
+  idlflags += -I../../orbsvcs/orbsvcs
+  includes += ../../orbsvcs/orbsvcs
   Source_Files {
     Factory_Finder.cpp
     Factory_Finder_i.cpp
   }
 }
 
-project(Generic Factory): namingexe {
-  libs     += TAO_CosLifeCycle
-  depends  += CosLifeCycle
-  idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
-  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
-  exename   = Generic_Factory
-
+project(*Generic Factory): namingexe, lifecycle {
+  idlflags += -I../../orbsvcs/orbsvcs
+  includes += ../../orbsvcs/orbsvcs
   Source_Files {
     Generic_Factory.cpp
     Generic_Factory_i.cpp
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index 1bc5a6338c8..dde5d3790d3 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -1,4 +1,8 @@
-project(activity): namingexe, rt_server {
-  exename = activity
+project: namingexe, rt_server {
+  exename      = activity
+  // todo : This doesn't make any sense for an EXE. What is the
+  // code really supposed to look like? MPC will not let you add 
+  // dynamicflags to an exe project anyway, so the following is ignored.
+  dynamicflags = ACTIVITY_BUILD_DLL
 }
 
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 8615c64144f..69e76d79e35 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(*server): namingexe {
   Source_Files {
     Account_i.cpp
     AccountManager_i.cpp
@@ -7,7 +7,7 @@ project: namingexe {
   }
 }
 
-project(client): namingexe {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index eed382a580a..d4ef4c0e1ad 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,36 +1,15 @@
-project: server {
-  depends += IORTable
-  libs    += TAO_IORTable
-
-  IDL_Files {
-    Receiver.idl
-    Broadcaster.idl
-  }
-
+project(*server) : taoserver, iortable {
   Source_Files {
-    ReceiverS.cpp
-    ReceiverC.cpp
-    BroadcasterC.cpp
-    BroadcasterS.cpp
     Broadcaster_i.cpp
     Server_i.cpp
     server.cpp
   }
 }
 
-project(client): server {
+project(*client): taoserver {
   exename = client
 
-  IDL_Files {
-    Receiver.idl
-    Broadcaster.idl
-  }
-
   Source_Files {
-    ReceiverS.cpp
-    ReceiverC.cpp
-    BroadcasterC.cpp
-    BroadcasterS.cpp
     Receiver_i.cpp
     Client_i.cpp
     client.cpp
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index a0f7eb00824..b6030da410b 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(*server): namingexe {
   Source_Files {
     Echo_i.cpp
     ../Simple_util.cpp
@@ -6,7 +6,7 @@ project: namingexe {
   }
 }
 
-project(client): namingexe {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index c78abd91e73..9990fd4234d 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(*server): namingexe {
   Source_Files {
     Grid_i.cpp
     server.cpp
@@ -6,7 +6,7 @@ project: namingexe {
   }
 }
 
-project(client): namingexe {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/time-date/time_date.mpc b/TAO/examples/Simple/time-date/time_date.mpc
index f9a579d1500..1d3015cb3f1 100644
--- a/TAO/examples/Simple/time-date/time_date.mpc
+++ b/TAO/examples/Simple/time-date/time_date.mpc
@@ -1,11 +1,11 @@
-project: namingexe {
+project(*server): namingexe {
   Source_Files {
     server.cpp
     ../Simple_util.cpp
   }
 }
 
-project(client): namingexe {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index 8560adba888..089fea50cea 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(*server): namingexe {
   Source_Files {
     Time_i.cpp
     server.cpp
@@ -6,7 +6,7 @@ project: namingexe {
   }
 }
 
-project(client): namingexe {
+project(*client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index e5721767ad2..38dbb1e4cf6 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,8 +1,5 @@
-project(create_tc): client {
+project: taoclient, typecodefactory, ifr_client {
   exename  = create_tc
-  libs    += TAO_TypeCodeFactory TAO_IFR_Client
-  depends += TypeCodeFactory IFR_Client
-
   Source_Files {
     testC.cpp
     main.cpp
diff --git a/TAO/examples/examples.mwc b/TAO/examples/examples.mwc
new file mode 100644
index 00000000000..b206b16ec2f
--- /dev/null
+++ b/TAO/examples/examples.mwc
@@ -0,0 +1,6 @@
+workspace {
+  exclude {
+   // todo : get the mfc projects working correctly.
+   mfc 
+  }
+}
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index 67edd0abd8b..f95447eb087 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,11 +1,11 @@
-project: namingexe {
+project(*server): namingexe {
   Source_Files {
     status_i.cpp
     server.cpp
   }
 }
 
-project(client): namingexe {
+project(*client): namingexe {
   exename  = client
 
   Source_Files {
@@ -14,7 +14,7 @@ project(client): namingexe {
   }
 }
 
-project(corbaname client): server {
+project(*corbaname client): namingexe {
   exename = corbaname_client
 
   Source_Files {
diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc
index e3124fcfaa0..e16653925ae 100644
--- a/TAO/examples/mfc/client.mpc
+++ b/TAO/examples/mfc/client.mpc
@@ -1,4 +1,4 @@
-project(client): namingexe {
+project(MFC client): namingexe {
   exename = client
 
   verbatim(gnuace, top) {
diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc
index 8cf601cdf9d..fbc1ed40408 100644
--- a/TAO/examples/mfc/server.mpc
+++ b/TAO/examples/mfc/server.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(MFC Server): namingexe {
   pch_header = StdAfx.h
   pch_source = StdAfx.cpp