summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SCons/Tool/MSCommon/__init__.py57
-rw-r--r--SCons/Tool/MSCommon/common.py6
-rw-r--r--SCons/Tool/MSCommon/vc.py14
-rw-r--r--SCons/Tool/MSCommon/vcTests.py14
-rw-r--r--test/MSVC/msvc_query_version_toolset.py1
5 files changed, 53 insertions, 39 deletions
diff --git a/SCons/Tool/MSCommon/__init__.py b/SCons/Tool/MSCommon/__init__.py
index ff2e42a..9d2e14a 100644
--- a/SCons/Tool/MSCommon/__init__.py
+++ b/SCons/Tool/MSCommon/__init__.py
@@ -28,11 +28,14 @@ Common functions for Microsoft Visual Studio and Visual C/C++.
import SCons.Errors
import SCons.Platform.win32
-import SCons.Util
+import SCons.Util # noqa: F401
-from SCons.Tool.MSCommon.sdk import mssdk_exists, mssdk_setup_env
+from SCons.Tool.MSCommon.sdk import ( # noqa: F401
+ mssdk_exists,
+ mssdk_setup_env,
+)
-from SCons.Tool.MSCommon.vc import (
+from SCons.Tool.MSCommon.vc import ( # noqa: F401
msvc_exists,
msvc_setup_env_tool,
msvc_setup_env_once,
@@ -43,7 +46,7 @@ from SCons.Tool.MSCommon.vc import (
msvc_query_version_toolset,
)
-from SCons.Tool.MSCommon.vs import (
+from SCons.Tool.MSCommon.vs import ( # noqa: F401
get_default_version,
get_vs_by_version,
merge_default_version,
@@ -51,28 +54,36 @@ from SCons.Tool.MSCommon.vs import (
query_versions,
)
-from .MSVC.Policy import msvc_set_notfound_policy # noqa: F401
-from .MSVC.Policy import msvc_get_notfound_policy # noqa: F401
-from .MSVC.Policy import msvc_set_scripterror_policy # noqa: F401
-from .MSVC.Policy import msvc_get_scripterror_policy # noqa: F401
+from .MSVC.Policy import ( # noqa: F401
+ msvc_set_notfound_policy,
+ msvc_get_notfound_policy,
+ msvc_set_scripterror_policy,
+ msvc_get_scripterror_policy,
+)
-from .MSVC.Exceptions import VisualCException # noqa: F401
-from .MSVC.Exceptions import MSVCInternalError # noqa: F401
-from .MSVC.Exceptions import MSVCUserError # noqa: F401
-from .MSVC.Exceptions import MSVCScriptExecutionError # noqa: F401
-from .MSVC.Exceptions import MSVCVersionNotFound # noqa: F401
-from .MSVC.Exceptions import MSVCSDKVersionNotFound # noqa: F401
-from .MSVC.Exceptions import MSVCToolsetVersionNotFound # noqa: F401
-from .MSVC.Exceptions import MSVCSpectreLibsNotFound # noqa: F401
-from .MSVC.Exceptions import MSVCArgumentError # noqa: F401
+from .MSVC.Exceptions import ( # noqa: F401
+ VisualCException,
+ MSVCInternalError,
+ MSVCUserError,
+ MSVCScriptExecutionError,
+ MSVCVersionNotFound,
+ MSVCSDKVersionNotFound,
+ MSVCToolsetVersionNotFound,
+ MSVCSpectreLibsNotFound,
+ MSVCArgumentError,
+)
-from .vc import MSVCUnsupportedHostArch # noqa: F401
-from .vc import MSVCUnsupportedTargetArch # noqa: F401
-from .vc import MSVCScriptNotFound # noqa: F401
-from .vc import MSVCUseSettingsError # noqa: F401
+from .vc import ( # noqa: F401
+ MSVCUnsupportedHostArch,
+ MSVCUnsupportedTargetArch,
+ MSVCScriptNotFound,
+ MSVCUseSettingsError,
+)
-from .MSVC.Util import msvc_version_components # noqa: F401
-from .MSVC.Util import msvc_extended_version_components # noqa: F401
+from .MSVC.Util import ( # noqa: F401
+ msvc_version_components,
+ msvc_extended_version_components,
+)
# Local Variables:
# tab-width:4
diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py
index aa01abc..ad4c827 100644
--- a/SCons/Tool/MSCommon/common.py
+++ b/SCons/Tool/MSCommon/common.py
@@ -45,6 +45,7 @@ class MSVCCacheInvalidWarning(SCons.Warnings.WarningOnByDefault):
LOGFILE = os.environ.get('SCONS_MSCOMMON_DEBUG')
if LOGFILE:
import logging
+
modulelist = (
# root module and parent/root module
'MSCommon', 'Tool',
@@ -53,6 +54,7 @@ if LOGFILE:
# scons modules
'SCons', 'test', 'scons'
)
+
def get_relative_filename(filename, module_list):
if not filename:
return filename
@@ -63,6 +65,7 @@ if LOGFILE:
except ValueError:
pass
return filename
+
class _Debug_Filter(logging.Filter):
# custom filter for module relative filename
def filter(self, record):
@@ -70,6 +73,7 @@ if LOGFILE:
relfilename = relfilename.replace('\\', '/')
record.relfilename = relfilename
return True
+
# Log format looks like:
# 00109ms:MSCommon/vc.py:find_vc_pdir#447: VC found '14.3' [file]
# debug: 00109ms:MSCommon/vc.py:find_vc_pdir#447: VC found '14.3' [stdout]
@@ -231,7 +235,7 @@ def normalize_env(env, keys, force=False):
# should include it, but keep this here to be safe (needed for reg.exe)
sys32_dir = os.path.join(
os.environ.get("SystemRoot", os.environ.get("windir", r"C:\Windows")), "System32"
-)
+ )
if sys32_dir not in normenv["PATH"]:
normenv["PATH"] = normenv["PATH"] + os.pathsep + sys32_dir
diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py
index 46d6164..9d4bc9a 100644
--- a/SCons/Tool/MSCommon/vc.py
+++ b/SCons/Tool/MSCommon/vc.py
@@ -423,7 +423,7 @@ def get_msvc_version_numeric(msvc_version):
str: the value converted to a numeric only string
"""
- return ''.join([x for x in msvc_version if x in string_digits + '.'])
+ return ''.join([x for x in msvc_version if x in string_digits + '.'])
def get_host_platform(host_platform):
@@ -621,11 +621,11 @@ def msvc_version_to_maj_min(msvc_version):
maj = int(t[0])
min = int(t[1])
return maj, min
- except ValueError as e:
+ except ValueError:
raise ValueError("Unrecognized version %s (%s)" % (msvc_version,msvc_version_numeric)) from None
-VSWHERE_PATHS = [os.path.join(p,'vswhere.exe') for p in [
+VSWHERE_PATHS = [os.path.join(p,'vswhere.exe') for p in [
os.path.expandvars(r"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"),
os.path.expandvars(r"%ProgramFiles%\Microsoft Visual Studio\Installer"),
os.path.expandvars(r"%ChocolateyInstall%\bin"),
@@ -1082,9 +1082,9 @@ def get_default_version(env):
if not msvc_version == msvs_version:
SCons.Warnings.warn(
SCons.Warnings.VisualVersionMismatch,
- "Requested msvc version (%s) and msvs version (%s) do " \
- "not match: please use MSVC_VERSION only to request a " \
- "visual studio version, MSVS_VERSION is deprecated" \
+ "Requested msvc version (%s) and msvs version (%s) do "
+ "not match: please use MSVC_VERSION only to request a "
+ "visual studio version, MSVS_VERSION is deprecated"
% (msvc_version, msvs_version))
return msvs_version
@@ -1102,7 +1102,7 @@ def get_default_version(env):
def msvc_setup_env_once(env, tool=None):
try:
- has_run = env["MSVC_SETUP_RUN"]
+ has_run = env["MSVC_SETUP_RUN"]
except KeyError:
has_run = False
diff --git a/SCons/Tool/MSCommon/vcTests.py b/SCons/Tool/MSCommon/vcTests.py
index 2b6fbe5..9a4d1a5 100644
--- a/SCons/Tool/MSCommon/vcTests.py
+++ b/SCons/Tool/MSCommon/vcTests.py
@@ -50,7 +50,7 @@ class VswhereTestCase(unittest.TestCase):
def _createVSWhere(path):
os.makedirs(os.path.dirname(path), exist_ok=True)
with open(path, 'w') as f:
- f.write("Created:%s"%f)
+ f.write("Created:%s" % f)
def testDefaults(self):
"""
@@ -59,13 +59,13 @@ class VswhereTestCase(unittest.TestCase):
# import pdb; pdb.set_trace()
vswhere_dirs = [os.path.splitdrive(p)[1] for p in SCons.Tool.MSCommon.vc.VSWHERE_PATHS]
base_dir = test.workpath('fake_vswhere')
- test_vswhere_dirs = [os.path.join(base_dir,d[1:]) for d in vswhere_dirs]
+ test_vswhere_dirs = [os.path.join(base_dir,d[1:]) for d in vswhere_dirs]
SCons.Tool.MSCommon.vc.VSWHERE_PATHS = test_vswhere_dirs
for vsw in test_vswhere_dirs:
VswhereTestCase._createVSWhere(vsw)
find_path = SCons.Tool.MSCommon.vc.msvc_find_vswhere()
- self.assertTrue(vsw == find_path, "Didn't find vswhere in %s found in %s"%(vsw, find_path))
+ self.assertTrue(vsw == find_path, "Didn't find vswhere in %s found in %s" % (vsw, find_path))
os.remove(vsw)
# def specifiedVswherePathTest(self):
@@ -132,7 +132,7 @@ class MSVcTestCase(unittest.TestCase):
with open(tools_version_file, 'w') as tf:
tf.write(MS_TOOLS_VERSION)
except IOError as e:
- print("Failed trying to write :%s :%s"%(tools_version_file, e))
+ print("Failed trying to write :%s :%s" % (tools_version_file, e))
# Now walk all the valid combinations of host/target for 14.1 (VS2017) and later
@@ -158,7 +158,7 @@ class MSVcTestCase(unittest.TestCase):
except MSVCUnsupportedHostArch:
pass
else:
- self.fail('Did not fail when HOST_ARCH specified as: %s'%env['HOST_ARCH'])
+ self.fail('Did not fail when HOST_ARCH specified as: %s' % env['HOST_ARCH'])
# Now test bogus value for TARGET_ARCH
env={'TARGET_ARCH':'GARBAGE', 'HOST_ARCH':'x86'}
@@ -189,7 +189,7 @@ class MSVcTestCase(unittest.TestCase):
try:
result=check(env, '.', '9.0')
# print("for:%s got :%s"%(env, result))
- self.assertFalse(result, "Did not fail with bogus HOST_ARCH host: %s target: %s"%(env['HOST_ARCH'], env['TARGET_ARCH']))
+ self.assertFalse(result, "Did not fail with bogus HOST_ARCH host: %s target: %s" % (env['HOST_ARCH'], env['TARGET_ARCH']))
except MSVCUnsupportedHostArch:
pass
else:
@@ -200,7 +200,7 @@ class MSVcTestCase(unittest.TestCase):
try:
result=check(env, '.', '9.0')
# print("for:%s got :%s"%(env, result))
- self.assertFalse(result, "Did not fail with bogus TARGET_ARCH host: %s target: %s"%(env['HOST_ARCH'], env['TARGET_ARCH']))
+ self.assertFalse(result, "Did not fail with bogus TARGET_ARCH host: %s target: %s" % (env['HOST_ARCH'], env['TARGET_ARCH']))
except MSVCUnsupportedTargetArch:
pass
else:
diff --git a/test/MSVC/msvc_query_version_toolset.py b/test/MSVC/msvc_query_version_toolset.py
index 5880f8c..6b7b731 100644
--- a/test/MSVC/msvc_query_version_toolset.py
+++ b/test/MSVC/msvc_query_version_toolset.py
@@ -34,7 +34,6 @@ test.skip_if_not_msvc()
import unittest
from SCons.Tool.MSCommon.vc import _VCVER
-from SCons.Tool.MSCommon.vc import msvc_default_version
from SCons.Tool.MSCommon import msvc_version_components
from SCons.Tool.MSCommon import msvc_extended_version_components
from SCons.Tool.MSCommon import msvc_toolset_versions
generated by cgit v0.12 at 2025-09-20 08:47:22 (GMT)