diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2024-03-12 11:45:07 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2024-03-12 11:45:07 (GMT) |
| commit | 1fab5957fc547c6ce6475e29613e892dd73afb6e (patch) | |
| tree | 1b6c51fdd27112a9657ab92427f48a31d7568407 /testing | |
| parent | a20098e4d90c3ef0e6e938e350ad2b20f5d9e780 (diff) | |
| download | SCons-1fab5957fc547c6ce6475e29613e892dd73afb6e.zip SCons-1fab5957fc547c6ce6475e29613e892dd73afb6e.tar.gz SCons-1fab5957fc547c6ce6475e29613e892dd73afb6e.tar.bz2 | |
Detection changes for VS IDE editions and VS2008 (develop and vcforpython).
Changes:
* An express installation of the IDE binary is used when no other IDE edition is detected.
* A full development edition (e.g., Professional) of VS2008 is elected before a Visual C++ For Python edition.
* Update detection order in README.rst and remove hard tabs.
* Minor fixes lingering from original VSWHERE implementation where all call chains were not updated when the environment argument was added.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestSConsMSVS.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/framework/TestSConsMSVS.py b/testing/framework/TestSConsMSVS.py index 8c34372..91aa329 100644 --- a/testing/framework/TestSConsMSVS.py +++ b/testing/framework/TestSConsMSVS.py @@ -680,7 +680,7 @@ class TestSConsMSVS(TestSCons): import SCons import SCons.Tool.MSCommon print("self.scons_version =%%s"%%repr(SCons.__%s__)) -print("self._msvs_versions =%%s"%%str(SCons.Tool.MSCommon.query_versions())) +print("self._msvs_versions =%%s"%%str(SCons.Tool.MSCommon.query_versions(env=None))) """ % 'version' self.run(arguments = '-n -q -Q -f -', stdin = input) @@ -738,13 +738,13 @@ print("self._msvs_versions =%%s"%%str(SCons.Tool.MSCommon.query_versions())) result = result.replace('<SCC_SLN_INFO>\n', sln_sccinfo) return result - def get_msvs_executable(self, version): + def get_msvs_executable(self, version, env=None): """Returns a full path to the executable (MSDEV or devenv) for the specified version of Visual Studio. """ from SCons.Tool.MSCommon import get_vs_by_version - msvs = get_vs_by_version(version) + msvs = get_vs_by_version(version, env) if not msvs: return None return msvs.get_executable() |