William Deegan avatar William Deegan committed 32351d1

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

Comments (0)

Files changed (2)

src/engine/SCons/Tool/MSCommon/vc.py

 
     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': [
         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))

test/MSVC/embed-manifest.py

 """)
 
 test.write('testdll.cpp', """\
+#include <stdio.h>
+#include <stdlib.h>
 int i;
+int
+testdll(int argc, char *argv)
+{
+    printf("testdll.cpp\\n");
+    if (0)
+        exit (0);
+    else
+        return 0;
+}
 """)
 
 test.run(arguments = '.')
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.