Commits

Rob Managan committed 97d1026 Merge

merge latest commits from SCons main line

Comments (0)

Files changed (3)

src/engine/SCons/Tool/msvs.py

         t, s = solutionEmitter(target, target, env)
         targetlist = targetlist + t
 
+    # Beginning with Visual Studio 2010 for each project file (.vcxproj) we have additional file (.vcxproj.filters)
+    if env['MSVS_VERSION'] >= 10.0:
+        targetlist.append(targetlist[0] + '.filters')
+
     return (targetlist, sourcelist)
 
 def solutionEmitter(target, source, env):

test/MSVS/vs-10.0-files.py

 test.run(arguments="Test.vcxproj")
 
 test.must_exist(test.workpath('Test.vcxproj'))
-vcproj = test.read('Test.vcxproj', 'r')
+test.must_exist(test.workpath('Test.vcxproj.filters'))
+vcxproj = test.read('Test.vcxproj', 'r')
 expect = test.msvs_substitute(expected_vcprojfile, '10.0', None, 'SConstruct')
 # don't compare the pickled data
-assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
+assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj)
 
 test.must_exist(test.workpath('Test.sln'))
 sln = test.read('Test.sln', 'r')
 test.run(arguments='-c .')
 
 test.must_not_exist(test.workpath('Test.vcxproj'))
+test.must_not_exist(test.workpath('Test.vcxproj.filters'))
 test.must_not_exist(test.workpath('Test.sln'))
 
 test.run(arguments='Test.vcxproj')
 
 test.must_exist(test.workpath('Test.vcxproj'))
+test.must_exist(test.workpath('Test.vcxproj.filters'))
 test.must_exist(test.workpath('Test.sln'))
 
 test.run(arguments='-c Test.sln')
 
 test.must_not_exist(test.workpath('Test.vcxproj'))
+test.must_not_exist(test.workpath('Test.vcxproj.filters'))
 test.must_not_exist(test.workpath('Test.sln'))
 
 
 test.run(arguments='Test.vcxproj')
 
 test.must_exist(test.workpath('Test.vcxproj'))
-vcproj = test.read('Test.vcxproj', 'r')
+vcxproj = test.read('Test.vcxproj', 'r')
 expect = test.msvs_substitute(expected_vcprojfile, '10.0', None, 'SConstruct',
                               python=python)
 # don't compare the pickled data
-assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
+assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj)
 
 
 

test/MSVS/vs-11.0-files.py

 test.run(arguments="Test.vcxproj")
 
 test.must_exist(test.workpath('Test.vcxproj'))
-vcproj = test.read('Test.vcxproj', 'r')
+test.must_exist(test.workpath('Test.vcxproj.filters'))
+vcxproj = test.read('Test.vcxproj', 'r')
 expect = test.msvs_substitute(expected_vcprojfile, '11.0', None, 'SConstruct')
 # don't compare the pickled data
-assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
+assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj)
 
 test.must_exist(test.workpath('Test.sln'))
 sln = test.read('Test.sln', 'r')
 test.run(arguments='-c .')
 
 test.must_not_exist(test.workpath('Test.vcxproj'))
+test.must_not_exist(test.workpath('Test.vcxproj.filters'))
 test.must_not_exist(test.workpath('Test.sln'))
 
 test.run(arguments='Test.vcxproj')
 
 test.must_exist(test.workpath('Test.vcxproj'))
+test.must_exist(test.workpath('Test.vcxproj.filters'))
 test.must_exist(test.workpath('Test.sln'))
 
 test.run(arguments='-c Test.sln')
 
 test.must_not_exist(test.workpath('Test.vcxproj'))
+test.must_not_exist(test.workpath('Test.vcxproj.filters'))
 test.must_not_exist(test.workpath('Test.sln'))
 
 
 test.run(arguments='Test.vcxproj')
 
 test.must_exist(test.workpath('Test.vcxproj'))
-vcproj = test.read('Test.vcxproj', 'r')
+vcxproj = test.read('Test.vcxproj', 'r')
 expect = test.msvs_substitute(expected_vcprojfile, '11.0', None, 'SConstruct',
                               python=python)
 # don't compare the pickled data
-assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
+assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj)
 
 
 
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.