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.
........

7 files changed, 370 insertions, 34 deletions

diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py
index 36ce30c0..fe08a772 100644
--- a/test/MSVS/vs-6.0-exec.py
+++ b/test/MSVS/vs-6.0-exec.py
@@ -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 '6.0' in test.msvs_versions():
-    msg = "Visual Studio 6 not installed; skipping test.\n"
+msvs_version = '6.0'
+
+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 '6.0' in test.msvs_versions():
 # environment so we can execute msdev 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 = '6.0')
+env=Environment(MSVS_VERSION = '%(msvs_version)s')
 
 env.MSVSProject(target = 'foo.dsp',
                 srcs = ['foo.c'],
@@ -70,7 +72,7 @@ env.MSVSProject(target = 'foo.dsp',
                 variant = 'Release')
 
 env.Program('foo.c')
-""")
+""" % locals())
 
 test.write(['sub dir', 'foo.c'], r"""
 int
@@ -84,7 +86,7 @@ main(int argc, char *argv)
 test.run(chdir='sub dir', arguments='.')
 
 test.run(chdir='sub dir',
-         program=[test.get_msvs_executable('6.0')],
+         program=[test.get_msvs_executable(msvs_version)],
          arguments=['Test.dsp', '/MAKE', 'foo - Win32 Release'])
 
 test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py
index 29647bb0..cc141f30 100644
--- a/test/MSVS/vs-7.0-exec.py
+++ b/test/MSVS/vs-7.0-exec.py
@@ -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.0' in test.msvs_versions():
-    msg = "Visual Studio 7.0 not installed; skipping test.\n"
+msvs_version = '7.0'
+
+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.0' 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.0')
+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.0')],
+         program=[test.get_msvs_executable(msvs_version)],
          arguments=['foo.sln', '/build', 'Release'])
 
 test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py
index 5dd2a176..f44af80b 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")
diff --git a/test/MSVS/vs-8.0-exec.py b/test/MSVS/vs-8.0-exec.py
index ad61a5e5..cff7ca22 100644
--- a/test/MSVS/vs-8.0-exec.py
+++ b/test/MSVS/vs-8.0-exec.py
@@ -26,7 +26,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that we can actually build a simple program using our generated
-Visual Studio 8.0 project (.vcproj) and solution (.sln) files.
+Visual Studio 8.0 project (.vcproj) and solution (.sln) files
+using Visual Studio 8.0 (Professional edition).
 """
 
 import os
@@ -40,8 +41,10 @@ if sys.platform != 'win32':
     msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)
 
-if not '8.0' in test.msvs_versions():
-    msg = "Visual Studio 8.0 not installed; skipping test.\n"
+msvs_version = '8.0'
+
+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 +54,9 @@ if not '8.0' 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 +65,7 @@ exec(test.stdout())
 test.subdir('sub dir')
 
 test.write(['sub dir', 'SConstruct'], """\
-env=Environment(MSVS_VERSION = '8.0')
+env=Environment(MSVS_VERSION = '%(msvs_version)s')
 
 env.MSVSProject(target = 'foo.vcproj',
                 srcs = ['foo.c'],
@@ -70,7 +73,7 @@ env.MSVSProject(target = 'foo.vcproj',
                 variant = 'Release')
 
 env.Program('foo.c')
-""")
+""" % locals())
 
 test.write(['sub dir', 'foo.c'], r"""
 int
@@ -90,7 +93,7 @@ system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System3
 os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path
 
 test.run(chdir='sub dir',
-         program=[test.get_msvs_executable('8.0')],
+         program=[test.get_msvs_executable(msvs_version)],
          arguments=['foo.sln', '/build', 'Release'])
 
 test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")
diff --git a/test/MSVS/vs-8.0Exp-exec.py b/test/MSVS/vs-8.0Exp-exec.py
new file mode 100644
index 00000000..c7ceb5a0
--- /dev/null
+++ b/test/MSVS/vs-8.0Exp-exec.py
@@ -0,0 +1,109 @@
+#!/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 that we can actually build a simple program using our generated

+Visual Studio 8.0 project (.vcproj) and solution (.sln) files

+using Visual C++ 8.0 Express edition.

+"""

+

+import os

+import sys

+

+import TestSConsMSVS

+

+test = TestSConsMSVS.TestSConsMSVS()

+

+if sys.platform != 'win32':

+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform

+    test.skip_test(msg)

+

+msvs_version = '8.0Exp'

+

+if not msvs_version in test.msvs_versions():

+    msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version

+    test.skip_test(msg)

+

+

+

+# Let SCons figure out the Visual Studio environment variables for us and

+# print out a statement that we can exec to suck them into our external

+# environment so we can execute devenv and really try to build something.

+

+test.run(arguments = '-n -q -Q -f -', stdin = """\

+env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s')

+print "os.environ.update(%%s)" %% repr(env['ENV'])

+""" % locals())

+

+exec(test.stdout())

+

+

+

+test.subdir('sub dir')

+

+test.write(['sub dir', 'SConstruct'], """\

+env=Environment(MSVS_VERSION = '%(msvs_version)s')

+

+env.MSVSProject(target = 'foo.vcproj',

+                srcs = ['foo.c'],

+                buildtarget = 'foo.exe',

+                variant = 'Release')

+

+env.Program('foo.c')

+""" % locals())

+

+test.write(['sub dir', 'foo.c'], r"""

+int

+main(int argc, char *argv)

+{

+    printf("foo.c\n");

+    exit (0);

+}

+""")

+

+test.run(chdir='sub dir', arguments='.')

+

+test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj'))

+

+import SCons.Platform.win32

+system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' )

+os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path

+

+test.run(chdir='sub dir',

+         program=[test.get_msvs_executable(msvs_version)],

+         arguments=['foo.sln', '/build', 'Release'])

+

+test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")

+

+

+

+test.pass_test()

+

+# Local Variables:

+# tab-width:4

+# indent-tabs-mode:nil

+# End:

+# vim: set expandtab tabstop=4 shiftwidth=4:

diff --git a/test/MSVS/vs-9.0-exec.py b/test/MSVS/vs-9.0-exec.py
new file mode 100644
index 00000000..79e2ad05
--- /dev/null
+++ b/test/MSVS/vs-9.0-exec.py
@@ -0,0 +1,109 @@
+#!/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 that we can actually build a simple program using our generated

+Visual Studio 9.0 project (.vcproj) and solution (.sln) files

+using Visual Studio 9.0 (Professional edition).

+"""

+

+import os

+import sys

+

+import TestSConsMSVS

+

+test = TestSConsMSVS.TestSConsMSVS()

+

+if sys.platform != 'win32':

+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform

+    test.skip_test(msg)

+

+msvs_version = '9.0'

+

+if not msvs_version in test.msvs_versions():

+    msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version

+    test.skip_test(msg)

+

+

+

+# Let SCons figure out the Visual Studio environment variables for us and

+# print out a statement that we can exec to suck them into our external

+# environment so we can execute devenv and really try to build something.

+

+test.run(arguments = '-n -q -Q -f -', stdin = """\

+env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s')

+print "os.environ.update(%%s)" %% repr(env['ENV'])

+""" % locals())

+

+exec(test.stdout())

+

+

+

+test.subdir('sub dir')

+

+test.write(['sub dir', 'SConstruct'], """\

+env=Environment(MSVS_VERSION = '%(msvs_version)s')

+

+env.MSVSProject(target = 'foo.vcproj',

+                srcs = ['foo.c'],

+                buildtarget = 'foo.exe',

+                variant = 'Release')

+

+env.Program('foo.c')

+""" % locals())

+

+test.write(['sub dir', 'foo.c'], r"""

+int

+main(int argc, char *argv)

+{

+    printf("foo.c\n");

+    exit (0);

+}

+""")

+

+test.run(chdir='sub dir', arguments='.')

+

+test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj'))

+

+import SCons.Platform.win32

+system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' )

+os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path

+

+test.run(chdir='sub dir',

+         program=[test.get_msvs_executable(msvs_version)],

+         arguments=['foo.sln', '/build', 'Release'])

+

+test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")

+

+

+

+test.pass_test()

+

+# Local Variables:

+# tab-width:4

+# indent-tabs-mode:nil

+# End:

+# vim: set expandtab tabstop=4 shiftwidth=4:

diff --git a/test/MSVS/vs-9.0Exp-exec.py b/test/MSVS/vs-9.0Exp-exec.py
new file mode 100644
index 00000000..69726d79
--- /dev/null
+++ b/test/MSVS/vs-9.0Exp-exec.py
@@ -0,0 +1,109 @@
+#!/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 that we can actually build a simple program using our generated

+Visual Studio 9.0 project (.vcproj) and solution (.sln) files

+using Visual C++ 9.0 Express edition.

+"""

+

+import os

+import sys

+

+import TestSConsMSVS

+

+test = TestSConsMSVS.TestSConsMSVS()

+

+if sys.platform != 'win32':

+    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform

+    test.skip_test(msg)

+

+msvs_version = '9.0Exp'

+

+if not msvs_version in test.msvs_versions():

+    msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version

+    test.skip_test(msg)

+

+

+

+# Let SCons figure out the Visual Studio environment variables for us and

+# print out a statement that we can exec to suck them into our external

+# environment so we can execute devenv and really try to build something.

+

+test.run(arguments = '-n -q -Q -f -', stdin = """\

+env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s')

+print "os.environ.update(%%s)" %% repr(env['ENV'])

+""" % locals())

+

+exec(test.stdout())

+

+

+

+test.subdir('sub dir')

+

+test.write(['sub dir', 'SConstruct'], """\

+env=Environment(MSVS_VERSION = '%(msvs_version)s')

+

+env.MSVSProject(target = 'foo.vcproj',

+                srcs = ['foo.c'],

+                buildtarget = 'foo.exe',

+                variant = 'Release')

+

+env.Program('foo.c')

+""" % locals())

+

+test.write(['sub dir', 'foo.c'], r"""

+int

+main(int argc, char *argv)

+{

+    printf("foo.c\n");

+    exit (0);

+}

+""")

+

+test.run(chdir='sub dir', arguments='.')

+

+test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj'))

+

+import SCons.Platform.win32

+system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' )

+os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path

+

+test.run(chdir='sub dir',

+         program=[test.get_msvs_executable(msvs_version)],

+         arguments=['foo.sln', '/build', 'Release'])

+

+test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n")

+

+

+

+test.pass_test()

+

+# Local Variables:

+# tab-width:4

+# indent-tabs-mode:nil

+# End:

+# vim: set expandtab tabstop=4 shiftwidth=4: