Updated version from 2.0.0 to 2.1.0

16 files changed, 54 insertions, 54 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index 83ab66c5192..4fa275dae8c 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -93,7 +93,7 @@ tests = [ \
 #
 if TestUtil.isCygwin() == 0:
     tests += [ \
-       # "Glacier/starter", \ # Glacier removed from the source tree, so this list is empty for now.
+       
       ]
 
 def usage():
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 7ce0885ca94..7f8273491d8 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -132,8 +132,8 @@ KERBEROS_HOME		?= /usr/kerberos
 # ----------------------------------------------------------------------
 
 SHELL			= /bin/sh
-VERSION			= 2.0.0
-SOVERSION		= 20
+VERSION			= 2.1.0
+SOVERSION		= 21
 bindir			= $(top_srcdir)/bin
 libdir			= $(top_srcdir)/lib
 includedir		= $(top_srcdir)/include
diff --git a/cpp/demo/IceStorm/clock/config_service b/cpp/demo/IceStorm/clock/config_service
index a52cdfdc2f9..cab9a21f29d 100644
--- a/cpp/demo/IceStorm/clock/config_service
+++ b/cpp/demo/IceStorm/clock/config_service
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,20:create --Ice.Config=config
+IceBox.Service.IceStorm=IceStormService,21:create --Ice.Config=config
 
 #
 # This property defines the home directory of the Freeze 
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index f59912223dd..9800ae585c1 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -228,7 +228,7 @@ const Int64 Int64Max = 0x7fffffffffffffffLL;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "2.0.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 20000      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "2.1.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 20100      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index afbdf4ee9a9..463d4feebbf 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -54,12 +54,12 @@ 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 libdb42.lib /nologo /dll /machine:I386 /out:"Release/freeze20.dll" /implib:"Release/freeze.lib"

+# ADD LINK32 libdb42.lib /nologo /dll /machine:I386 /out:"Release/freeze21.dll" /implib:"Release/freeze.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\freeze.lib ..\..\lib	copy $(OutDir)\freeze20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\freeze.lib ..\..\lib	copy $(OutDir)\freeze21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 libdb42d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze20d.dll" /implib:"Debug/freezed.lib"

+# ADD LINK32 libdb42d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze21d.dll" /implib:"Debug/freezed.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\freezed.lib ..\..\lib	copy $(OutDir)\freeze20d.pdb ..\..\bin	copy $(OutDir)\freeze20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\freezed.lib ..\..\lib	copy $(OutDir)\freeze21d.pdb ..\..\bin	copy $(OutDir)\freeze21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/Glacier2/glacier2.dsp b/cpp/src/Glacier2/glacier2.dsp
index b2c1a8c82d9..f6c738eaebc 100755
--- a/cpp/src/Glacier2/glacier2.dsp
+++ b/cpp/src/Glacier2/glacier2.dsp
@@ -54,12 +54,12 @@ 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 /nologo /dll /machine:I386 /out:"Release/glacier220.dll" /implib:"Release/glacier2.lib"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier221.dll" /implib:"Release/glacier2.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\glacier2.lib ..\..\lib	copy $(OutDir)\glacier220.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\glacier2.lib ..\..\lib	copy $(OutDir)\glacier221.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier220d.dll" /implib:"Debug/glacier2d.lib"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier221d.dll" /implib:"Debug/glacier2d.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\glacier2d.lib ..\..\lib	copy $(OutDir)\glacier220d.pdb ..\..\bin	copy $(OutDir)\glacier220d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\glacier2d.lib ..\..\lib	copy $(OutDir)\glacier221d.pdb ..\..\bin	copy $(OutDir)\glacier221d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 0e8b8bb87f2..051d198ca4b 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -54,12 +54,12 @@ 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 ws2_32.lib libbz2.lib advapi32.lib /nologo /entry:"ice_DLL_Main" /dll /machine:I386 /out:"Release/ice20.dll" /implib:"Release/ice.lib"

+# ADD LINK32 ws2_32.lib libbz2.lib advapi32.lib /nologo /entry:"ice_DLL_Main" /dll /machine:I386 /out:"Release/ice21.dll" /implib:"Release/ice.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\ice.lib ..\..\lib	copy $(OutDir)\ice20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\ice.lib ..\..\lib	copy $(OutDir)\ice21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 ws2_32.lib libbz2d.lib advapi32.lib /nologo /entry:"ice_DLL_Main" /dll /debug /machine:I386 /out:"Debug/ice20d.dll" /implib:"Debug/iced.lib"

+# ADD LINK32 ws2_32.lib libbz2d.lib advapi32.lib /nologo /entry:"ice_DLL_Main" /dll /debug /machine:I386 /out:"Debug/ice21d.dll" /implib:"Debug/iced.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\iced.lib ..\..\lib	copy $(OutDir)\ice20d.pdb ..\..\bin	copy $(OutDir)\ice20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\iced.lib ..\..\lib	copy $(OutDir)\ice21d.pdb ..\..\bin	copy $(OutDir)\ice21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IceBox/icebox.dsp b/cpp/src/IceBox/icebox.dsp
index ddae3e0427f..f1300bc867d 100644
--- a/cpp/src/IceBox/icebox.dsp
+++ b/cpp/src/IceBox/icebox.dsp
@@ -54,12 +54,12 @@ 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 /nologo /dll /machine:I386 /out:"Release/icebox20.dll" /implib:"Release/icebox.lib"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icebox21.dll" /implib:"Release/icebox.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icebox.lib ..\..\lib	copy $(OutDir)\icebox20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icebox.lib ..\..\lib	copy $(OutDir)\icebox21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icebox20d.dll" /implib:"Debug/iceboxd.lib"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icebox21d.dll" /implib:"Debug/iceboxd.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\iceboxd.lib ..\..\lib	copy $(OutDir)\icebox20d.pdb ..\..\bin	copy $(OutDir)\icebox20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\iceboxd.lib ..\..\lib	copy $(OutDir)\icebox21d.pdb ..\..\bin	copy $(OutDir)\icebox21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IcePack/icepack.dsp b/cpp/src/IcePack/icepack.dsp
index 26e32e654d7..d4de48137a8 100644
--- a/cpp/src/IcePack/icepack.dsp
+++ b/cpp/src/IcePack/icepack.dsp
@@ -54,12 +54,12 @@ 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 /nologo /dll /machine:I386 /out:"Release/icepack20.dll" /implib:"Release/icepack.lib"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icepack21.dll" /implib:"Release/icepack.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icepack.lib ..\..\lib	copy $(OutDir)\icepack20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icepack.lib ..\..\lib	copy $(OutDir)\icepack21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icepack20d.dll" /implib:"Debug/icepackd.lib"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icepack21d.dll" /implib:"Debug/icepackd.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icepackd.lib ..\..\lib	copy $(OutDir)\icepack20d.pdb ..\..\bin	copy $(OutDir)\icepack20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icepackd.lib ..\..\lib	copy $(OutDir)\icepack21d.pdb ..\..\bin	copy $(OutDir)\icepack21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IcePatch2/icepatch2.dsp b/cpp/src/IcePatch2/icepatch2.dsp
index 3e603d15932..e34a0635772 100755
--- a/cpp/src/IcePatch2/icepatch2.dsp
+++ b/cpp/src/IcePatch2/icepatch2.dsp
@@ -54,12 +54,12 @@ 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 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch220.dll" /implib:"Release/icepatch2.lib"

+# ADD LINK32 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch221.dll" /implib:"Release/icepatch2.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icepatch2.lib ..\..\lib	copy $(OutDir)\icepatch220.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icepatch2.lib ..\..\lib	copy $(OutDir)\icepatch221.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch220d.dll" /implib:"Debug/icepatch2d.lib"

+# ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch221d.dll" /implib:"Debug/icepatch2d.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icepatch2d.lib ..\..\lib	copy $(OutDir)\icepatch220d.pdb ..\..\bin	copy $(OutDir)\icepatch220d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icepatch2d.lib ..\..\lib	copy $(OutDir)\icepatch221d.pdb ..\..\bin	copy $(OutDir)\icepatch221d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IceSSL/icessl.dsp b/cpp/src/IceSSL/icessl.dsp
index b4a56198406..4d77f66a41f 100644
--- a/cpp/src/IceSSL/icessl.dsp
+++ b/cpp/src/IceSSL/icessl.dsp
@@ -54,12 +54,12 @@ 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 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /machine:I386 /out:"Release/icessl20.dll" /implib:"Release/icessl.lib"

+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /machine:I386 /out:"Release/icessl21.dll" /implib:"Release/icessl.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icessl.lib ..\..\lib	copy $(OutDir)\icessl20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icessl.lib ..\..\lib	copy $(OutDir)\icessl21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /debug /machine:I386 /out:"Debug/icessl20d.dll" /implib:"Debug/icessld.lib"

+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /debug /machine:I386 /out:"Debug/icessl21d.dll" /implib:"Debug/icessld.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icessld.lib ..\..\lib	copy $(OutDir)\icessl20d.pdb ..\..\bin	copy $(OutDir)\icessl20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icessld.lib ..\..\lib	copy $(OutDir)\icessl21d.pdb ..\..\bin	copy $(OutDir)\icessl21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IceStorm/icestorm.dsp b/cpp/src/IceStorm/icestorm.dsp
index 23b8098b846..70728c71efb 100644
--- a/cpp/src/IceStorm/icestorm.dsp
+++ b/cpp/src/IceStorm/icestorm.dsp
@@ -54,12 +54,12 @@ 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 /nologo /dll /machine:I386 /out:"Release/icestorm20.dll" /implib:"Release/icestorm.lib"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestorm21.dll" /implib:"Release/icestorm.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icestorm.lib ..\..\lib	copy $(OutDir)\icestorm20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icestorm.lib ..\..\lib	copy $(OutDir)\icestorm21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm20d.dll" /implib:"Debug/icestormd.lib"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm21d.dll" /implib:"Debug/icestormd.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icestormd.lib ..\..\lib	copy $(OutDir)\icestorm20d.pdb ..\..\bin	copy $(OutDir)\icestorm20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icestormd.lib ..\..\lib	copy $(OutDir)\icestorm21d.pdb ..\..\bin	copy $(OutDir)\icestorm21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp
index 52a5d53b710..f28d7e9430e 100644
--- a/cpp/src/IceStorm/icestormS.dsp
+++ b/cpp/src/IceStorm/icestormS.dsp
@@ -54,12 +54,12 @@ 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 /nologo /dll /machine:I386 /out:"Release/icestormService20.dll" /implib:"Release/icestormservice.lib"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestormService21.dll" /implib:"Release/icestormservice.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icestormService.lib ..\..\lib	copy $(OutDir)\icestormservice20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icestormService.lib ..\..\lib	copy $(OutDir)\icestormservice21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormService20d.dll" /implib:"Debug/icestormserviced.lib"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormService21d.dll" /implib:"Debug/icestormserviced.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icestormServiced.lib ..\..\lib	copy $(OutDir)\icestormservice20d.pdb ..\..\bin	copy $(OutDir)\icestormservice20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icestormServiced.lib ..\..\lib	copy $(OutDir)\icestormservice21d.pdb ..\..\bin	copy $(OutDir)\icestormservice21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp
index 25f84bf03e2..d265ba417cd 100644
--- a/cpp/src/IceUtil/iceutil.dsp
+++ b/cpp/src/IceUtil/iceutil.dsp
@@ -54,12 +54,12 @@ 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 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil20.dll" /implib:"Release/iceutil.lib"

+# ADD LINK32 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil21.dll" /implib:"Release/iceutil.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\iceutil.lib ..\..\lib	copy $(OutDir)\iceutil20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\iceutil.lib ..\..\lib	copy $(OutDir)\iceutil21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil20d.dll" /implib:"Debug/iceutild.lib"

+# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil21d.dll" /implib:"Debug/iceutild.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\iceutild.lib ..\..\lib	copy $(OutDir)\iceutil20d.pdb ..\..\bin	copy $(OutDir)\iceutil20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\iceutild.lib ..\..\lib	copy $(OutDir)\iceutil21d.pdb ..\..\bin	copy $(OutDir)\iceutil21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/IceXML/icexml.dsp b/cpp/src/IceXML/icexml.dsp
index 972aa138d4a..8ede7aa27f8 100644
--- a/cpp/src/IceXML/icexml.dsp
+++ b/cpp/src/IceXML/icexml.dsp
@@ -54,12 +54,12 @@ 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 libexpat.lib /nologo /dll /machine:I386 /out:"Release/icexml20.dll" /implib:"Release/icexml.lib"

+# ADD LINK32 libexpat.lib /nologo /dll /machine:I386 /out:"Release/icexml21.dll" /implib:"Release/icexml.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icexml.lib ..\..\lib	copy $(OutDir)\icexml20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icexml.lib ..\..\lib	copy $(OutDir)\icexml21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 libexpat.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml20d.dll" /implib:"Debug/icexmld.lib"

+# ADD LINK32 libexpat.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml21d.dll" /implib:"Debug/icexmld.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\icexmld.lib ..\..\lib	copy $(OutDir)\icexml20d.pdb ..\..\bin	copy $(OutDir)\icexml20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\icexmld.lib ..\..\lib	copy $(OutDir)\icexml21d.pdb ..\..\bin	copy $(OutDir)\icexml21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp
index 4e08c177dde..119772a156a 100644
--- a/cpp/src/Slice/slice.dsp
+++ b/cpp/src/Slice/slice.dsp
@@ -54,12 +54,12 @@ 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 /nologo /dll /machine:I386 /out:"Release/slice20.dll" /implib:"Release/slice.lib"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice21.dll" /implib:"Release/slice.lib"

 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Release

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\slice.lib ..\..\lib	copy $(OutDir)\slice20.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\slice.lib ..\..\lib	copy $(OutDir)\slice21.dll ..\..\bin

 # End Special Build Tool

 

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

@@ -87,12 +87,12 @@ 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice20d.dll" /implib:"Debug/sliced.lib"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice21d.dll" /implib:"Debug/sliced.lib"

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

 # Begin Special Build Tool

 OutDir=.\Debug

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy $(OutDir)\sliced.lib ..\..\lib	copy $(OutDir)\slice20d.pdb ..\..\bin	copy $(OutDir)\slice20d.dll ..\..\bin

+PostBuild_Cmds=copy $(OutDir)\sliced.lib ..\..\lib	copy $(OutDir)\slice21d.pdb ..\..\bin	copy $(OutDir)\slice21d.dll ..\..\bin

 # End Special Build Tool

 

 !ENDIF