Added icegrid session demo

5 files changed, 65 insertions, 488 deletions

diff --git a/cpp/all.dsw b/cpp/all.dsw
index 4482c83186e..d32f739dde2 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -632,6 +632,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name converterS

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name icegridsessiondemoC

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name icegridsessiondemoS

+    End Project Dependency

 }}}

 

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

@@ -1895,6 +1901,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name iceutil

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name glacier2

+    End Project Dependency

 }}}

 

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

@@ -2202,6 +2211,54 @@ Package=<4>
 

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

 

+Project: "icegridsessiondemoC"=.\demo\IceGrid\session\icegridsessiondemoC.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name icegrid

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name iceutil

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name slice2cpp

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "icegridsessiondemoS"=.\demo\IceGrid\session\icegridsessiondemoS.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name icegrid

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name iceutil

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name slice2cpp

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Project: "icegridsimpleC"=.\test\IceGrid\simple\icegridsimpleC.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/cpp/test/Ice/custom/customAMDS.dsp b/cpp/test/Ice/custom/customAMDS.dsp
index a726617cee9..e4065b82535 100755
--- a/cpp/test/Ice/custom/customAMDS.dsp
+++ b/cpp/test/Ice/custom/customAMDS.dsp
@@ -4,7 +4,7 @@
 

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

 

-CFG=customAMDS - Win32 Debug Static

+CFG=customAMDS - 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,12 @@ CFG=customAMDS - Win32 Debug Static
 !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 "customAMDS.mak" CFG="customAMDS - Win32 Debug Static"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

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

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

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

 !MESSAGE 

 

 # Begin Project

@@ -80,70 +78,12 @@ LINK32=link.exe
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"serveramd.exe" /pdbtype:sept /libpath:"../../../../lib" /fixed:no

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "customAMDS - Win32 Debug Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "customAMDS___Win32_Debug_Static"

-# PROP BASE Intermediate_Dir "customAMDS___Win32_Debug_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DebugStatic"

-# PROP Intermediate_Dir "DebugStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /Fr /FD /GZ /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /Fr /FD /Zm200 /GZ /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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../../lib"

-# SUBTRACT BASE LINK32 /incremental:no /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"serveramd.exe" /pdbtype:sept /libpath:"../../../../lib" /fixed:no

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "customAMDS - Win32 Release Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "customAMDS___Win32_Release_Static"

-# PROP BASE Intermediate_Dir "customAMDS___Win32_Release_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ReleaseStatic"

-# PROP Intermediate_Dir "ReleaseStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /Zi /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /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 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"

-# SUBTRACT BASE LINK32 /debug /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /incremental:yes /nodefaultlib

-

 !ENDIF 

 

 # Begin Target

 

 # Name "customAMDS - Win32 Release"

 # Name "customAMDS - Win32 Debug"

-# Name "customAMDS - Win32 Debug Static"

-# Name "customAMDS - Win32 Release Static"

 # Begin Group "Source Files"

 

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

@@ -237,36 +177,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customAMDS - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\TestAMD.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream TestAMD.ice

-

-"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"TestAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customAMDS - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\TestAMD.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream TestAMD.ice

-

-"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"TestAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

@@ -304,36 +214,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customAMDS - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\WstringAMD.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream WstringAMD.ice

-

-"WstringAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"WstringAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customAMDS - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\WstringAMD.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream WstringAMD.ice

-

-"WstringAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"WstringAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

diff --git a/cpp/test/Ice/custom/customC.dsp b/cpp/test/Ice/custom/customC.dsp
index a56b061cff8..b7f4e8ed11c 100644
--- a/cpp/test/Ice/custom/customC.dsp
+++ b/cpp/test/Ice/custom/customC.dsp
@@ -4,7 +4,7 @@
 

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

 

-CFG=customC - Win32 Debug Static

+CFG=customC - 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,12 @@ CFG=customC - Win32 Debug Static
 !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 "customC.mak" CFG="customC - Win32 Debug Static"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

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

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

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

 !MESSAGE 

 

 # Begin Project

@@ -80,70 +78,12 @@ LINK32=link.exe
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /fixed:no

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "customC - Win32 Debug Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "customC___Win32_Debug_Static"

-# PROP BASE Intermediate_Dir "customC___Win32_Debug_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DebugStatic"

-# PROP Intermediate_Dir "DebugStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /GZ /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 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"

-# SUBTRACT BASE LINK32 /incremental:no /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /fixed:no

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "customC - Win32 Release Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "customC___Win32_Release_Static"

-# PROP BASE Intermediate_Dir "customC___Win32_Release_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ReleaseStatic"

-# PROP Intermediate_Dir "ReleaseStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /Zi /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /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 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"../../../lib"

-# SUBTRACT BASE LINK32 /debug /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /incremental:yes /nodefaultlib

-

 !ENDIF 

 

 # Begin Target

 

 # Name "customC - Win32 Release"

 # Name "customC - Win32 Debug"

-# Name "customC - Win32 Debug Static"

-# Name "customC - Win32 Release Static"

 # Begin Group "Source Files"

 

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

@@ -233,36 +173,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customC - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\Test.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Test.ice

-

-"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customC - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\Test.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Test.ice

-

-"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

@@ -300,36 +210,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customC - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\Wstring.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Wstring.ice

-

-"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customC - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\Wstring.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Wstring.ice

-

-"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

diff --git a/cpp/test/Ice/custom/customCOL.dsp b/cpp/test/Ice/custom/customCOL.dsp
index 278b0a95192..64af3f855d4 100644
--- a/cpp/test/Ice/custom/customCOL.dsp
+++ b/cpp/test/Ice/custom/customCOL.dsp
@@ -4,7 +4,7 @@
 

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

 

-CFG=customCOL - Win32 Debug Static

+CFG=customCOL - 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,12 @@ CFG=customCOL - Win32 Debug Static
 !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 "customCOL.mak" CFG="customCOL - Win32 Debug Static"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

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

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

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

 !MESSAGE 

 

 # Begin Project

@@ -80,70 +78,12 @@ LINK32=link.exe
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib" /fixed:no

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "customCOL - Win32 Debug Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "customCOL___Win32_Debug_Static"

-# PROP BASE Intermediate_Dir "customCOL___Win32_Debug_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DebugStatic"

-# PROP Intermediate_Dir "DebugStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /GZ /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 /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib"

-# SUBTRACT BASE LINK32 /incremental:no /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /pdbtype:sept /libpath:"../../../lib" /fixed:no

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "customCOL - Win32 Release Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "customCOL___Win32_Release_Static"

-# PROP BASE Intermediate_Dir "customCOL___Win32_Release_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ReleaseStatic"

-# PROP Intermediate_Dir "ReleaseStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /Zi /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /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 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"

-# SUBTRACT BASE LINK32 /debug /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"collocated.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /incremental:yes /nodefaultlib

-

 !ENDIF 

 

 # Begin Target

 

 # Name "customCOL - Win32 Release"

 # Name "customCOL - Win32 Debug"

-# Name "customCOL - Win32 Debug Static"

-# Name "customCOL - Win32 Release Static"

 # Begin Group "Source Files"

 

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

@@ -245,36 +185,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customCOL - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\Test.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Test.ice

-

-"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customCOL - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\Test.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Test.ice

-

-"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

@@ -312,36 +222,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customCOL - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\Wstring.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Wstring.ice

-

-"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customCOL - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\Wstring.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Wstring.ice

-

-"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

diff --git a/cpp/test/Ice/custom/customS.dsp b/cpp/test/Ice/custom/customS.dsp
index dedc2867803..99ac6e4f82c 100644
--- a/cpp/test/Ice/custom/customS.dsp
+++ b/cpp/test/Ice/custom/customS.dsp
@@ -4,7 +4,7 @@
 

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

 

-CFG=customS - Win32 Debug Static

+CFG=customS - 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,12 @@ CFG=customS - Win32 Debug Static
 !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 "customS.mak" CFG="customS - Win32 Debug Static"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

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

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

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

 !MESSAGE 

 

 # Begin Project

@@ -80,70 +78,12 @@ LINK32=link.exe
 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../../lib" /fixed:no

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "customS - Win32 Debug Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "customS___Win32_Debug_Static"

-# PROP BASE Intermediate_Dir "customS___Win32_Debug_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DebugStatic"

-# PROP Intermediate_Dir "DebugStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /Fr /FD /GZ /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /Fr /FD /Zm200 /GZ /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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../../lib"

-# SUBTRACT BASE LINK32 /incremental:no /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../../lib" /fixed:no

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "customS - Win32 Release Static"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "customS___Win32_Release_Static"

-# PROP BASE Intermediate_Dir "customS___Win32_Release_Static"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ReleaseStatic"

-# PROP Intermediate_Dir "ReleaseStatic"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /Zi /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /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 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"

-# SUBTRACT BASE LINK32 /debug /nodefaultlib

-# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /incremental:yes /nodefaultlib

-

 !ENDIF 

 

 # Begin Target

 

 # Name "customS - Win32 Release"

 # Name "customS - Win32 Debug"

-# Name "customS - Win32 Debug Static"

-# Name "customS - Win32 Release Static"

 # Begin Group "Source Files"

 

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

@@ -241,36 +181,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customS - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\Test.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Test.ice

-

-"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customS - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\Test.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Test.ice

-

-"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File

@@ -308,36 +218,6 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "customS - Win32 Debug Static"

-

-# Begin Custom Build

-InputPath=.\Wstring.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Wstring.ice

-

-"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "customS - Win32 Release Static"

-

-# Begin Custom Build

-InputPath=.\Wstring.ice

-

-BuildCmds= \

-	..\..\..\bin\slice2cpp.exe -I. --stream Wstring.ice

-

-"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

 !ENDIF 

 

 # End Source File