ChangeLogTag:Sun Dec 09 13:52:46 2001 Carlos O'Ryan <coryan@uci.edu>

4 files changed, 37 insertions, 30 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0a5fff190b1..0d1cf0648c1 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Sun Dec 09 13:52:46 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* orbsvcs/examples/CosEC/RtEC_Based/lib/lib.dsw:
+	* orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC.dsp:
+	* orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC_static.dsp:
+	  Adjusted name to make nightly Win32 builds happy.
+
 Sun Dec  9 20:53:01 2001  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -24,7 +31,7 @@ Sat Dec  8 11:47:37 2001  Ossama Othman  <ossama@uci.edu>
 Thu Dec  7 17:39:14 2001  Justin Michel <michel_j@ociweb.com>
 
         * TAO/tests/ORB_init/Portspan/portspan.dsp
-        
+
         Fixed the Release configuration.
 
 Fri Dec  7 16:38:22 2001  Jeff Parsons <parsons@cs.wustl.edu>
@@ -67,7 +74,7 @@ Fri Dec 07 11:44:24 2001  Carlos O'Ryan  <coryan@uci.edu>
 	  Add missing MSVC6 projects and workspaces.
 
 Fri Dec 07 09:58:43 2001  Carlos O'Ryan  <coryan@uci.edu>
-  
+
 	* orbsvcs/performance-tests/EC_Federated_Latency/EC_Federated_Latency.dsw:
 	* orbsvcs/performance-tests/EC_Federated_Latency/client.dsp:
 	* orbsvcs/performance-tests/EC_Federated_Latency/server.dsp:
@@ -98,7 +105,7 @@ Fri Dec  7 09:00:00 2001  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* TAO/TAO_IDL/fe/lex.yy.cpp
 	  fixed warnings for unreachable statement
-	
+
 Thu Dec  6 15:34:45 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp:
@@ -288,7 +295,7 @@ Mon Dec  3 19:12:58 2001  Carlos O'Ryan  <coryan@uci.edu>
           My change was not that great after all, it generated warnings on
 	  the Linux build with exceptions enabled.  I have fixed the
 	  problem by taking advantage of a TAO_ENV_EMIT_CODE macro.
-	
+
 Mon Dec  3 16:27:08 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* orbsvcs/performance-tests/Makefile:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC.dsp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC.dsp
index 1cc8c4f6c40..598cbc506f0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC.dsp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="CosEC RTEC_Based Lib" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="CosEC RTEC_Based Library" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=CosEC RTEC_Based Lib - Win32 Debug

+CFG=CosEC RTEC_Based Library - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,14 +13,14 @@ CFG=CosEC RTEC_Based Lib - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "TAO_RTEC_COSEC.mak" CFG="CosEC RTEC_Based Lib - Win32 Debug"

+!MESSAGE NMAKE /f "TAO_RTEC_COSEC.mak" CFG="CosEC RTEC_Based Library - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CosEC RTEC_Based Lib - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "CosEC RTEC_Based Lib - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "CosEC RTEC_Based Lib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "CosEC RTEC_Based Lib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "CosEC RTEC_Based Library - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "CosEC RTEC_Based Library - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "CosEC RTEC_Based Library - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "CosEC RTEC_Based Library - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -31,7 +31,7 @@ CPP=cl.exe
 MTL=midl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "CosEC RTEC_Based Lib - Win32 MFC Release"

+!IF  "$(CFG)" == "CosEC RTEC_Based Library - Win32 MFC Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -57,7 +57,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /machine:I386

 # ADD LINK32 /nologo /dll /machine:I386 ../../../../../../ace/ACEmfc.lib ../../../../../tao/TAOmfc.lib ../../../../../tao/PortableServer/TAO_PortableServermfc.lib ../../../../orbsvcs/TAO_CosNamingmfc.lib ../../../../orbsvcs/TAO_RTEventmfc.lib ../../../../orbsvcs/TAO_Svc_Utilsmfc.lib ../../../../orbsvcs/TAO_CosEventmfc.lib /out:"../../../../../../bin/TAO_RTEC_COSECmfc.dll" 

 

-!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Lib - Win32 MFC Debug"

+!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Library - Win32 MFC Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -83,7 +83,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /machine:I386 /debug /pdbtype:sept

 # ADD LINK32 /nologo /dll /machine:I386 /debug /pdbtype:sept ../../../../../../ace/ACEmfcd.lib ../../../../../tao/TAOmfcd.lib ../../../../../tao/PortableServer/TAO_PortableServermfcd.lib ../../../../orbsvcs/TAO_CosNamingmfcd.lib ../../../../orbsvcs/TAO_RTEventmfcd.lib ../../../../orbsvcs/TAO_Svc_Utilsmfcd.lib ../../../../orbsvcs/TAO_CosEventmfcd.lib /out:"../../../../../../bin/TAO_RTEC_COSECmfcd.dll" 

 

-!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Lib - Win32 Release"

+!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Library - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -109,7 +109,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /machine:I386

 # ADD LINK32 /nologo /dll /machine:I386 ../../../../../../ace/ACE.lib ../../../../../tao/TAO.lib ../../../../../tao/PortableServer/TAO_PortableServer.lib ../../../../orbsvcs/TAO_CosNaming.lib ../../../../orbsvcs/TAO_RTEvent.lib ../../../../orbsvcs/TAO_Svc_Utils.lib ../../../../orbsvcs/TAO_CosEvent.lib /out:"../../../../../../bin/TAO_RTEC_COSEC.dll" 

 

-!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Lib - Win32 Debug"

+!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Library - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -139,10 +139,10 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "CosEC RTEC_Based Lib - Win32 MFC Release"

-# Name "CosEC RTEC_Based Lib - Win32 MFC Debug"

-# Name "CosEC RTEC_Based Lib - Win32 Release"

-# Name "CosEC RTEC_Based Lib - Win32 Debug"

+# Name "CosEC RTEC_Based Library - Win32 MFC Release"

+# Name "CosEC RTEC_Based Library - Win32 MFC Debug"

+# Name "CosEC RTEC_Based Library - Win32 Release"

+# Name "CosEC RTEC_Based Library - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC_static.dsp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC_static.dsp
index a3d77139b85..08d823d26c4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC_static.dsp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/TAO_RTEC_COSEC_static.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="CosEC RTEC_Based Lib Static" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="CosEC RTEC_Based Library Static" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=CosEC RTEC_Based Lib Static - Win32 Static Debug

+CFG=CosEC RTEC_Based Library Static - Win32 Static Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=CosEC RTEC_Based Lib Static - Win32 Static Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "TAO_RTEC_COSEC.mak" CFG="CosEC RTEC_Based Lib Static - Win32 Static Debug"

+!MESSAGE NMAKE /f "TAO_RTEC_COSEC.mak" CFG="CosEC RTEC_Based Library Static - Win32 Static Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CosEC RTEC_Based Lib Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "CosEC RTEC_Based Lib Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "CosEC RTEC_Based Library Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "CosEC RTEC_Based Library Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "CosEC RTEC_Based Lib Static - Win32 Static Release"

+!IF  "$(CFG)" == "CosEC RTEC_Based Library Static - Win32 Static Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -52,7 +52,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo 

 # ADD LIB32 /nologo /out:"TAO_RTEC_COSECs.lib" 

 

-!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Lib Static - Win32 Static Debug"

+!ELSEIF  "$(CFG)" == "CosEC RTEC_Based Library Static - Win32 Static Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -79,8 +79,8 @@ LIB32=link.exe -lib
 

 # Begin Target

 

-# Name "CosEC RTEC_Based Lib Static - Win32 Static Release"

-# Name "CosEC RTEC_Based Lib Static - Win32 Static Debug"

+# Name "CosEC RTEC_Based Library Static - Win32 Static Release"

+# Name "CosEC RTEC_Based Library Static - Win32 Static Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/lib.dsw b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/lib.dsw
index 6dad865b803..bf2925d6ab3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/lib.dsw
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/lib.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "CosEC RTEC_Based Lib"=.\TAO_RTEC_COSEC.dsp - Package Owner=<4>

+Project: "CosEC RTEC_Based Library"=.\TAO_RTEC_COSEC.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosEC RTEC_Based Lib Static"=.\TAO_RTEC_COSEC_static.dsp - Package Owner=<4>

+Project: "CosEC RTEC_Based Library Static"=.\TAO_RTEC_COSEC_static.dsp - Package Owner=<4>

 

 Package=<5>

 {{{