ChangeLogTag: Sat May 13 23:27:31 2000 Darrell Brunsch <brunsch@uci.edu>

8 files changed, 188 insertions, 283 deletions

diff --git a/TAO/tests/AMI/simple_client.dsp b/TAO/tests/AMI/simple_client.dsp
deleted file mode 100644
index 6a55cf7e74c..00000000000
--- a/TAO/tests/AMI/simple_client.dsp
+++ /dev/null
@@ -1,214 +0,0 @@
-# Microsoft Developer Studio Project File - Name="simple_client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=simple_client - Win32 Debug

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

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "simple_client.mak".

-!MESSAGE 

-!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 "simple_client.mak" CFG="simple_client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "simple_client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "simple_client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "simple_client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-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 /subsystem:console /machine:I386

-# ADD 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 /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "simple_client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "simple_c"

-# PROP BASE Intermediate_Dir "simple_c"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "simple_client - Win32 Release"

-# Name "simple_client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=".\simple-client.cpp"

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.cpp

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test_i.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "simple_client - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "simple_client - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -GC -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test_i.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Endpoint_Per_Priority/client.dsp b/TAO/tests/Endpoint_Per_Priority/client.dsp
index d933108b9fb..75dd1152d49 100644
--- a/TAO/tests/Endpoint_Per_Priority/client.dsp
+++ b/TAO/tests/Endpoint_Per_Priority/client.dsp
@@ -121,16 +121,79 @@ SOURCE=.\test.idl
 

 !IF  "$(CFG)" == "client - Win32 Release"

 

+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build

+InputPath=.\test.idl

+InputName=test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "client - Win32 Debug"

 

+# PROP Ignore_Default_Tool 1

 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)

+# Begin Custom Build - Invoking TAO_IDL on $(InputName)

 InputPath=.\test.idl

 InputName=test

 

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl -Ge 1 $(InputName).idl

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 # End Custom Build

 

 !ENDIF 

diff --git a/TAO/tests/Endpoint_Per_Priority/server.dsp b/TAO/tests/Endpoint_Per_Priority/server.dsp
index c7f3dcbff70..70c657e2162 100644
--- a/TAO/tests/Endpoint_Per_Priority/server.dsp
+++ b/TAO/tests/Endpoint_Per_Priority/server.dsp
@@ -141,16 +141,79 @@ SOURCE=.\test.idl
 

 !IF  "$(CFG)" == "server - Win32 Release"

 

+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build

+InputPath=.\test.idl

+InputName=test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "server - Win32 Debug"

 

+# PROP Ignore_Default_Tool 1

 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL on $(InputName)

 InputPath=.\test.idl

 InputName=test

 

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl -Ge 1 $(InputName).idl

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 # End Custom Build

 

 !ENDIF 

diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index e352d21090d..f38839271df 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -20,11 +20,11 @@
 // ============================================================================
 
 #include "timeC.h"
-#include <iomanip.h>
 
 // The following header is #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
 //#include <iostream.h>
+//#include <iomanip.h>
 
 int
 main (int argc, char *argv[])
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp
index 64243404f31..ea519e2ccbc 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Coll_Test_Stubs" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Coll_Test_Stubs 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=Coll_Test_Stubs - Win32 Debug

+CFG=Coll_Test_Stubs 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,12 +13,12 @@ CFG=Coll_Test_Stubs - 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 "Coll_Test_Stubs.mak" CFG="Coll_Test_Stubs - Win32 Debug"

+!MESSAGE NMAKE /f "Coll_Test_Stubs.mak" CFG="Coll_Test_Stubs Library - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Coll_Test_Stubs - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "Coll_Test_Stubs - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

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

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

 !MESSAGE 

 

 # Begin Project

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

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Coll_Test_Stubs - Win32 Release"

+!IF  "$(CFG)" == "Coll_Test_Stubs Library - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COLL_TEST_STUBS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COLL_TEST_STUBS_EXPORTS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "MY_Stub_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -54,9 +54,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 /dll /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 ace.lib tao.lib /nologo /dll /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao"

 

-!ELSEIF  "$(CFG)" == "Coll_Test_Stubs - Win32 Debug"

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COLL_TEST_STUBS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D MY_Stub_HAS_DLL=1 /D "MY_Stub_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "MY_Stub_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -81,14 +81,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib /nologo /dll /debug /machine:I386 /out:"Coll_Test_Stubsd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 aced.lib taod.lib /nologo /dll /debug /machine:I386 /out:"Coll_Test_Stubsd.dll" /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Coll_Test_Stubs - Win32 Release"

-# Name "Coll_Test_Stubs - Win32 Debug"

+# Name "Coll_Test_Stubs Library - Win32 Release"

+# Name "Coll_Test_Stubs Library - Win32 Debug"

 # Begin Group "Source Files"

 

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

@@ -128,16 +128,16 @@ SOURCE=.\stub_export.h
 

 SOURCE=.\Diamond.idl

 

-!IF  "$(CFG)" == "Coll_Test_Stubs - Win32 Release"

+!IF  "$(CFG)" == "Coll_Test_Stubs Library - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__DIAMO="..\..\..\bin\release\tao_idl.exe"	

+USERDEP__DIAMO="..\..\..\..\bin\release\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl on $(InputName).idl

 InputPath=.\Diamond.idl

 InputName=Diamond

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl.exe -Ge 1 -Gd  -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export  -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h  $(InputName).idl

+	..\..\..\..\bin\release\tao_idl.exe -Ge 1 -Gd  -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export  -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -167,10 +167,10 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Coll_Test_Stubs - Win32 Debug"

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

 

 # PROP Ignore_Default_Tool 1

-USERDEP__DIAMO="..\..\..\bin\tao_idl.exe"	

+USERDEP__DIAMO="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl on $(InputName).idl

 InputPath=.\Diamond.idl

 InputName=Diamond

diff --git a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp
index dbd53c49470..38e71aea561 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp
+++ b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp
@@ -17,13 +17,12 @@ CFG=Collocation - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Collocation - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Collocation - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Collocation - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Collocation - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -43,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -52,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib Diamond.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 ace.lib TAO.lib Diamond.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao"

 

 !ELSEIF  "$(CFG)" == "Collocation - Win32 Debug"

 

@@ -68,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D MY_Stub_HAS_DLL=1 /D Diamond_HAS_DLL=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX /Yc /Yu

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -77,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib Diamondd.lib coll_test_stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 aced.lib TAOd.lib Diamondd.lib coll_test_stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao"

 

 !ENDIF 

 

diff --git a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsw b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsw
index 4d29b397d5f..5d69bf06e74 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsw
+++ b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

-Project: "Coll_Test_Stubs"=.\Coll_Test_Stubs.dsp - Package Owner=<4>

+Project: "Coll_Test_Stubs Library"=.\Coll_Test_Stubs.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -26,11 +26,17 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name Diamond

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Coll_Test_Stubs Library

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Diamond Library

+    End Project Dependency

 }}}

 

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

 

-Project: "Diamond"=.\Diamond.dsp - Package Owner=<4>

+Project: "Diamond Library"=.\Diamond.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,7 +45,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name Coll_Test_Stubs

+    Project_Dep_Name Coll_Test_Stubs Library

     End Project Dependency

 }}}

 

diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp b/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp
index dda52cad899..c17554013e1 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Diamond" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Diamond 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=Diamond - Win32 Debug

+CFG=Diamond 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,12 +13,12 @@ CFG=Diamond - 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 "Diamond.mak" CFG="Diamond - Win32 Debug"

+!MESSAGE NMAKE /f "Diamond.mak" CFG="Diamond Library - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Diamond - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "Diamond - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

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

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

 !MESSAGE 

 

 # Begin Project

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

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Diamond - Win32 Release"

+!IF  "$(CFG)" == "Diamond Library - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Diamond_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Diamond_EXPORTS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "Diamond_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -54,9 +54,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 /dll /machine:I386

-# ADD LINK32 ace.lib tao.lib coll_test_stubs.lib /nologo /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 ace.lib tao.lib coll_test_stubs.lib /nologo /dll /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao"

 

-!ELSEIF  "$(CFG)" == "Diamond - Win32 Debug"

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Diamond_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D Diamond_HAS_DLL=1 /D "Diamond_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "Diamond_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -81,14 +81,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib coll_test_stubsd.lib /nologo /dll /debug /machine:I386 /out:"Diamondd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 aced.lib taod.lib coll_test_stubsd.lib /nologo /dll /debug /machine:I386 /out:"Diamondd.dll" /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Diamond - Win32 Release"

-# Name "Diamond - Win32 Debug"

+# Name "Diamond Library - Win32 Release"

+# Name "Diamond Library - Win32 Debug"

 # Begin Group "Source Files"

 

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

@@ -106,6 +106,10 @@ SOURCE=.\DiamondS.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\diamond_export.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Diamond_i.h

 # End Source File

 # Begin Source File

@@ -122,17 +126,9 @@ SOURCE=.\DiamondS_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\skel_export.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\stub_export.h

 # End Source File

 # End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

 # Begin Group "IDL Files"

 

 # PROP Default_Filter ""

@@ -140,16 +136,16 @@ SOURCE=.\stub_export.h
 

 SOURCE=.\Diamond.idl

 

-!IF  "$(CFG)" == "Diamond - Win32 Release"

+!IF  "$(CFG)" == "Diamond Library - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__DIAMO="..\..\..\bin\release\tao_idl.exe"	

+USERDEP__DIAMO="..\..\..\..\bin\release\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl on $(InputName).idl

 InputPath=.\Diamond.idl

 InputName=Diamond

 

 BuildCmds= \

-	..\..\..\bin\release\tao_idl.exe -Ge 1 -Gd  -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export  -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h  $(InputName).idl

+	..\..\..\..\bin\release\tao_idl.exe -Ge 1 -Gd  -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export  -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -179,10 +175,10 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Diamond - Win32 Debug"

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

 

 # PROP Ignore_Default_Tool 1

-USERDEP__DIAMO="..\..\..\bin\tao_idl.exe"	

+USERDEP__DIAMO="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl on $(InputName).idl

 InputPath=.\Diamond.idl

 InputName=Diamond

@@ -228,15 +224,7 @@ BuildCmds= \
 # Begin Source File

 

 SOURCE=.\DiamondS_T.cpp

-

-!IF  "$(CFG)" == "Diamond - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "Diamond - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-

-!ENDIF 

-

+# PROP Exclude_From_Build 1

 # End Source File

 # End Group

 # End Target