From cef1da85a67da15d66d410215f5c5d64619d361c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 17 May 2011 16:11:41 +0000 Subject: Fix bug 2722 - get rid of warnings about missing MSVC, now will only be shown if the SCONS_MSCOMMON_DEBUG environment variable is set. Also partial fix for 2661.src/engine/SCons/Tool/MSCommon/vc.py --- src/engine/SCons/Tool/MSCommon/vc.py | 11 +++++++---- test/MSVC/embed-manifest.py | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index f67c01b..c41f0f5 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -128,9 +128,11 @@ def get_host_target(env): return (host, target,req_target_platform) -_VCVER = ["10.0", "9.0", "9.0Exp","8.0", "8.0Exp","7.1", "7.0", "6.0"] +_VCVER = ["10.0Exp","10.0", "9.0", "9.0Exp","8.0", "8.0Exp","7.1", "7.0", "6.0"] _VCVER_TO_PRODUCT_DIR = { + '10.0Exp' : [ + r'Microsoft\VCExpress\10.0\Setup\VC\ProductDir'], '10.0': [ r'Microsoft\VisualStudio\10.0\Setup\VC\ProductDir'], '9.0': [ @@ -324,9 +326,10 @@ def get_default_version(env): installed_vcs = cached_get_installed_vcs() debug('installed_vcs:%s' % installed_vcs) if not installed_vcs: - msg = 'No installed VCs' - debug('msv %s\n' % repr(msg)) - SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, msg) + #msg = 'No installed VCs' + #debug('msv %s\n' % repr(msg)) + #SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, msg) + debug('msvc_setup_env: No installed VCs') return None msvc_version = installed_vcs[0] debug('msvc_setup_env: using default installed MSVC version %s\n' % repr(msvc_version)) diff --git a/test/MSVC/embed-manifest.py b/test/MSVC/embed-manifest.py index a5a906e..9fd4460 100644 --- a/test/MSVC/embed-manifest.py +++ b/test/MSVC/embed-manifest.py @@ -67,7 +67,18 @@ main(int argc, char *argv) """) test.write('testdll.cpp', """\ +#include +#include int i; +int +testdll(int argc, char *argv) +{ + printf("testdll.cpp\\n"); + if (0) + exit (0); + else + return 0; +} """) test.run(arguments = '.') -- cgit v0.12