Skip to content

MSVS: update generation of the vcxproj embedded python script #4818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcbrill wants to merge 9 commits into
base: master
Choose a base branch
from
+127 −13
Open

MSVS: update generation of the vcxproj embedded python script #4818

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a83650
MSVS: update generation of the vcxproj embedded python script
jcbrill Jan 18, 2026
f7d7d2a
MSVS: revise generation of the vcxproj embedded python script
jcbrill Jan 20, 2026
3e27697
MSVS: revise the vcxproj embedded python script contents
jcbrill Jan 21, 2026
0a5ba77
MSVS: revise the vcxproj embedded python script contents
jcbrill Jan 24, 2026
b2170a1
MSVS: revise the vcxproj embedded python script contents
jcbrill Jan 26, 2026
b6a2b51
MSVS: revise the vcxproj embedded python script contents to be backwa…
jcbrill Jan 29, 2026
63603ab
MSVS: revise the vcxproj embedded python script contents to be backwa…
jcbrill Jan 30, 2026
eacb5d2
MSVS: revise the vcxproj embedded python script
jcbrill Feb 1, 2026
ff494a5
MSVS: minor change of the vcxproj embedded python script
jcbrill Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 43 additions & 13 deletions SCons/Tool/msvs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import pickle
import re
import sys
import textwrap

import SCons.Builder
import SCons.Node.FS
Expand Down Expand Up @@ -152,27 +153,56 @@ def msvs_parse_version(s):
num, suite = version_re.match(s).groups()
return float(num), suite

# This is how we re-invoke SCons from inside MSVS Project files.
# The problem is that we might have been invoked as either scons.bat
# or scons.py. If we were invoked directly as scons.py, then we could
# use sys.argv[0] to find the SCons "executable," but that doesn't work
# if we were invoked as scons.bat, which uses "python -c" to execute
# things and ends up with "-c" as sys.argv[0]. Consequently, we have
# the MSVS Project file invoke SCons the same way that scons.bat does,
# which works regardless of how we were invoked.
_exec_script_main_template = None

def getExecScriptMain(env, xml=None):
"""
This is how we re-invoke SCons from inside MSVS Project files.
The problem is that we might have been invoked as either scons.bat
or scons.py. If we were invoked directly as scons.py, then we could
use sys.argv[0] to find the SCons "executable," but that doesn't work
if we were invoked as scons.bat, which uses "python -c" to execute
things and ends up with "-c" as sys.argv[0]. Consequently, we have
the MSVS Project file invoke SCons the same way that scons.bat does,
which works regardless of how we were invoked.

:param env: Environment to operate on
:param xml: Extra XML to add to generated MSVS project file
"""
global _exec_script_main_template

if 'SCONS_HOME' not in env:
env['SCONS_HOME'] = os.environ.get('SCONS_HOME')
scons_home = env.get('SCONS_HOME')
if not scons_home and 'SCONS_LIB_DIR' in os.environ:
scons_home = os.environ['SCONS_LIB_DIR']
if scons_home:
exec_script_main = "from os.path import join; import sys; sys.path = [ r'%s' ] + sys.path; import SCons.Script; SCons.Script.main()" % scons_home
else:
version = SCons.__version__
exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-%(version)s'), join(sys.prefix, 'scons-%(version)s'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" % locals()

if _exec_script_main_template is None:
_exec_script_main_template = "; ".join(textwrap.dedent(
"""\
import os.path
import sys
scons_home = r'{scons_home}'
scons_path = r'{scons_path}'
scons_spec = scons_home if scons_home else scons_path
have_scons = bool(scons_spec and os.path.isdir(scons_spec) and os.path.isfile(os.path.join(scons_spec, 'SCons', '__init__.py')))
sys.path = [scons_spec] + sys.path if have_scons else sys.path
_ = None if have_scons else print(f'python: *** ATTENTION: SCons was not found at the generated path location (\\\'{{scons_spec}}\\\'). ***')
import SCons.Script
_ = None if have_scons else print(f'python: *** ATTENTION: SCons was found on the python system path (\\\'{{os.path.dirname(os.path.dirname(SCons.__file__))}}\\\'). ***')
SCons.Script.main()
"""
).splitlines())

exec_script_main = _exec_script_main_template.format(
scons_home=os.path.abspath(scons_home) if scons_home else '',
scons_path=os.path.abspath(os.path.dirname(os.path.dirname(SCons.__file__))),
)
# print("exec_script_main:\n", ' ' + '\n '.join(exec_script_main.split("; ")))

if xml:
exec_script_main = xmlify(exec_script_main)

return exec_script_main

# The string for the Python executable we tell the Project file to use
Expand Down
1 change: 1 addition & 0 deletions runtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ def footer(self, f):
# Because SCons is really aggressive about finding its modules,
# it sometimes finds SCons modules elsewhere on the system.
# This forces SCons to use the modules that are being tested.
testenv['SCONS_HOME'] = scons_lib_dir
Copy link
Copy Markdown
Contributor

@bdbaddog bdbaddog Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add this?

Copy link
Copy Markdown
Contributor Author

@jcbrill jcbrill Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prior to this PR (i.e., current master):

  • If SCONS_HOME is set in the environment when the test is run, it has to match the SCONS_LIB_DIR string exactly.
  • In msvs.py, SCONS_HOME is used before SCONS_LIB_DIR.
  • In TestSConsMSVS.py, only SCONS_LIB_DIR is used.
  • SCONS_LIB_DIR is added to the testenv.
  • SCONS_HOME is not added to the testenv.

When forcing SCONS_LIB_DIR into the testenv, SCONS_HOME should be populated since it's used in the source code but not in the test suite.

SCONS_HOME was added to TestSConsMSVS.py for consistency with the source code.

Note: I'm testing significantly revised versions of msvs.py and TestSConsMSVS.py which I intend to push later today or in the morning tomorrow pending testing insights.

Copy link
Copy Markdown
Contributor

@bdbaddog bdbaddog Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I say that probably neither should be set by runtest.py anymore SCONS_LIB_DIR was ancient and needed prior to re-org-ing the code and the packaging.
Since it's unlikely than any user would have either set, we should be testing without them..

Copy link
Copy Markdown
Contributor Author

@jcbrill jcbrill Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With regards to the current code, I believe that might require a user to set SCONS_HOME or SCONS_LIB_DIR in their environment when running the test suite with a source distribution.

For example, testing an SCons source branch with a python that does not have SCons installed. If there are any tests that actually run devenv against the generated project files would have a problem.

The scoop issue reported is effectively the same problem. A standalone SCons distribution as opposed to SCons installed as a library. SCONS_HOME is the solution with current master.

I thought at one point in time, we had to set SCONS_HOME before running the test suite but I could be wrong.

Copy link
Copy Markdown
Contributor

@bdbaddog bdbaddog Jan 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just commented out setting SCONS_LIB_DIR and SCONS_HOME from elif clause here and tests ran fine, with and without setting --baseline to another dir and with and without installing scons in the activated virtualenv.

diff --git a/runtest.py b/runtest.py
index ee264ecac..7cd4e9127 100755
--- a/runtest.py
+++ b/runtest.py
@@ -537,11 +537,12 @@ if scons:
     # its own modules.
     testenv['SCONS'] = scons
 elif scons_lib_dir:
+    pass
     # Because SCons is really aggressive about finding its modules,
     # it sometimes finds SCons modules elsewhere on the system.
     # This forces SCons to use the modules that are being tested.
-    testenv['SCONS_HOME'] = scons_lib_dir
-    testenv['SCONS_LIB_DIR'] = scons_lib_dir
+    # testenv['SCONS_HOME'] = scons_lib_dir
+    # testenv['SCONS_LIB_DIR'] = scons_lib_dir

 if args.scons_exec:
     testenv['SCONS_EXEC'] = '1'```

This used to be important, but hasn't been for a while as far as I'm aware.

testenv['SCONS_LIB_DIR'] = scons_lib_dir

if args.scons_exec:
Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/common-prefix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
test.must_exist(test.workpath('work1', 'Test.vcproj'))
vcproj = test.read(['work1', 'Test.vcproj'], 'r')
expected_vcprojfile = vcproj_template % locals()
expect = test.msvs_substitute(expected_vcprojfile, '8.0', 'work1', 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '8.0', subdir='work1', sconscript='SConstruct')
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

Expand All @@ -163,7 +163,7 @@
test.must_exist(test.workpath('work2', 'Test.vcproj'))
vcproj = test.read(['work2', 'Test.vcproj'], 'r')
expected_vcprojfile = vcproj_template % locals()
expect = test.msvs_substitute(expected_vcprojfile, '8.0', 'work2', 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '8.0', subdir='work2', sconscript='SConstruct')
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

Expand Down
2 changes: 1 addition & 1 deletion test/MSVS/runfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

test.must_exist(test.workpath('work1', 'Test.vcproj'))
vcproj = test.read(['work1', 'Test.vcproj'], 'r')
expect = test.msvs_substitute(expected_vcprojfile, '8.0', 'work1', 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '8.0', subdir='work1', sconscript='SConstruct')
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-6.0-clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@

test.must_exist(test.workpath('Test.dsp'))
dsp = test.read('Test.dsp', 'r')
expect = test.msvs_substitute(expected_dspfile, '6.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_dspfile, '6.0', sconscript='SConstruct')
# don't compare the pickled data
assert dsp[:len(expect)] == expect, test.diff_substr(expect, dsp)

test.must_exist(test.workpath('Test.dsw'))
dsw = test.read('Test.dsw', 'r')
expect = test.msvs_substitute(expected_dswfile, '6.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_dswfile, '6.0', sconscript='SConstruct')
assert dsw == expect, test.diff_substr(expect, dsw)

test.run(arguments='-c .')
Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-6.0-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@

test.must_exist(test.workpath('Test.dsp'))
dsp = test.read('Test.dsp', 'r')
expect = test.msvs_substitute(expected_dspfile, '6.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_dspfile, '6.0', sconscript='SConstruct')
# don't compare the pickled data
assert dsp[:len(expect)] == expect, test.diff_substr(expect, dsp)

test.must_exist(test.workpath('Test.dsw'))
dsw = test.read('Test.dsw', 'r')
expect = test.msvs_substitute(expected_dswfile, '6.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_dswfile, '6.0', sconscript='SConstruct')
assert dsw == expect, test.diff_substr(expect, dsw)

test.run(arguments='-c .')
Expand Down
6 changes: 3 additions & 3 deletions test/MSVS/vs-6.0-variant_dir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
test.run(arguments=".")

dsp = test.read(['src', 'Test.dsp'], 'r')
expect = test.msvs_substitute(expected_dspfile, '6.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_dspfile, '6.0', sconscript='SConstruct')
# don't compare the pickled data
assert dsp[:len(expect)] == expect, test.diff_substr(expect, dsp)

test.must_exist(test.workpath('src', 'Test.dsw'))
dsw = test.read(['src', 'Test.dsw'], 'r')
expect = test.msvs_substitute(expected_dswfile, '6.0', 'src')
assert dsw == expect, test.diff_substr(expect, dsw)
expect = test.msvs_substitute(expected_dswfile, '6.0', subdir='src')
assert dsw == expect, test.diff_substr(expect, subdir=dsw)

test.must_match(['build', 'Test.dsp'], """\
This is just a placeholder file.
Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-7.0-clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='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, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_slnfile, '7.0', sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
7 changes: 3 additions & 4 deletions test/MSVS/vs-7.0-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='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, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_slnfile, '7.0', sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down Expand Up @@ -83,8 +83,7 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct',
python=python)
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='SConstruct', python=python)
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

Expand Down
6 changes: 2 additions & 4 deletions test/MSVS/vs-7.0-scc-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct',
vcproj_sccinfo=expected_vcproj_sccinfo)
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='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, '7.0', None, 'SConstruct',
sln_sccinfo=expected_sln_sccinfo)
expect = test.msvs_substitute(expected_slnfile, '7.0', sconscript='SConstruct', sln_sccinfo=expected_sln_sccinfo)
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
5 changes: 2 additions & 3 deletions test/MSVS/vs-7.0-scc-legacy-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct',
vcproj_sccinfo=expected_vcproj_sccinfo)
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='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, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_slnfile, '7.0', sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-7.0-variant_dir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
test.run(arguments=".")

vcproj = test.read(['src', 'Test.vcproj'], 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='SConstruct')
# 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, '7.0', 'src')
expect = test.msvs_substitute(expected_slnfile, '7.0', subdir='src')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-7.1-clean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', None, 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', sconscript='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, '7.1', None, 'SConstruct')
expect = test.msvs_substitute(expected_slnfile, '7.1', sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
7 changes: 3 additions & 4 deletions test/MSVS/vs-7.1-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', None, 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', sconscript='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, '7.1', None, 'SConstruct')
expect = test.msvs_substitute(expected_slnfile, '7.1', sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down Expand Up @@ -83,8 +83,7 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', None, 'SConstruct',
python=python)
expect = test.msvs_substitute(expected_vcprojfile, '7.1', sconscript='SConstruct', python=python)
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

Expand Down
6 changes: 2 additions & 4 deletions test/MSVS/vs-7.1-scc-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', None, 'SConstruct',
vcproj_sccinfo=expected_vcproj_sccinfo)
expect = test.msvs_substitute(expected_vcprojfile, '7.1', sconscript='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, '7.1', None, 'SConstruct',
sln_sccinfo=expected_sln_sccinfo)
expect = test.msvs_substitute(expected_slnfile, '7.1', sconscript='SConstruct', sln_sccinfo=expected_sln_sccinfo)
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
5 changes: 2 additions & 3 deletions test/MSVS/vs-7.1-scc-legacy-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,13 @@

test.must_exist(test.workpath('Test.vcproj'))
vcproj = test.read('Test.vcproj', 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.1', None, 'SConstruct',
vcproj_sccinfo=expected_vcproj_sccinfo)
expect = test.msvs_substitute(expected_vcprojfile, '7.1', sconscript='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, '7.1', None, 'SConstruct')
expect = test.msvs_substitute(expected_slnfile, '7.1', sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-7.1-variant_dir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
test.run(arguments=".")

vcproj = test.read(['src', 'Test.vcproj'], 'r')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct')
expect = test.msvs_substitute(expected_vcprojfile, '7.0', sconscript='SConstruct')
# 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, '7.0', 'src')
expect = test.msvs_substitute(expected_slnfile, '7.0', subdir='src')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down
7 changes: 3 additions & 4 deletions test/MSVS/vs-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
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')
expect = test.msvs_substitute(expected_vcprojfile, vc_version, sconscript='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')
expect = test.msvs_substitute(expected_slnfile, vc_version, sconscript='SConstruct')
# don't compare the pickled data
assert sln[:len(expect)] == expect, test.diff_substr(expect, sln)

Expand Down Expand Up @@ -99,8 +99,7 @@

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)
expect = test.msvs_substitute(expected_vcprojfile, vc_version, sconscript='SConstruct', python=python)
# don't compare the pickled data
assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj)

Expand Down
4 changes: 2 additions & 2 deletions test/MSVS/vs-mult-auto-guid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@

test.must_exist(test.workpath(project_file_1))
vcproj = test.read(project_file_1, 'r')
expect = test.msvs_substitute(expected_vcprojfile_1, vc_version, None, 'SConstruct', project_guid=project_guid_1)
expect = test.msvs_substitute(expected_vcprojfile_1, vc_version, sconscript='SConstruct', project_guid=project_guid_1)
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

test.must_exist(test.workpath(project_file_2))
vcproj = test.read(project_file_2, 'r')
expect = test.msvs_substitute(expected_vcprojfile_2, vc_version, None, 'SConstruct', project_guid=project_guid_2)
expect = test.msvs_substitute(expected_vcprojfile_2, vc_version, sconscript='SConstruct', project_guid=project_guid_2)
# don't compare the pickled data
assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)

Expand Down
Loading