Merged revisions 4025-4029 via svnmerge from

http://scons.tigris.org/svn/scons/branches/vs_revamp

........
  r4025 | stevenknight | 2009-02-19 22:47:45 -0800 (Thu, 19 Feb 2009) | 2 lines

  Remove the MSVCCommon directory itself.
........
  r4026 | stevenknight | 2009-02-20 06:37:55 -0800 (Fri, 20 Feb 2009) | 7 lines

  Since we're now treating Pro and Express editions as just separate
  versions, use the actual Visual Studio executable, not the .bat file,
  to decide if a version is installed.
  Add separate tests scripts for executing the Express editions.
  Add (untested) 9.0 and 9.0Exp test scripts, cut-and-paste from 8.0 and 8.0Exp.
  Ignore generated *.py[co] files in the Tool/MSCommon directory.
........
  r4027 | stevenknight | 2009-02-21 06:50:58 -0800 (Sat, 21 Feb 2009) | 3 lines

  Escape CC and LINK path names in the expected output to match path
  names that contain regular expression characters (e.g. " (x86)").
........
  r4028 | stevenknight | 2009-02-21 06:56:42 -0800 (Sat, 21 Feb 2009) | 7 lines

  Fix devenv.com paths for VS 7.0 and 7.1 (.NET and .NET 2003).
  Remove unused methods.
  Put debug() calls under control of a SCONS_MSCOMMON_DEBUG environment
  variable.
  Regularize debug messages and make it obvious who's printing what.
  Rename "install_dir" methods in sdk.py to "sdk_dir" to help.
........

1 files changed, 11 insertions, 9 deletions

diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py
index 5dd2a17..f44af80 100644
--- a/test/MSVS/vs-7.1-exec.py
+++ b/test/MSVS/vs-7.1-exec.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that we can actually build a simple program using our generated
-Visual Studio 7.1 project (.vcproj) and solution (.sln) files.
+Visual Studio 7.1 project (.vcproj) and solution (.sln) files
 """
 
 import os
@@ -40,8 +40,10 @@ if sys.platform != 'win32':
     msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
-if not '7.1' in test.msvs_versions():
-    msg = "Visual Studio 7.1 not installed; skipping test.\n"
+msvs_version = '7.1'
+
+if not msvs_version in test.msvs_versions():
+    msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version
     test.skip_test(msg)
 
 
@@ -51,9 +53,9 @@ if not '7.1' in test.msvs_versions():
 # environment so we can execute devenv and really try to build something.
 
 test.run(arguments = '-n -q -Q -f -', stdin = """\
-env = Environment(tools = ['msvc'])
-print "os.environ.update(%s)" % repr(env['ENV'])
-""")
+env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s')
+print "os.environ.update(%%s)" %% repr(env['ENV'])
+""" % locals())
 
 exec(test.stdout())
 
@@ -62,7 +64,7 @@ exec(test.stdout())
 test.subdir('sub dir')
 
 test.write(['sub dir', 'SConstruct'], """\
-env=Environment(MSVS_VERSION = '7.1')
+env=Environment(MSVS_VERSION = '%(msvs_version)s')
 
 env.MSVSProject(target = 'foo.vcproj',
                 srcs = ['foo.c'],
@@ -70,7 +72,7 @@ env.MSVSProject(target = 'foo.vcproj',
                 variant = 'Release')
 
 env.Program('foo.c')
-""")
+""" % locals())
 
 test.write(['sub dir', 'foo.c'], r"""
 int
@@ -86,7 +88,7 @@ test.run(chdir='sub dir', arguments='.')
 test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj'))
 
 test.run(chdir='sub dir',
-         program=[test.get_msvs_executable('7.1')],
+         program=[test.get_msvs_executable(msvs_version)],
          arguments=['foo.sln', '/build', 'Release'])
 
 test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")