From 25d846717f2b664e6ee2e77bb7ff04a8d4438388 Mon Sep 17 00:00:00 2001 From: Joseph Brill <48932340+jcbrill@users.noreply.github.com> Date: Wed, 1 Jul 2020 13:49:50 -0400 Subject: Fix the executable path for Visual Studio 7.0 vs.py. Add an explicit check for MSVS_VERSION 8.0 in test/MSVS/common-prefix.py. Update CHANGES.txt. --- CHANGES.txt | 2 ++ SCons/Tool/MSCommon/vs.py | 2 +- test/MSVS/common-prefix.py | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2be6667..af6e3be 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -42,6 +42,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER solution files using MSVS 2015 and later now work as expected on x86 hosts. - Test update: Reduce the number of "false negative" test failures for the interactive configuration test (test/interactive/configure.py). + - MSVS update: Fix the development environment path for MSVS 7.0. + - Test update: Add an MSVS version check for 8.0 in the MSVS/common_prefix.py test. From William Deegan: - Fix broken clang + MSVC 2019 combination by using MSVC configuration logic to diff --git a/SCons/Tool/MSCommon/vs.py b/SCons/Tool/MSCommon/vs.py index 4eee9b3..0d22e29 100644 --- a/SCons/Tool/MSCommon/vs.py +++ b/SCons/Tool/MSCommon/vs.py @@ -380,7 +380,7 @@ SupportedVSList = [ sdk_version='2003R2', hkeys=[r'Microsoft\VisualStudio\7.0\Setup\VS\ProductDir'], common_tools_var='VS70COMNTOOLS', - executable_path=r'IDE\devenv.com', + executable_path=r'Common7\IDE\devenv.com', batch_file_path=r'Common7\Tools\vsvars32.bat', default_dirname='Microsoft Visual Studio .NET', supported_arch=['x86'], diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py index 7079661..5408e51 100644 --- a/test/MSVS/common-prefix.py +++ b/test/MSVS/common-prefix.py @@ -41,6 +41,12 @@ if sys.platform != 'win32': msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform test.skip_test(msg) +msvs_version = '8.0' + +if msvs_version not in test.msvs_versions(): + msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version + test.skip_test(msg) + vcproj_template = """\