Tue Dec 19 11:27:00 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 28 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3830325d1db..810d63672ac 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,4 +1,19 @@
-Tue Dec 10 11:19:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Dec 19 11:27:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
+        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
+        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc:
+        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
+        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
+        * orbsvcs/tests/ImplRepo/ImplRepo.mpc:
+        * orbsvcs/tests/ImplRepo/scale/scaletest.mpc:
+        * orbsvcs/tests/Property/Property.mpc:
+        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
+        * orbsvcs/Time_Service/Time_Service.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Tue Dec 19 11:19:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
         * examples/Event_Comm/Event_Comm.mpc:
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index b7342a0a223..c69fb019150 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Time_Service_Server) : orbsvcsexe, core, time, naming, utils {
+project(Time_Service_Server) : orbsvcsexe, core, time, naming, utils, avoids_corba_e_micro {
   exename  = Time_Service_Server
   Source_Files {
     Server_i.cpp
@@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, core, time, naming, utils {
   }
 }
 
-project(Time_Service_Clerk) : orbsvcsexe, core, time, naming, utils {
+project(Time_Service_Clerk) : orbsvcsexe, core, time, naming, utils, avoids_corba_e_micro {
   exename  = Time_Service_Clerk
   Source_Files {
     Clerk_i.cpp
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
index f6a36265381..6d983bf61b7 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
@@ -25,7 +25,7 @@ project(*Manager): orbsvcsexe, portableserver {
   }
 }
 
-project(*Server): orbsvcsexe, portableserver, iortable {
+project(*Server): orbsvcsexe, portableserver, iortable, avoids_corba_e_micro {
   after += *IDL
   Source_Files {
     server_main.cpp
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 10bf46a436e..7c0ea0918b2 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
@@ -42,7 +42,7 @@ project(*Test) : orbsvcsexe {
 }
 
 // A server to use with the imr
-project(*TestServer) : orbsvcsexe, portableserver, iortable {
+project(*TestServer) : orbsvcsexe, portableserver, iortable, avoids_corba_e_micro {
   after += *IDL
   // The gnuace specific portion is to prevent invalid object files from
   // IDL generated files being compiled simultaneously with parallel builds.
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
index 1201bb99646..7eb88a9ba45 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): namingexe, portableserver, bidir_giop, utils {
+project(*Server): namingexe, portableserver, bidir_giop, utils, avoids_corba_e_micro {
   Source_Files {
     TimeServer.cpp
   }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
index 91115978acd..15ba66d442b 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
@@ -10,7 +10,7 @@ project(*IDL): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, imr_client {
+project(*Server): taoserver, imr_client, avoids_corba_e_micro {
   after += *IDL
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
index 47f665c4214..5a013fb98ed 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
@@ -22,7 +22,7 @@ project(*Server): taoexe, portableserver, bidir_giop {
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop {
+project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index 7a7cf6db46e..12ce27f4286 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -9,7 +9,7 @@ project(airplane_idl) : taoidldefaults {
 }
 
 
-project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client {
+project(airplane server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro {
   after += airplane_idl
 
   IDL_Files {
@@ -46,8 +46,7 @@ project(nestea_idl): taoidldefaults {
   custom_only = 1
 }
 
-project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client {
-  avoids += ace_for_tao
+project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro, avoids_ace_for_tao {
   after  += nestea_idl
 
   IDL_Files {
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
index f9d77f60cf9..1c256087109 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
@@ -7,7 +7,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client {
+project(*server) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable, imr_client, avoids_corba_e_micro {
   after += *idl
 
   IDL_Files {
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index 6e8b8e678f8..f1cef55d7f8 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, property_serv, utils {
+project(*server): namingexe, property_serv, utils, avoids_corba_e_micro {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
index e93c2ef880c..06aaa26b7d7 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*SSL Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop {
+project(*SSL Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
     test_i.cpp