Remove VS2005 as supported compiler

2 files changed, 13 insertions, 49 deletions

diff --git a/cpp/INSTALL.WINDOWS b/cpp/INSTALL.WINDOWS
index a11a8bfb6ee..c3e577c7a03 100644
--- a/cpp/INSTALL.WINDOWS
+++ b/cpp/INSTALL.WINDOWS
@@ -55,16 +55,6 @@ The following C++ compilers are supported:
 
   http://www.microsoft.com/express/vc/
 
-- Microsoft Visual C++ 2005 SP1 (Professional and Express editions)
- 
-  Service Pack 1 is available for download from:
-
-  http://msdn2.microsoft.com/en-us/vstudio/bb265237.aspx
-
-  Visual C++ 2005 Express and SP1 is available for download from:
-
-  http://www.microsoft.com/express/2005/
-
 - Microsoft Visual C++ 6.0 SP5 with the Windows Server 2003 PSDK
   (February 2003) and STLport 4.6.2 (or later)
 
@@ -80,9 +70,8 @@ The following C++ compilers are supported:
 Visual C++ Express/C++Builder Setup
 ---------------------------------
 
-Users of Visual C++ 2005 Express, Visual C++ 2008 Express, 
-C++Builder 2007 or C++Builder 2009 need to install the Microsoft
-Platform SDK:
+Users of Visual C++ 2008 Express, C++Builder 2007 or C++Builder 2009 need to
+install the Microsoft Platform SDK:
 
   http://www.microsoft.com/Downloads/details.aspx?familyid=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en
 
@@ -191,8 +180,8 @@ you like.
 Add the "bin" directory of the third-party libraries to your PATH.
 
 Open a command prompt that is configured for your target architecture.
-For example, when using Visual Studio 2005 or Visual Studio 2008, you
-have several alternatives:
+For example, when using Visual Studio 2008, you have several
+alternatives:
 
  - Visual Studio Command Prompt
  - Visual Studio x64 Win64 Command Prompt
@@ -223,21 +212,6 @@ Now you're ready to build Ice:
 > nmake /f Makefile.mak
 
 
-Visual C++ 2005 Note
---------------------
-
-Compiling the src\IcePatch2 and src\iceserviceinstall directories
-generates warnings like the one shown below:
- 
-security.manifest:manifest authoring warning 81010002:Unrecognized Element
-"trustInfo" in namespace "urn:schemas-microsoft-com:asm.v3".
-
-This warning is harmless and is due to a known problem in MT.EXE. For
-more information, see
-
-  https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=237720
-
-
 Running the Test Suite
 ----------------------
 
@@ -262,10 +236,10 @@ Ice DLLs and executables.
 x64 Platform
 ======================================================================
 
-Building Ice on x64 with the Visual Studio 2005/2008 C++ compiler is 
-like building Ice on x86. You just need need to perform the build in a 
+Building Ice on x64 with the Visual Studio 2008 C++ compiler is like
+building Ice on x86. You just need need to perform the build in a 
 "Visual Studio x64 Win64 Command Prompt", and not in a regular "Visual
-Studio 2005/2008 Command Prompt".
+Studio 2008 Command Prompt".
 
 You can also use the "Visual Studio x64 Cross Tools Command Prompt" if
 you set the following environment variable:
@@ -291,7 +265,7 @@ the lib directory to the "Library files" in the IDE:
 
   * Visual C++ 6.0: Tools->Options->Directories
 
-  * Visual C++ 2005/2008: Tools->Options->Projects and Solutions->
+  * Visual C++ 2008: Tools->Options->Projects and Solutions->
                                                     VC++ Directories
 
 If you built Ice on x64, the binaries are installed in the bin\x64
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index fd2967495cf..20f1d9bc47e 100644
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -27,10 +27,10 @@ prefix			= C:\Ice-$(VERSION)
 

 #

 # Specify your C++ compiler. Supported values are:

-# VC60, VC80, VC80_EXPRESS, VC90, VC90_EXPRESS, BCC2007, BCC2009

+# VC60, VC90, VC90_EXPRESS, BCC2007, BCC2009

 #

 !if "$(CPP_COMPILER)" == ""

-CPP_COMPILER		= VC80

+CPP_COMPILER		= VC90

 !endif

 

 #

@@ -38,9 +38,7 @@ CPP_COMPILER		= VC80
 # or THIRDPARTY_HOME is not set in your environment variables then

 # change the following setting to reflect the installation location.

 #

-!if "$(CPP_COMPILER)" == "VC80_EXPRESS"

-THIRDPARTY_HOME_EXT	= VC80

-!elseif "$(CPP_COMPILER)" == "VC90_EXPRESS"

+!if "$(CPP_COMPILER)" == "VC90_EXPRESS"

 THIRDPARTY_HOME_EXT	= VC90

 !else

 THIRDPARTY_HOME_EXT	= $(CPP_COMPILER)

@@ -50,16 +48,6 @@ THIRDPARTY_HOME_EXT	= $(CPP_COMPILER)
 THIRDPARTY_HOME		= C:\Ice-$(VERSION)-ThirdParty-$(THIRDPARTY_HOME_EXT)

 !endif

 

-#

-# For VC80 it is necessary to set the location of the manifest tool.

-# This must be the 6.x version of mt.exe, not the 5.x # version!

-#

-!if "$(CPP_COMPILER)" == "VC80"

-MT = "$(VS80COMNTOOLS)bin\mt.exe"

-!else

-MT = mt.exe

-!endif

-

 

 # ----------------------------------------------------------------------

 # Don't change anything below this line!

@@ -157,6 +145,8 @@ SLICE2XSD		= $(ice_dir)\bin$(x64suffix)\slice2xsd.exe
 SLICE2FREEZE		= $(ice_dir)\bin$(x64suffix)\slice2freeze.exe

 !endif

 

+MT 			= mt.exe

+

 EVERYTHING		= all clean install

 

 .SUFFIXES: