ChangeLogTag: Thu Apr 24 10:30:00 UTC 2008 Simon Massey <sma at pristmech dot com>

6 files changed, 55 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 05706270644..c3342ba69ac 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Apr 24 10:38:00 UTC 2008  Simon Massey  <sma at pristmech dot com>
+
+        * orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc:
+        * orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc:
+
+          Stopped multi-build conflicts with VC8.
+
+        * examples/MFC/client.mpc:
+        * examples/MFC/server.mpc:
+
+          Stopped multi-build conflicts with VC8 (Avoid Unicode for now).
+
+        * utils/NamingViewer/NamingViewer.mpc:
+
+          Avoid unicode for now.
+
 Thu Apr 24 10:25:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Notify/Admin.h:
diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc
index 1769261ac85..ac08fdbb715 100644
--- a/TAO/examples/mfc/client.mpc
+++ b/TAO/examples/mfc/client.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(MFC client): namingexe, portableserver {
+project(MFC_Client): namingexe, portableserver {
   idlflags += -Wb,pch_include=StdAfx.h
 
   Source_Files {
diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc
index 9b8ccc137f2..f2b07b0e6ae 100644
--- a/TAO/examples/mfc/server.mpc
+++ b/TAO/examples/mfc/server.mpc
@@ -1,7 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(MFC Server): namingexe, portableserver, ace_mfc {
+project(MFC_Server): namingexe, portableserver, ace_mfc {
+  avoids    += unicode
+  after     += MFC_Client
   exename    = server
   pch_header = StdAfx.h
   pch_source = StdAfx.cpp
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc b/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
index d22ba5a1120..e3c4ce4747f 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
@@ -1,19 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Foo.idl
+  }
+  custom_only = 1
+}
+
+project(*security server): orbsvcsexe, orbsvcslib, security, portableserver, ssliop {
   exename = server
   Source_Files {
     Foo_i.cpp
+    FooC.cpp
+    FooS.cpp
     server.cpp
   }
+  after += *idl
+  IDL_Files {
+  }
 }
 
-project(*security client): taoexe, orbsvcslib, security {
+project(*security client): orbsvcsexe, orbsvcslib, security {
   exename = client
   Source_Files {
     FooC.cpp
     client.cpp
   }
+  after += *idl
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
index 5e1e63d07e0..a1b0a957433 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
@@ -1,16 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, security, ssl {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): orbsvcsexe, portableserver, security, ssl {
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  after += *idl
+  IDL_Files {
   }
 }
 
-project(*Client): taoexe, security, ssl {
+project(*Client): orbsvcsexe, security, ssl {
   Source_Files {
     MessengerC.cpp
     MessengerClient.cpp
   }
+  after += *idl
+  IDL_Files {
+  }
 }
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
index 51dd9b64af9..4f0fd8d50c8 100644
--- a/TAO/utils/NamingViewer/NamingViewer.mpc
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project : namingexe, ace_mfc {
+  avoids    += unicode
   exename    = NamingViewer
   install    = $(ACE_ROOT)/bin
   pch_header = StdAfx.h