diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-09 18:49:53 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-09 18:49:53 (GMT) |
| commit | 04a5dea1a00abd7ffdc4c274f000273ce6ff37db (patch) | |
| tree | de73f1079176391dae6b9084d19effa9b7657dd8 /SCons/Tool/MSCommon/MSVC/ScriptArguments.py | |
| parent | 23f63fc766f9e157bfe8642b8559983dde684dd3 (diff) | |
| download | SCons-04a5dea1a00abd7ffdc4c274f000273ce6ff37db.zip SCons-04a5dea1a00abd7ffdc4c274f000273ce6ff37db.tar.gz SCons-04a5dea1a00abd7ffdc4c274f000273ce6ff37db.tar.bz2 | |
Rework version convenience functions. Add additional tests.
Diffstat (limited to 'SCons/Tool/MSCommon/MSVC/ScriptArguments.py')
| -rw-r--r-- | SCons/Tool/MSCommon/MSVC/ScriptArguments.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py index d07b78f..fab948e 100644 --- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py +++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py @@ -77,6 +77,8 @@ def _verify_re_sdk_dispatch_map(): raise MSVCInternalError(err_msg) return None +# toolset regexes need to accept same formats as extended version regexes in ./Util.py + # capture msvc version re_toolset_version = re.compile(r'^(?P<version>[1-9][0-9]?[.][0-9])[0-9.]*$', re.IGNORECASE) @@ -323,7 +325,7 @@ def _msvc_script_argument_sdk(env, msvc, toolset, platform_def, arglist): if err_msg: raise MSVCArgumentError(err_msg) - sdk_list = WinSDK.get_sdk_version_list(msvc.vs_def.vc_sdk_versions, platform_def) + sdk_list = WinSDK.get_sdk_version_list(msvc.vs_def, platform_def) if sdk_version not in sdk_list: err_msg = "MSVC_SDK_VERSION {} not found for platform type {}".format( @@ -345,7 +347,7 @@ def _msvc_script_default_sdk(env, msvc, platform_def, arglist): if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric: return None - sdk_list = WinSDK.get_sdk_version_list(msvc.vs_def.vc_sdk_versions, platform_def) + sdk_list = WinSDK.get_sdk_version_list(msvc.vs_def, platform_def) if not len(sdk_list): return None |