ChangeLogTag: Fri Jul 1 14:51:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 31 insertions, 31 deletions

diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 3f310ee9f79..4be613e9be9 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, messaging, portableserver, strategies {
+project(*server): taoserver, messaging, strategies {
   Source_Files {
     Server_i.cpp
     server.cpp
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 7175ad79590..3b48063ca93 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*AMH server): taoexe, portableserver, strategies, valuetype, amh {
+project(*AMH server): taoserver, strategies, valuetype, amh {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(*AMH client): taoexe, strategies, valuetype, amh {
+project(*AMH client): taoclient, strategies, valuetype, amh {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/AMI/AMI.mpc b/TAO/performance-tests/Latency/AMI/AMI.mpc
index 7b0f2656db1..c3b46d656ec 100644
--- a/TAO/performance-tests/Latency/AMI/AMI.mpc
+++ b/TAO/performance-tests/Latency/AMI/AMI.mpc
@@ -1,18 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): messaging, taoexe, portableserver, strategies, ami {
+project(*latency server): taoserver, strategies, ami {
   Source_Files {
     Roundtrip.cpp
     Server_Task.cpp
     server.cpp
-  }  
+  }
 }
- 
-project(*latency client): messaging, taoexe, portableserver, strategies, ami {
+
+project(*latency client): taoclient, strategies, ami {
   Source_Files {
     Roundtrip_Handler.cpp
     client.cpp
-  }  
+  }
 }
 
diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
index 653eff71362..ea188cdcef5 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc
+++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
@@ -1,3 +1,4 @@
 // $Id$
-project(Latency*): taoexe, portableserver, strategies {
+project(Latency*): taoserver, strategies {
+  exename = Collocated_Test
 }
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 3b7ab57a9c9..27545569223 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoexe, portableserver, strategies, minimum_corba {
+project(*latency server): taoserver, strategies, minimum_corba {
 
   Source_Files {
     Roundtrip.cpp
@@ -9,9 +9,9 @@ project(*latency server): taoexe, portableserver, strategies, minimum_corba {
   }
 }
 
-project(*latency client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
-
+project(*latency client): taoclient, strategies, dynamicinterface, minimum_corba {
   Source_Files {
+    TestC.cpp
     client.cpp
   }
 }
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 3d099c9d4da..aec58c1431c 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
+project(*latency server): taoserver, strategies, dynamicinterface, minimum_corba {
 
   IDL_Files {
   }
@@ -12,7 +12,7 @@ project(*latency server): taoexe, portableserver, strategies, dynamicinterface,
   }
 }
 
-project(*latency client): taoexe, strategies, minimum_corba {
+project(*latency client): taoclient, strategies, minimum_corba {
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index 582246b039f..670fccf0dc0 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies, minimum_corba {
-
+project(*server): taoserver, strategies, minimum_corba {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(*client): taoexe, portableserver, strategies, dynamicinterface, minimum_corba {
-
+project(*client): taoclient, strategies, dynamicinterface, minimum_corba {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index 58125363027..467045e1397 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*server): taoserver, strategies {
 
   Source_Files {
     Roundtrip.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver, strategies {
   }
 }
 
-project(*client): taoexe, strategies {
+project(*client): taoclient, strategies {
 
   Source_Files {
     TestC.cpp
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
index 48ccf6bff07..62b6a94ac0c 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*server): taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project(*client) : taoexe, strategies {
+project(*client) : taoclient, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
index fdbd780a8b2..8c01d7b3d15 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*latency server): taoexe, portableserver, strategies {
+project(*latency server): taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     Worker_Thread.cpp
@@ -9,7 +9,7 @@ project(*latency server): taoexe, portableserver, strategies {
   }
 }
 
-project(*latency client): taoexe, strategies {
+project(*latency client): taoclient, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
index ea272a36ac2..1ea5c72cc41 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
+++ b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
@@ -1,14 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
+project(*client) : taoserver {
+  exename = client
   source_files {
     client.cpp
     Foo_i.cpp
   }
 }
 
-project(*server) : taoexe, portableserver {
+project(*server) : taoserver {
   source_files {
     server.cpp
     Memory_Growth.cpp
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index 18048324c58..d39057f7581 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver {
+project(*server): taoserver {
   Source_Files {
     Memory_Growth.cpp
     server.cpp
   }
 }
 
-project(*client): taoexe {
+project(*client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index de4e7520676..ef17b715328 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver {
+project: taoserver {
   exename = create_reference
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index 6abbbd17bae..6a997ec5874 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver {
+project(*server): taoserver {
   Source_Files {
     Factory.cpp
     Simple.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver {
   }
 }
 
-project(*client): taoexe {
+project(*client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp