diff options
25 files changed, 444 insertions, 2608 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 7dd1dc7..d27294b 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -477,6 +477,13 @@ class _DSPGenerator(object): self.sconscript = env['MSVSSCONSCRIPT'] def GetKeyFromEnv(env, key, variants): + """ + Retrieves a specific key from the environment. If the key is + present, it is expected to either be a string or a list with length + equal to the number of variants. The function returns a list of + the desired value (e.g. cpp include paths) guaranteed to be of + length equal to the length of the variants list. + """ if key not in env or env[key] is None: return [''] * len(variants) elif SCons.Util.is_String(env[key]): @@ -491,8 +498,19 @@ class _DSPGenerator(object): (key, type(env[key]))) cmdargs = GetKeyFromEnv(env, 'cmdargs', variants) - cppdefines = GetKeyFromEnv(env, 'cppdefines', variants) - cpppaths = GetKeyFromEnv(env, 'cpppaths', variants) + + # The caller is allowed to put 'cppdefines' and/or 'cpppaths' in the + # environment, which is useful if they want to provide per-variant + # values for these. Otherwise, we fall back to using the global + # 'CPPDEFINES' and 'CPPPATH' functions. + if 'cppdefines' in env: + cppdefines = GetKeyFromEnv(env, 'cppdefines', variants) + else: + cppdefines = [env.get('CPPDEFINES', [])] * len(variants) + if 'cpppaths' in env: + cpppaths = GetKeyFromEnv(env, 'cpppaths', variants) + else: + cpppaths = [env.get('CPPPATH', [])] * len(variants) self.env = env diff --git a/test/MSVS/vs-10.0-files.py b/test/MSVS/vs-10.0-files.py deleted file mode 100644 index 8cdc152..0000000 --- a/test/MSVS/vs-10.0-files.py +++ /dev/null @@ -1,110 +0,0 @@ -#!/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 generate Visual Studio 10.0 project (.vcxproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['10.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_10_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_10_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_10_0 - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -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 vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '10.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -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 that running SCons with $PYTHON_ROOT in the environment -# changes the .vcxproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcxproj') - -test.must_exist(test.workpath('Test.vcxproj')) -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 vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - - - -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-10.0-scc-legacy-files.py b/test/MSVS/vs-10.0-scc-legacy-files.py deleted file mode 100644 index 9cb65d8..0000000 --- a/test/MSVS/vs-10.0-scc-legacy-files.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/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 generate Visual Studio 10.0 project (.vcxproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['10.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_10_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_10_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_vcproj_sccinfo = """\ -\t\t<SccProjectName>Perforce Project</SccProjectName> -\t\t<SccLocalPath>C:\\MyMsVsProjects</SccLocalPath> -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '10.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '10.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-11.0-files.py b/test/MSVS/vs-11.0-files.py deleted file mode 100644 index 6c4933c..0000000 --- a/test/MSVS/vs-11.0-files.py +++ /dev/null @@ -1,110 +0,0 @@ -#!/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 generate Visual Studio 11.0 project (.vcxproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['11.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_11_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_11_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_11_0 - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -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 vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '11.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -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 that running SCons with $PYTHON_ROOT in the environment -# changes the .vcxproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcxproj') - -test.must_exist(test.workpath('Test.vcxproj')) -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 vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - - - -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-11.0-scc-files.py b/test/MSVS/vs-11.0-scc-files.py deleted file mode 100644 index 2b13e46..0000000 --- a/test/MSVS/vs-11.0-scc-files.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/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 generate Visual Studio 11.0 project (.vcxproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['11.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_11_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_11_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_CONNECTION_ROOT='.', - MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_sln_sccinfo = """\ -\tGlobalSection(SourceCodeControl) = preSolution -\t\tSccNumberOfProjects = 2 -\t\tSccProjectName0 = Perforce\\u0020Project -\t\tSccLocalPath0 = . -\t\tSccProvider0 = MSSCCI:Perforce\\u0020SCM -\t\tCanCheckoutShared = true -\t\tSccProjectUniqueName1 = Test.vcxproj -\t\tSccLocalPath1 = . -\t\tCanCheckoutShared = true -\t\tSccProjectFilePathRelativizedFromConnection1 = .\\\\ -\tEndGlobalSection -""" - -expected_vcproj_sccinfo = """\ -\t\t<SccProjectName>Perforce Project</SccProjectName> -\t\t<SccLocalPath>.</SccLocalPath> -\t\t<SccProvider>MSSCCI:Perforce SCM</SccProvider> -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '11.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '11.0', None, 'SConstruct', - sln_sccinfo=expected_sln_sccinfo) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-11.0-scc-legacy-files.py b/test/MSVS/vs-11.0-scc-legacy-files.py deleted file mode 100644 index 9e46f6a..0000000 --- a/test/MSVS/vs-11.0-scc-legacy-files.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/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 generate Visual Studio 11.0 project (.vcxproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['11.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_11_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_11_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_vcproj_sccinfo = """\ -\t\t<SccProjectName>Perforce Project</SccProjectName> -\t\t<SccLocalPath>C:\\MyMsVsProjects</SccLocalPath> -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '11.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '11.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-14.0-files.py b/test/MSVS/vs-14.0-files.py deleted file mode 100644 index e4ba8e2..0000000 --- a/test/MSVS/vs-14.0-files.py +++ /dev/null @@ -1,110 +0,0 @@ -#!/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 generate Visual Studio 14.0 project (.vcxproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['14.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_14_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_14_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_14_0 - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -test.must_exist(test.workpath('Test.vcxproj.filters')) -vcxproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.0', None, 'SConstruct') -# don't compare the pickled data -assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '14.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -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 that running SCons with $PYTHON_ROOT in the environment -# changes the .vcxproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcxproj') - -test.must_exist(test.workpath('Test.vcxproj')) -vcxproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.0', None, 'SConstruct', - python=python) -# don't compare the pickled data -assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - - - -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-14.0-scc-files.py b/test/MSVS/vs-14.0-scc-files.py deleted file mode 100644 index d706b32..0000000 --- a/test/MSVS/vs-14.0-scc-files.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/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 generate Visual Studio 14.0 project (.vcxproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['14.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_14_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_14_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='14.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_CONNECTION_ROOT='.', - MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_sln_sccinfo = """\ -\tGlobalSection(SourceCodeControl) = preSolution -\t\tSccNumberOfProjects = 2 -\t\tSccProjectName0 = Perforce\\u0020Project -\t\tSccLocalPath0 = . -\t\tSccProvider0 = MSSCCI:Perforce\\u0020SCM -\t\tCanCheckoutShared = true -\t\tSccProjectUniqueName1 = Test.vcxproj -\t\tSccLocalPath1 = . -\t\tCanCheckoutShared = true -\t\tSccProjectFilePathRelativizedFromConnection1 = .\\\\ -\tEndGlobalSection -""" - -expected_vcproj_sccinfo = """\ -\t\t<SccProjectName>Perforce Project</SccProjectName> -\t\t<SccLocalPath>.</SccLocalPath> -\t\t<SccProvider>MSSCCI:Perforce SCM</SccProvider> -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '14.0', None, 'SConstruct', - sln_sccinfo=expected_sln_sccinfo) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-14.1-files.py b/test/MSVS/vs-14.1-files.py deleted file mode 100644 index a7c8437..0000000 --- a/test/MSVS/vs-14.1-files.py +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 generate Visual Studio 14.1 project (.vcxproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['14.1'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_14_1 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_14_1 -SConscript_contents = TestSConsMSVS.SConscript_contents_14_1 - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -test.must_exist(test.workpath('Test.vcxproj.filters')) -vcxproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.1', None, 'SConstruct') -# don't compare the pickled data -assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '14.1', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -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 that running SCons with $PYTHON_ROOT in the environment -# changes the .vcxproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcxproj') - -test.must_exist(test.workpath('Test.vcxproj')) -vcxproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.1', None, 'SConstruct', - python=python) -# don't compare the pickled data -assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) - -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-14.1-scc-files.py b/test/MSVS/vs-14.1-scc-files.py deleted file mode 100644 index 465c904..0000000 --- a/test/MSVS/vs-14.1-scc-files.py +++ /dev/null @@ -1,113 +0,0 @@ -#!/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 generate Visual Studio 14.1 project (.vcxproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['14.1'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_14_1 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_14_1 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='14.1', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_CONNECTION_ROOT='.', - MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_sln_sccinfo = """\ -\tGlobalSection(SourceCodeControl) = preSolution -\t\tSccNumberOfProjects = 2 -\t\tSccProjectName0 = Perforce\\u0020Project -\t\tSccLocalPath0 = . -\t\tSccProvider0 = MSSCCI:Perforce\\u0020SCM -\t\tCanCheckoutShared = true -\t\tSccProjectUniqueName1 = Test.vcxproj -\t\tSccLocalPath1 = . -\t\tCanCheckoutShared = true -\t\tSccProjectFilePathRelativizedFromConnection1 = .\\\\ -\tEndGlobalSection -""" - -expected_vcproj_sccinfo = """\ -\t\t<SccProjectName>Perforce Project</SccProjectName> -\t\t<SccLocalPath>.</SccLocalPath> -\t\t<SccProvider>MSSCCI:Perforce SCM</SccProvider> -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.1', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '14.1', None, 'SConstruct', - sln_sccinfo=expected_sln_sccinfo) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-14.1-scc-legacy-files.py b/test/MSVS/vs-14.1-scc-legacy-files.py deleted file mode 100644 index 45d94a6..0000000 --- a/test/MSVS/vs-14.1-scc-legacy-files.py +++ /dev/null @@ -1,96 +0,0 @@ -#!/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 generate Visual Studio 14.1 project (.vcxproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['14.1'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_14_1 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_14_1 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='14.1', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_vcproj_sccinfo = """\ -\t\t<SccProjectName>Perforce Project</SccProjectName> -\t\t<SccLocalPath>C:\\MyMsVsProjects</SccLocalPath> -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") - -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.1', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '14.1', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-8.0-clean.py b/test/MSVS/vs-8.0-clean.py deleted file mode 100644 index 7ca1c46..0000000 --- a/test/MSVS/vs-8.0-clean.py +++ /dev/null @@ -1,117 +0,0 @@ -#!/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__" - -""" -Verify the -c option's ability to clean generated Visual Studio 8.0 -project (.vcproj) and solution (.sln) files. -""" - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['8.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 - - - -test.write('SConstruct', """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - HOST_ARCH='%(HOST_ARCH)s') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -p = env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release', - auto_build_solution = 0) - -env.MSVSSolution(target = 'Test.sln', - slnguid = '{SLNGUID}', - projects = [p], - variant = 'Release') -"""%{'HOST_ARCH': host_arch}) - -test.run(arguments=".") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='.') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.sln') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.vcproj') - -test.must_not_exist(test.workpath('Test.vcproj')) - - - -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-8.0-files.py b/test/MSVS/vs-8.0-files.py deleted file mode 100644 index 038a5bf..0000000 --- a/test/MSVS/vs-8.0-files.py +++ /dev/null @@ -1,106 +0,0 @@ -#!/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 generate Visual Studio 8.0 project (.vcproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['8.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_8_0 - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.sln') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - - - -# Test that running SCons with $PYTHON_ROOT in the environment -# changes the .vcproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct', - python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - - - -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-8.0-scc-files.py b/test/MSVS/vs-8.0-scc-files.py deleted file mode 100644 index 05a8a5f..0000000 --- a/test/MSVS/vs-8.0-scc-files.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/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 generate Visual Studio 8.0 project (.vcproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['8.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_CONNECTION_ROOT='.', - MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_sln_sccinfo = """\ -\tGlobalSection(SourceCodeControl) = preSolution -\t\tSccNumberOfProjects = 2 -\t\tSccProjectName0 = Perforce\\u0020Project -\t\tSccLocalPath0 = . -\t\tSccProvider0 = MSSCCI:Perforce\\u0020SCM -\t\tCanCheckoutShared = true -\t\tSccProjectUniqueName1 = Test.vcproj -\t\tSccLocalPath1 = . -\t\tCanCheckoutShared = true -\t\tSccProjectFilePathRelativizedFromConnection1 = .\\\\ -\tEndGlobalSection -""" - -expected_vcproj_sccinfo = """\ -\tSccProjectName="Perforce Project" -\tSccLocalPath="." -\tSccProvider="MSSCCI:Perforce SCM" -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', None, 'SConstruct', - sln_sccinfo=expected_sln_sccinfo) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-8.0-scc-legacy-files.py b/test/MSVS/vs-8.0-scc-legacy-files.py deleted file mode 100644 index bfb8416..0000000 --- a/test/MSVS/vs-8.0-scc-legacy-files.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/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 generate Visual Studio 8.0 project (.vcproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['8.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_vcproj_sccinfo = """\ -\tSccProjectName="Perforce Project" -\tSccLocalPath="C:\\MyMsVsProjects" -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-8.0-variant_dir.py b/test/MSVS/vs-8.0-variant_dir.py deleted file mode 100644 index 20c7381..0000000 --- a/test/MSVS/vs-8.0-variant_dir.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/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 generate Visual Studio 8.0 project (.vcproj) and -solution (.sln) files that look correct when using a variant_dir. -""" - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['8.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_8_0 - - - -test.subdir('src') - -test.write('SConstruct', """\ -SConscript('src/SConscript', variant_dir='build') -""") - -test.write(['src', 'SConscript'], SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments=".") - -project_guid = "{25F6CE89-8E22-2910-8B6E-FFE6DC1E2792}" -vcproj = test.read(['src', 'Test.vcproj'], 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct', - project_guid=project_guid) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('src', 'Test.sln')) -sln = test.read(['src', 'Test.sln'], 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', 'src', - project_guid=project_guid) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.must_match(['build', 'Test.vcproj'], """\ -This is just a placeholder file. -The real project file is here: -%s -""" % test.workpath('src', 'Test.vcproj'), - mode='r') - -test.must_match(['build', 'Test.sln'], """\ -This is just a placeholder file. -The real workspace file is here: -%s -""" % test.workpath('src', 'Test.sln'), - mode='r') - - - -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-8.0-x64-files.py b/test/MSVS/vs-8.0-x64-files.py deleted file mode 100644 index 072ba22..0000000 --- a/test/MSVS/vs-8.0-x64-files.py +++ /dev/null @@ -1,114 +0,0 @@ -#!/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 generate Visual Studio 8.0 project (.vcproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['8.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_8_0 - -# We didn't create an API for putting parameters like this into -# the common generated and expected files. Until we do, just patch -# in the values. -expected_slnfile = expected_slnfile.replace('Win32', 'x64') -expected_vcprojfile = expected_vcprojfile.replace('Win32', 'x64') -SConscript_contents = SConscript_contents.replace('\'Release\'', '\'Release|x64\'') - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.sln') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - - - -# Test that running SCons with $PYTHON_ROOT in the environment -# changes the .vcproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct', - python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - - - -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-files.py b/test/MSVS/vs-9.0-files.py deleted file mode 100644 index eccca51..0000000 --- a/test/MSVS/vs-9.0-files.py +++ /dev/null @@ -1,106 +0,0 @@ -#!/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 generate Visual Studio 9.0 project (.vcproj) and -solution (.sln) files that look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() -host_arch = test.get_vs_host_arch() - - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['9.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_9_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_9_0 -SConscript_contents = TestSConsMSVS.SConscript_contents_9_0 - - - -test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '9.0', None, 'SConstruct') -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '9.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.sln') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - - - -# Test that running SCons with $PYTHON_ROOT in the environment -# changes the .vcproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '9.0', None, 'SConstruct', - python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - - - -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-scc-files.py b/test/MSVS/vs-9.0-scc-files.py deleted file mode 100644 index c270010..0000000 --- a/test/MSVS/vs-9.0-scc-files.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/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 generate Visual Studio 9.0 project (.vcproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['9.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_9_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_9_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='9.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_CONNECTION_ROOT='.', - MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_sln_sccinfo = """\ -\tGlobalSection(SourceCodeControl) = preSolution -\t\tSccNumberOfProjects = 2 -\t\tSccProjectName0 = Perforce\\u0020Project -\t\tSccLocalPath0 = . -\t\tSccProvider0 = MSSCCI:Perforce\\u0020SCM -\t\tCanCheckoutShared = true -\t\tSccProjectUniqueName1 = Test.vcproj -\t\tSccLocalPath1 = . -\t\tCanCheckoutShared = true -\t\tSccProjectFilePathRelativizedFromConnection1 = .\\\\ -\tEndGlobalSection -""" - -expected_vcproj_sccinfo = """\ -\tSccProjectName="Perforce Project" -\tSccLocalPath="." -\tSccProvider="MSSCCI:Perforce SCM" -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '9.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '9.0', None, 'SConstruct', - sln_sccinfo=expected_sln_sccinfo) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-scc-legacy-files.py b/test/MSVS/vs-9.0-scc-legacy-files.py deleted file mode 100644 index 0085f64..0000000 --- a/test/MSVS/vs-9.0-scc-legacy-files.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/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 generate Visual Studio 9.0 project (.vcproj) and -solution (.sln) files that contain SCC information and look correct. -""" - -import os - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['9.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_9_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_9_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='9.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects', - MSVS_SCC_PROJECT_NAME='Perforce Project') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -expected_vcproj_sccinfo = """\ -\tSccProjectName="Perforce Project" -\tSccLocalPath="C:\\MyMsVsProjects" -""" - - -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '9.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '9.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - - -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-files.py b/test/MSVS/vs-files.py new file mode 100644 index 0000000..b330ce7 --- /dev/null +++ b/test/MSVS/vs-files.py @@ -0,0 +1,112 @@ +#!/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 generate Visual Studio 10.0 or later project (.vcxproj) and +solution (.sln) files that look correct. +""" + +import os + +import TestSConsMSVS + +for vc_version in TestSConsMSVS.get_tested_proj_file_vc_versions(): + test = TestSConsMSVS.TestSConsMSVS() + host_arch = test.get_vs_host_arch() + + # Make the test infrastructure think we have this version of MSVS installed. + test._msvs_versions = [vc_version] + + dirs = ['inc1', 'inc2'] + major, minor = test.parse_vc_version(vc_version) + project_file = 'Test.vcproj' if major <= 9 else 'Test.vcxproj' + filters_file = project_file + '.filters' + filters_file_expected = major >= 10 + expected_slnfile = test.get_expected_sln_file_contents(vc_version, project_file) + expected_vcprojfile = test.get_expected_proj_file_contents(vc_version, dirs, project_file) + + test.write('SConstruct', test.get_expected_sconscript_file_contents(vc_version, project_file)) + + test.run(arguments=project_file) + + test.must_exist(test.workpath(project_file)) + if filters_file_expected: + test.must_exist(test.workpath(filters_file)) + else: + test.must_not_exist(test.workpath(filters_file)) + vcxproj = test.read(project_file, 'r') + expect = test.msvs_substitute(expected_vcprojfile, vc_version, None, 'SConstruct') + # don't compare the pickled data + assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) + + test.must_exist(test.workpath('Test.sln')) + sln = test.read('Test.sln', 'r') + expect = test.msvs_substitute(expected_slnfile, vc_version, None, 'SConstruct') + # don't compare the pickled data + assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) + + test.run(arguments='-c .') + + test.must_not_exist(test.workpath(project_file)) + test.must_not_exist(test.workpath(filters_file)) + test.must_not_exist(test.workpath('Test.sln')) + + test.run(arguments=project_file) + + test.must_exist(test.workpath(project_file)) + if filters_file_expected: + test.must_exist(test.workpath(filters_file)) + else: + test.must_not_exist(test.workpath(filters_file)) + test.must_exist(test.workpath('Test.sln')) + + test.run(arguments='-c Test.sln') + + test.must_not_exist(test.workpath(project_file)) + test.must_not_exist(test.workpath(filters_file)) + test.must_not_exist(test.workpath('Test.sln')) + + # Test that running SCons with $PYTHON_ROOT in the environment + # changes the .vcxproj output as expected. + os.environ['PYTHON_ROOT'] = 'xyzzy' + python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) + + test.run(arguments=project_file) + + test.must_exist(test.workpath(project_file)) + vcxproj = test.read(project_file, 'r') + expect = test.msvs_substitute(expected_vcprojfile, vc_version, None, 'SConstruct', + python=python) + # don't compare the pickled data + assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) + + 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-10.0-scc-files.py b/test/MSVS/vs-scc-files.py index 8a08ece..a02ba5c 100644 --- a/test/MSVS/vs-10.0-scc-files.py +++ b/test/MSVS/vs-scc-files.py @@ -33,17 +33,21 @@ import os import TestSConsMSVS -test = TestSConsMSVS.TestSConsMSVS() - -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['10.0'] - - - -expected_slnfile = TestSConsMSVS.expected_slnfile_10_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_10_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', +for vc_version in TestSConsMSVS.get_tested_proj_file_vc_versions(): + test = TestSConsMSVS.TestSConsMSVS() + + # Make the test infrastructure think we have this version of MSVS installed. + test._msvs_versions = [vc_version] + + dirs = ['inc1', 'inc2'] + major, minor = test.parse_vc_version(vc_version) + project_file = 'Test.vcproj' if major <= 9 else 'Test.vcxproj' + filters_file = project_file + '.filters' + filters_file_expected = major >= 10 + expected_slnfile = test.get_expected_sln_file_contents(vc_version, project_file) + expected_vcprojfile = test.get_expected_proj_file_contents(vc_version, dirs, project_file) + SConscript_contents = """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='{vc_version}', CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], CPPPATH=['inc1', 'inc2'], MSVS_SCC_CONNECTION_ROOT='.', @@ -56,7 +60,7 @@ testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] -env.MSVSProject(target = 'Test.vcxproj', +env.MSVSProject(target = '{project_file}', srcs = testsrc, incs = testincs, localincs = testlocalincs, @@ -64,49 +68,58 @@ env.MSVSProject(target = 'Test.vcxproj', misc = testmisc, buildtarget = 'Test.exe', variant = 'Release') -""" +""".format(vc_version=vc_version, project_file=project_file) -expected_sln_sccinfo = """\ + expected_sln_sccinfo = """\ \tGlobalSection(SourceCodeControl) = preSolution \t\tSccNumberOfProjects = 2 \t\tSccProjectName0 = Perforce\\u0020Project \t\tSccLocalPath0 = . \t\tSccProvider0 = MSSCCI:Perforce\\u0020SCM \t\tCanCheckoutShared = true -\t\tSccProjectUniqueName1 = Test.vcxproj +\t\tSccProjectUniqueName1 = {project_file} \t\tSccLocalPath1 = . \t\tCanCheckoutShared = true \t\tSccProjectFilePathRelativizedFromConnection1 = .\\\\ \tEndGlobalSection +""".format(project_file=project_file) + + if major < 10: + # VC8 and VC9 used key-value pair format. + expected_vcproj_sccinfo = """\ +\tSccProjectName="Perforce Project" +\tSccLocalPath="." +\tSccProvider="MSSCCI:Perforce SCM" """ - -expected_vcproj_sccinfo = """\ + else: + # VC10 and later use XML format. + expected_vcproj_sccinfo = """\ \t\t<SccProjectName>Perforce Project</SccProjectName> \t\t<SccLocalPath>.</SccLocalPath> \t\t<SccProvider>MSSCCI:Perforce SCM</SccProvider> """ -test.write('SConstruct', SConscript_contents) + test.write('SConstruct', SConscript_contents) -test.run(arguments="Test.vcxproj") + test.run(arguments=project_file) -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '10.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + test.must_exist(test.workpath(project_file)) + vcproj = test.read(project_file, 'r') + expect = test.msvs_substitute(expected_vcprojfile, vc_version, None, 'SConstruct', + vcproj_sccinfo=expected_vcproj_sccinfo) + # don't compare the pickled data + assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '10.0', None, 'SConstruct', - sln_sccinfo=expected_sln_sccinfo) -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) + test.must_exist(test.workpath('Test.sln')) + sln = test.read('Test.sln', 'r') + expect = test.msvs_substitute(expected_slnfile, vc_version, None, 'SConstruct', + sln_sccinfo=expected_sln_sccinfo) + # don't compare the pickled data + assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) -test.pass_test() + test.pass_test() # Local Variables: # tab-width:4 diff --git a/test/MSVS/vs-14.0-scc-legacy-files.py b/test/MSVS/vs-scc-legacy-files.py index 904a103..813025a 100644 --- a/test/MSVS/vs-14.0-scc-legacy-files.py +++ b/test/MSVS/vs-scc-legacy-files.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Test that we can generate Visual Studio 14.0 project (.vcxproj) and +Test that we can generate Visual Studio 10.0 or later project (.vcxproj) and solution (.sln) files that contain SCC information and look correct. """ @@ -33,17 +33,22 @@ import os import TestSConsMSVS -test = TestSConsMSVS.TestSConsMSVS() +for vc_version in TestSConsMSVS.get_tested_proj_file_vc_versions(): + test = TestSConsMSVS.TestSConsMSVS() -# Make the test infrastructure think we have this version of MSVS installed. -test._msvs_versions = ['14.0'] + # Make the test infrastructure think we have this version of MSVS installed. + test._msvs_versions = [vc_version] + dirs = ['inc1', 'inc2'] + major, minor = test.parse_vc_version(vc_version) + project_file = 'Test.vcproj' if major <= 9 else 'Test.vcxproj' + filters_file = project_file + '.filters' + filters_file_expected = major >= 10 + expected_slnfile = test.get_expected_sln_file_contents(vc_version, project_file) + expected_vcprojfile = test.get_expected_proj_file_contents(vc_version, dirs, project_file) - -expected_slnfile = TestSConsMSVS.expected_slnfile_14_0 -expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_14_0 -SConscript_contents = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='14.0', + SConscript_contents = """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='{vc_version}', CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], CPPPATH=['inc1', 'inc2'], MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects', @@ -55,7 +60,7 @@ testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] -env.MSVSProject(target = 'Test.vcxproj', +env.MSVSProject(target = '{project_file}', srcs = testsrc, incs = testincs, localincs = testlocalincs, @@ -63,33 +68,40 @@ env.MSVSProject(target = 'Test.vcxproj', misc = testmisc, buildtarget = 'Test.exe', variant = 'Release') -""" +""".format(vc_version=vc_version, project_file=project_file) -expected_vcproj_sccinfo = """\ + if major < 10: + # VC8 and VC9 used key-value pair format. + expected_vcproj_sccinfo = """\ +\tSccProjectName="Perforce Project" +\tSccLocalPath="C:\\MyMsVsProjects" +""" + else: + # VC10 and later use XML format. + expected_vcproj_sccinfo = """\ \t\t<SccProjectName>Perforce Project</SccProjectName> \t\t<SccLocalPath>C:\\MyMsVsProjects</SccLocalPath> """ + test.write('SConstruct', SConscript_contents) -test.write('SConstruct', SConscript_contents) - -test.run(arguments="Test.vcxproj") + test.run(arguments=project_file) -test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '14.0', None, 'SConstruct', - vcproj_sccinfo=expected_vcproj_sccinfo) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + test.must_exist(test.workpath(project_file)) + vcproj = test.read(project_file, 'r') + expect = test.msvs_substitute(expected_vcprojfile, vc_version, None, 'SConstruct', + vcproj_sccinfo=expected_vcproj_sccinfo) + # don't compare the pickled data + assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '14.0', None, 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) + test.must_exist(test.workpath('Test.sln')) + sln = test.read('Test.sln', 'r') + expect = test.msvs_substitute(expected_slnfile, vc_version, None, 'SConstruct') + # don't compare the pickled data + assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) -test.pass_test() + test.pass_test() # Local Variables: # tab-width:4 diff --git a/test/MSVS/vs-variant_dir.py b/test/MSVS/vs-variant_dir.py new file mode 100644 index 0000000..15b46e8 --- /dev/null +++ b/test/MSVS/vs-variant_dir.py @@ -0,0 +1,93 @@ +#!/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 generate Visual Studio 8.0 project (.vcproj) and +solution (.sln) files that look correct when using a variant_dir. +""" + +import TestSConsMSVS + +for vc_version in TestSConsMSVS.get_tested_proj_file_vc_versions(): + test = TestSConsMSVS.TestSConsMSVS() + host_arch = test.get_vs_host_arch() + + # Make the test infrastructure think we have this version of MSVS installed. + test._msvs_versions = [vc_version] + + dirs = ['inc1', 'inc2'] + major, minor = test.parse_vc_version(vc_version) + project_file = 'Test.vcproj' if major <= 9 else 'Test.vcxproj' + expected_slnfile = test.get_expected_sln_file_contents(vc_version, project_file) + expected_vcprojfile = test.get_expected_proj_file_contents(vc_version, dirs, project_file) + + test.subdir('src') + + test.write('SConstruct', """\ +SConscript('src/SConscript', variant_dir='build') +""") + + test.write('SConstruct', """\ +SConscript('src/SConscript', variant_dir='build') +""") + + test.write(['src', 'SConscript'], test.get_expected_sconscript_file_contents(vc_version, project_file)) + + test.run(arguments=".") + + project_guid = "{25F6CE89-8E22-2910-8B6E-FFE6DC1E2792}" + vcproj = test.read(['src', project_file], 'r') + expect = test.msvs_substitute(expected_vcprojfile, vc_version, None, 'SConstruct', + project_guid=project_guid) + # don't compare the pickled data + assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + + test.must_exist(test.workpath('src', 'Test.sln')) + sln = test.read(['src', 'Test.sln'], 'r') + expect = test.msvs_substitute(expected_slnfile, '8.0', 'src', + project_guid=project_guid) + # don't compare the pickled data + assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) + + test.must_match(['build', 'Test.vcproj'], """\ +This is just a placeholder file. +The real project file is here: +%s +""" % test.workpath('src', project_file), mode='r') + + test.must_match(['build', 'Test.sln'], """\ +This is just a placeholder file. +The real workspace file is here: +%s +""" % test.workpath('src', 'Test.sln'), mode='r') + + test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/testing/framework/TestSConsMSVS.py b/testing/framework/TestSConsMSVS.py index 348d7ed..9e6e069 100644 --- a/testing/framework/TestSConsMSVS.py +++ b/testing/framework/TestSConsMSVS.py @@ -23,6 +23,7 @@ import platform import traceback from xml.etree import ElementTree +import SCons.Errors from TestSCons import * from TestSCons import __all__ @@ -435,31 +436,10 @@ env.MSVSProject(target = 'Test.vcproj', """ - -expected_slnfile_8_0 = """\ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "<PROJECT_GUID>" -EndProject -Global -<SCC_SLN_INFO> -\tGlobalSection(SolutionConfigurationPlatforms) = preSolution -\t\tRelease|Win32 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(ProjectConfigurationPlatforms) = postSolution -\t\t<PROJECT_GUID>.Release|Win32.ActiveCfg = Release|Win32 -\t\t<PROJECT_GUID>.Release|Win32.Build.0 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(SolutionProperties) = preSolution -\t\tHideSolutionNode = FALSE -\tEndGlobalSection -EndGlobal -""" - -expected_slnfile_9_0 = """\ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "<PROJECT_GUID>" +expected_slnfile_fmt = """\ +Microsoft Visual Studio Solution File, Format Version %(FORMAT_VERSION)s +# Visual Studio %(VS_NUMBER)s +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "%(PROJECT_NAME)s", "%(PROJECT_FILE)s", "<PROJECT_GUID>" EndProject Global <SCC_SLN_INFO> @@ -476,91 +456,11 @@ Global EndGlobal """ -expected_slnfile_10_0 = """\ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test.vcxproj", "Test.vcxproj", "{39A97E1F-1A52-8954-A0B1-A10A8487545E}" -EndProject -Global -<SCC_SLN_INFO> -\tGlobalSection(SolutionConfigurationPlatforms) = preSolution -\t\tRelease|Win32 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(ProjectConfigurationPlatforms) = postSolution -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.ActiveCfg = Release|Win32 -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.Build.0 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(SolutionProperties) = preSolution -\t\tHideSolutionNode = FALSE -\tEndGlobalSection -EndGlobal -""" - -expected_slnfile_11_0 = """\ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 11 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test.vcxproj", "Test.vcxproj", "{39A97E1F-1A52-8954-A0B1-A10A8487545E}" -EndProject -Global -<SCC_SLN_INFO> -\tGlobalSection(SolutionConfigurationPlatforms) = preSolution -\t\tRelease|Win32 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(ProjectConfigurationPlatforms) = postSolution -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.ActiveCfg = Release|Win32 -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.Build.0 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(SolutionProperties) = preSolution -\t\tHideSolutionNode = FALSE -\tEndGlobalSection -EndGlobal -""" - -expected_slnfile_14_0 = """\ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test.vcxproj", "Test.vcxproj", "{39A97E1F-1A52-8954-A0B1-A10A8487545E}" -EndProject -Global -<SCC_SLN_INFO> -\tGlobalSection(SolutionConfigurationPlatforms) = preSolution -\t\tRelease|Win32 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(ProjectConfigurationPlatforms) = postSolution -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.ActiveCfg = Release|Win32 -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.Build.0 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(SolutionProperties) = preSolution -\t\tHideSolutionNode = FALSE -\tEndGlobalSection -EndGlobal -""" - -expected_slnfile_14_1 = """\ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test.vcxproj", "Test.vcxproj", "{39A97E1F-1A52-8954-A0B1-A10A8487545E}" -EndProject -Global -<SCC_SLN_INFO> -\tGlobalSection(SolutionConfigurationPlatforms) = preSolution -\t\tRelease|Win32 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(ProjectConfigurationPlatforms) = postSolution -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.ActiveCfg = Release|Win32 -\t\t{39A97E1F-1A52-8954-A0B1-A10A8487545E}.Release|Win32.Build.0 = Release|Win32 -\tEndGlobalSection -\tGlobalSection(SolutionProperties) = preSolution -\t\tHideSolutionNode = FALSE -\tEndGlobalSection -EndGlobal -""" - -expected_vcprojfile_8_0 = """\ +expected_vcprojfile_fmt = """\ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject \tProjectType="Visual C++" -\tVersion="8.00" +\tVersion="%(TOOLS_VERSION)s" \tName="Test" \tProjectGUID="<PROJECT_GUID>" \tRootNamespace="Test" @@ -586,7 +486,7 @@ expected_vcprojfile_8_0 = """\ \t\t\t\tCleanCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c "Test.exe"" \t\t\t\tOutput="Test.exe" \t\t\t\tPreprocessorDefinitions="DEF1;DEF2;DEF3=1234" -\t\t\t\tIncludeSearchPath="inc1;inc2" +\t\t\t\tIncludeSearchPath="%(INCLUDE_DIRS)s" \t\t\t\tForcedIncludes="" \t\t\t\tAssemblySearchPath="" \t\t\t\tForcedUsingAssemblies="" @@ -601,7 +501,7 @@ expected_vcprojfile_8_0 = """\ \t\t\tName="Header Files" \t\t\tFilter="h;hpp;hxx;hm;inl"> \t\t\t<File -\t\t\t\tRelativePath="sdk.h"> +\t\t\t\tRelativePath="sdk_dir\\sdk.h"> \t\t\t</File> \t\t</Filter> \t\t<Filter @@ -644,97 +544,9 @@ expected_vcprojfile_8_0 = """\ </VisualStudioProject> """ -expected_vcprojfile_9_0 = """\ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject -\tProjectType="Visual C++" -\tVersion="9.00" -\tName="Test" -\tProjectGUID="<PROJECT_GUID>" -\tRootNamespace="Test" -<SCC_VCPROJ_INFO> -\tKeyword="MakeFileProj"> -\t<Platforms> -\t\t<Platform -\t\t\tName="Win32"/> -\t</Platforms> -\t<ToolFiles> -\t</ToolFiles> -\t<Configurations> -\t\t<Configuration -\t\t\tName="Release|Win32" -\t\t\tConfigurationType="0" -\t\t\tUseOfMFC="0" -\t\t\tATLMinimizesCRunTimeLibraryUsage="false" -\t\t\t> -\t\t\t<Tool -\t\t\t\tName="VCNMakeTool" -\t\t\t\tBuildCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"" -\t\t\t\tReBuildCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"" -\t\t\t\tCleanCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c "Test.exe"" -\t\t\t\tOutput="Test.exe" -\t\t\t\tPreprocessorDefinitions="DEF1;DEF2;DEF3=1234" -\t\t\t\tIncludeSearchPath="inc1;inc2" -\t\t\t\tForcedIncludes="" -\t\t\t\tAssemblySearchPath="" -\t\t\t\tForcedUsingAssemblies="" -\t\t\t\tCompileAsManaged="" -\t\t\t/> -\t\t</Configuration> -\t</Configurations> -\t<References> -\t</References> -\t<Files> -\t\t<Filter -\t\t\tName="Header Files" -\t\t\tFilter="h;hpp;hxx;hm;inl"> -\t\t\t<File -\t\t\t\tRelativePath="sdk.h"> -\t\t\t</File> -\t\t</Filter> -\t\t<Filter -\t\t\tName="Local Headers" -\t\t\tFilter="h;hpp;hxx;hm;inl"> -\t\t\t<File -\t\t\t\tRelativePath="test.h"> -\t\t\t</File> -\t\t</Filter> -\t\t<Filter -\t\t\tName="Other Files" -\t\t\tFilter=""> -\t\t\t<File -\t\t\t\tRelativePath="readme.txt"> -\t\t\t</File> -\t\t</Filter> -\t\t<Filter -\t\t\tName="Resource Files" -\t\t\tFilter="r;rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"> -\t\t\t<File -\t\t\t\tRelativePath="test.rc"> -\t\t\t</File> -\t\t</Filter> -\t\t<Filter -\t\t\tName="Source Files" -\t\t\tFilter="cpp;c;cxx;l;y;def;odl;idl;hpj;bat"> -\t\t\t<File -\t\t\t\tRelativePath="test1.cpp"> -\t\t\t</File> -\t\t\t<File -\t\t\t\tRelativePath="test2.cpp"> -\t\t\t</File> -\t\t</Filter> -\t\t<File -\t\t\tRelativePath="<SCONSCRIPT>"> -\t\t</File> -\t</Files> -\t<Globals> -\t</Globals> -</VisualStudioProject> -""" - -expected_vcprojfile_10_0 = """\ +expected_vcxprojfile_fmt = """\ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="%(TOOLS_VERSION)s" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> \t<ItemGroup Label="ProjectConfigurations"> \t\t<ProjectConfiguration Include="Release|Win32"> \t\t\t<Configuration>Release</Configuration> @@ -746,6 +558,7 @@ expected_vcprojfile_10_0 = """\ <SCC_VCPROJ_INFO> \t\t<RootNamespace>Test</RootNamespace> \t\t<Keyword>MakeFileProj</Keyword> +\t\t<VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName> \t</PropertyGroup> \t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.Default.props" /> \t<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> @@ -767,7 +580,7 @@ expected_vcprojfile_10_0 = """\ \t\t<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c "Test.exe"</NMakeCleanCommandLine> \t\t<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Test.exe</NMakeOutput> \t\t<NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEF1;DEF2;DEF3=1234</NMakePreprocessorDefinitions> -\t\t<NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">inc1;inc2</NMakeIncludeSearchPath> +\t\t<NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(INCLUDE_DIRS)s</NMakeIncludeSearchPath> \t\t<NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes> \t\t<NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> \t\t<NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> @@ -797,249 +610,8 @@ expected_vcprojfile_10_0 = """\ </Project> """ -expected_vcprojfile_11_0 = """\ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -\t<ItemGroup Label="ProjectConfigurations"> -\t\t<ProjectConfiguration Include="Release|Win32"> -\t\t\t<Configuration>Release</Configuration> -\t\t\t<Platform>Win32</Platform> -\t\t</ProjectConfiguration> -\t</ItemGroup> -\t<PropertyGroup Label="Globals"> -\t\t<ProjectGuid>{39A97E1F-1A52-8954-A0B1-A10A8487545E}</ProjectGuid> -<SCC_VCPROJ_INFO> -\t\t<RootNamespace>Test</RootNamespace> -\t\t<Keyword>MakeFileProj</Keyword> -\t</PropertyGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.Default.props" /> -\t<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -\t\t<ConfigurationType>Makefile</ConfigurationType> -\t\t<UseOfMfc>false</UseOfMfc> -\t\t<PlatformToolset>v110</PlatformToolset> -\t</PropertyGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.props" /> -\t<ImportGroup Label="ExtensionSettings"> -\t</ImportGroup> -\t<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -\t\t<Import Project="$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -\t</ImportGroup> -\t<PropertyGroup Label="UserMacros" /> -\t<PropertyGroup> -\t<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -\t\t<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"</NMakeBuildCommandLine> -\t\t<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"</NMakeReBuildCommandLine> -\t\t<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c "Test.exe"</NMakeCleanCommandLine> -\t\t<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Test.exe</NMakeOutput> -\t\t<NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEF1;DEF2;DEF3=1234</NMakePreprocessorDefinitions> -\t\t<NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">inc1;inc2</NMakeIncludeSearchPath> -\t\t<NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes> -\t\t<NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> -\t\t<NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> -\t</PropertyGroup> -\t<ItemGroup> -\t\t<ClInclude Include="sdk_dir\\sdk.h" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<ClInclude Include="test.h" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="readme.txt" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="test.rc" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<ClCompile Include="test1.cpp" /> -\t\t<ClCompile Include="test2.cpp" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="SConstruct" /> -\t</ItemGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.targets" /> -\t<ImportGroup Label="ExtensionTargets"> -\t</ImportGroup> -</Project> -""" - -expected_vcprojfile_14_0 = """\ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -\t<ItemGroup Label="ProjectConfigurations"> -\t\t<ProjectConfiguration Include="Release|Win32"> -\t\t\t<Configuration>Release</Configuration> -\t\t\t<Platform>Win32</Platform> -\t\t</ProjectConfiguration> -\t</ItemGroup> -\t<PropertyGroup Label="Globals"> -\t\t<ProjectGuid>{39A97E1F-1A52-8954-A0B1-A10A8487545E}</ProjectGuid> -<SCC_VCPROJ_INFO> -\t\t<RootNamespace>Test</RootNamespace> -\t\t<Keyword>MakeFileProj</Keyword> -\t</PropertyGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.Default.props" /> -\t<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -\t\t<ConfigurationType>Makefile</ConfigurationType> -\t\t<UseOfMfc>false</UseOfMfc> -\t\t<PlatformToolset>v140</PlatformToolset> -\t</PropertyGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.props" /> -\t<ImportGroup Label="ExtensionSettings"> -\t</ImportGroup> -\t<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -\t\t<Import Project="$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -\t</ImportGroup> -\t<PropertyGroup Label="UserMacros" /> -\t<PropertyGroup> -\t<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -\t\t<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"</NMakeBuildCommandLine> -\t\t<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"</NMakeReBuildCommandLine> -\t\t<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c "Test.exe"</NMakeCleanCommandLine> -\t\t<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Test.exe</NMakeOutput> -\t\t<NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEF1;DEF2;DEF3=1234</NMakePreprocessorDefinitions> -\t\t<NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">inc1;inc2</NMakeIncludeSearchPath> -\t\t<NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes> -\t\t<NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> -\t\t<NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> -\t</PropertyGroup> -\t<ItemGroup> -\t\t<ClInclude Include="sdk_dir\\sdk.h" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<ClInclude Include="test.h" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="readme.txt" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="test.rc" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<ClCompile Include="test1.cpp" /> -\t\t<ClCompile Include="test2.cpp" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="SConstruct" /> -\t</ItemGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.targets" /> -\t<ImportGroup Label="ExtensionTargets"> -\t</ImportGroup> -</Project> -""" - -expected_vcprojfile_14_1 = """\ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -\t<ItemGroup Label="ProjectConfigurations"> -\t\t<ProjectConfiguration Include="Release|Win32"> -\t\t\t<Configuration>Release</Configuration> -\t\t\t<Platform>Win32</Platform> -\t\t</ProjectConfiguration> -\t</ItemGroup> -\t<PropertyGroup Label="Globals"> -\t\t<ProjectGuid>{39A97E1F-1A52-8954-A0B1-A10A8487545E}</ProjectGuid> -<SCC_VCPROJ_INFO> -\t\t<RootNamespace>Test</RootNamespace> -\t\t<Keyword>MakeFileProj</Keyword> -\t</PropertyGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.Default.props" /> -\t<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -\t\t<ConfigurationType>Makefile</ConfigurationType> -\t\t<UseOfMfc>false</UseOfMfc> -\t\t<PlatformToolset>v141</PlatformToolset> -\t</PropertyGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.props" /> -\t<ImportGroup Label="ExtensionSettings"> -\t</ImportGroup> -\t<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -\t\t<Import Project="$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -\t</ImportGroup> -\t<PropertyGroup Label="UserMacros" /> -\t<PropertyGroup> -\t<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> -\t\t<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"</NMakeBuildCommandLine> -\t\t<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct "Test.exe"</NMakeReBuildCommandLine> -\t\t<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c "Test.exe"</NMakeCleanCommandLine> -\t\t<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Test.exe</NMakeOutput> -\t\t<NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEF1;DEF2;DEF3=1234</NMakePreprocessorDefinitions> -\t\t<NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">inc1;inc2</NMakeIncludeSearchPath> -\t\t<NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes> -\t\t<NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath> -\t\t<NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies> -\t</PropertyGroup> -\t<ItemGroup> -\t\t<ClInclude Include="sdk_dir\\sdk.h" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<ClInclude Include="test.h" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="readme.txt" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="test.rc" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<ClCompile Include="test1.cpp" /> -\t\t<ClCompile Include="test2.cpp" /> -\t</ItemGroup> -\t<ItemGroup> -\t\t<None Include="SConstruct" /> -\t</ItemGroup> -\t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.targets" /> -\t<ImportGroup Label="ExtensionTargets"> -\t</ImportGroup> -</Project> -""" - -SConscript_contents_8_0 = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - HOST_ARCH='%(HOST_ARCH)s') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -SConscript_contents_9_0 = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='9.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - HOST_ARCH='%(HOST_ARCH)s') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -SConscript_contents_10_0 = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', +SConscript_contents_fmt = """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='%(MSVS_VERSION)s', CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], CPPPATH=['inc1', 'inc2'], HOST_ARCH='%(HOST_ARCH)s') @@ -1050,7 +622,7 @@ testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] -env.MSVSProject(target = 'Test.vcxproj', +env.MSVSProject(target = '%(PROJECT_FILE)s', slnguid = '{SLNGUID}', srcs = testsrc, incs = testincs, @@ -1061,74 +633,14 @@ env.MSVSProject(target = 'Test.vcxproj', variant = 'Release') """ -SConscript_contents_11_0 = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - HOST_ARCH='%(HOST_ARCH)s') -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] +def get_tested_proj_file_vc_versions(): + """ + Returns all MSVC versions that we want to test project file creation for. + """ + #return ['8.0', '9.0', '10.0', '11.0', '12.0', '14.0', '14.1', '14.2'] + return ['9.0'] -env.MSVSProject(target = 'Test.vcxproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -SConscript_contents_14_0 = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='14.0', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - HOST_ARCH='%(HOST_ARCH)s') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" - -SConscript_contents_14_1 = """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='14.1', - CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')], - CPPPATH=['inc1', 'inc2'], - HOST_ARCH='%(HOST_ARCH)s') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = [r'sdk_dir\\sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcxproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""" class TestSConsMSVS(TestSCons): """Subclass for testing MSVS-specific portions of SCons.""" @@ -1276,6 +788,119 @@ print("self._msvs_versions =%%s"%%str(SCons.Tool.MSCommon.query_versions())) print("--------------------------------------------------------------") print("--------------------------------------------------------------") self.fail_test() + + def parse_vc_version(self, vc_version): + """ + Parses the string vc_version to determine the major and minor version + included. + """ + components = vc_version.split('.') + major = int(components[0]) + minor = 0 if len(components) < 2 else int(components[1]) + return major, minor + + def _get_solution_file_format_version(self, vc_version): + """ + Returns the Visual Studio format version expected in the .sln file. + """ + major, _ = self.parse_vc_version(vc_version) + if major == 8: + return '9.00' + elif major == 9: + return '10.00' + elif major == 10: + return '11.00' + elif major > 10: + return '12.00' + else: + raise SCons.Errors.UserError('Received unexpected VC version %s' % vc_version) + + def _get_solution_file_vs_number(self, vc_version): + """ + Returns the Visual Studio number expected in the .sln file. + """ + major, minor = self.parse_vc_version(vc_version) + if major == 8: + return '2005' + elif major == 9: + return '2008' + if major == 10: + return '2010' + elif major == 11: + return '11' + elif major == 12: + return '14' + elif major == 14 and (minor == 0 or minor == 1): + # Visual Studio 2015 and 2017 both use 15 in this entry. + return '15' + elif major == 14 and minor == 2: + return '16' + else: + raise SCons.Errors.UserError('Received unexpected VC version %s' % vc_version) + + def _get_vcxproj_file_tools_version(self, vc_version): + """ + Returns the version entry expected in the project file. + For .vcxproj files, this goes is ToolsVersion. + For .vcproj files, this goes in Version. + """ + major, minor = self.parse_vc_version(vc_version) + if major == 8: + # Version="8.00" + return '8.00' + elif major == 9: + # Version="9.00" + return '9.00' + elif major < 14: + # ToolsVersion='4.0' + return '4.0' + elif major == 14 and minor == 0: + # ToolsVersion='14.0' + return '14.0' + elif major == 14 and minor == 1: + # ToolsVersion='15.0' + return '15.0' + elif vc_version == '14.2': + # ToolsVersion='16' + return '16.0' + else: + raise SCons.Errors.UserError('Received unexpected VC version %s' % vc_version) + + def _get_vcxproj_file_cpp_path(self, dirs): + """Returns the include paths expected in the .vcxproj file""" + return ';'.join([self.workpath(dir) for dir in dirs]) + + def get_expected_sln_file_contents(self, vc_version, project_file): + """ + Returns the expected .sln file contents. + Currently this function only supports the newer VC versions that use + the .vcxproj file format. + """ + return expected_slnfile_fmt % { + 'FORMAT_VERSION': self._get_solution_file_format_version(vc_version), + 'VS_NUMBER': self._get_solution_file_vs_number(vc_version), + 'PROJECT_NAME': project_file.split('.')[0], + 'PROJECT_FILE': project_file, + } + + def get_expected_proj_file_contents(self, vc_version, dirs, project_file): + """Returns the expected .vcxproj file contents""" + if project_file.endswith('.vcxproj'): + fmt = expected_vcxprojfile_fmt + else: + fmt = expected_vcprojfile_fmt + return fmt % { + 'TOOLS_VERSION': self._get_vcxproj_file_tools_version(vc_version), + 'INCLUDE_DIRS': self._get_vcxproj_file_cpp_path(dirs), + } + + def get_expected_sconscript_file_contents(self, vc_version, project_file): + return SConscript_contents_fmt % { + 'HOST_ARCH': self.get_vs_host_arch(), + 'MSVS_VERSION': vc_version, + 'PROJECT_FILE': project_file, + } + # Local Variables: # tab-width:4 # indent-tabs-mode:nil |