ChangeLogTag: Fri Jan 5 12:40:59 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>

5 files changed, 33 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cad02f3e294..fb789941638 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Fri Jan  5 13:35:47 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * MPC/config/tc.mpb:
+
+          Added interceptors and pi as bases to ensure the derived
+          projects are not built prior, or without their prerequisites.
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
+
+          Added tc (which derives from pi and interceptors) as base and
+          also simplified the base project lists. This ensures the tests
+          are skipped if TC is not built (for instance with
+          corba_e_compact).
+
 Fri Jan  5 13:07:32 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp (open_senders):
diff --git a/TAO/MPC/config/tc.mpb b/TAO/MPC/config/tc.mpb
index 7841d22c637..4a11f6882e0 100644
--- a/TAO/MPC/config/tc.mpb
+++ b/TAO/MPC/config/tc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taolib_with_idl {
+project: taolib_with_idl, interceptors, pi {
   after   += TC
   libs    += TAO_TC
 }
diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc
index b5c32ef4444..aa3e0ce65d0 100644
--- a/TAO/tests/TransportCurrent/Framework/Framework.mpc
+++ b/TAO/tests/TransportCurrent/Framework/Framework.mpc
@@ -1,11 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, tc, interceptors, pi_server {
+project(*Server): taoserver, tc, pi_server {
 
   after += Current_Test_Lib_Client Current_Test_Lib_Server
-  includes += .
-  includes += ../lib
+
+  includes += . ../lib
+
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
   libpaths += ../lib
 
@@ -18,13 +19,14 @@ project(*Server): taoserver, tc, interceptors, pi_server {
 
   IDL_Files {
   }
-
 }
 
-project(*Client): taoclient, tc, interceptors, pi, dynamicinterface {
+project(*Client): taoclient, tc, dynamicinterface {
 
   after += *Server Current_Test_Lib_Client Current_Test_Lib_Server
+
   includes += . ../lib
+
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
   libpaths += ../lib
 
@@ -35,5 +37,4 @@ project(*Client): taoclient, tc, interceptors, pi, dynamicinterface {
 
   IDL_Files {
   }
-
 }
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
index 34b326bf227..47b3b4eb256 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
@@ -1,17 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, tc_iiop, interceptors, pi_server {
+project(*Server): taoserver, tc_iiop, pi_server {
 
   after += Curren_Test_Lib_Client Current_Test_Lib_Server
-  includes += .
-  includes += ../lib
+
+  includes += . ../lib
+
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
   libpaths += ../lib
 
   Source_Files {
     server.cpp
-//    Server_Request_Interceptor.cpp
     Current_Test_Impl.cpp
     IIOP_Server_Request_Interceptor.cpp
     IIOP_Server_Main.cpp
@@ -22,15 +22,16 @@ project(*Server): taoserver, tc_iiop, interceptors, pi_server {
   }
 }
 
-project(*Client): taoclient, tc_iiop, interceptors, pi, dynamicinterface {
+project(*Client): taoclient, tc_iiop, dynamicinterface {
 
   after += *Server Current_Test_Lib_Client Current_Test_Lib_Server
+
   includes += . ../lib
+
   libs += Current_Test_Lib_Client Current_Test_Lib_Server
   libpaths += ../lib
 
   Source_Files {
-//    Client_Request_Interceptor.cpp
     client.cpp
     IIOP_Tester.cpp
   }
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
index 212e0b3ca1b..993ff326393 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
@@ -14,7 +14,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Client): taolib_with_idl, tao_versioning_idl_defaults, pi {
+project(*Client): tc {
 
   after += *idl TAO_TC
   includes += .
@@ -34,7 +34,7 @@ project(*Client): taolib_with_idl, tao_versioning_idl_defaults, pi {
   }
 }
 
-project(*Server): taolib_with_idl, tao_versioning_idl_defaults, pi_server {
+project(*Server): tc, pi_server {
 
   after += *Client
   includes += .