Fix vc9.0 express issue, misspelling, and add testcase which would have exposed the...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4770 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index b8aae84282e3d1493d4b99c61c8b0ce622304cda..4baa9fd8d1ba8920bb4a2db479d8c8bb5ba51f63 100644 (file)
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -138,7 +138,9 @@ _VCVER_TO_PRODUCT_DIR = {
 }
 
 def msvc_version_to_maj_min(msvc_version):
-    t = msvc_version.split(".")
+    msvc_version_numeric = string.join(filter(lambda x: x in string.digits + ".", msvc_version), '')
+    
+    t = msvc_version_numeric.split(".")
     if not len(t) == 2:
         raise ValueError("Unrecognized version %s" % msvc_version)
     try:

diff --git a/test/MSVC/TARGET_ARCH.py b/test/MSVC/TARGET_ARCH.py
new file mode 100644 (file)
index 0000000..9b2192d
--- /dev/null
+++ b/test/MSVC/TARGET_ARCH.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test the ability to configure the $PCHCOM construction variable.
+"""
+
+import TestSCons
+import sys
+
+if sys.platform != 'win32':
+    msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
+
+_python_ = TestSCons._python_
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env_64 = Environment(tools=['default', 'msvc'],
+                  TARGET_ARCH = 'amd64')
+env_32 = Environment(tools=['default', 'msvc'],
+                  TARGET_ARCH = 'x86')
+""" % locals())
+
+test.run(arguments = ".")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: