diff options
-rwxr-xr-x | CHANGES.txt | 2 | ||||
-rwxr-xr-x | RELEASE.txt | 2 | ||||
-rw-r--r-- | SCons/Tool/MSCommon/MSVC/Policy.py | 3 | ||||
-rw-r--r-- | SCons/Tool/MSCommon/MSVC/Warnings.py | 4 |
4 files changed, 3 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index a4cf13a..3fe1266 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -84,7 +84,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER construction variable is MSVC_NOTFOUND_POLICY. When defined, the environment construction variable overrides the global policy setting for a given environment. When the active policy is "error" or "exception", an MSVCVersionNotFound exception is raised. When the active policy - is "warning" or "warn", an MSVCVersionNotFoundWarning warning is issued and the constructed + is "warning" or "warn", a VisualCMissingWarning warning is issued and the constructed environment is likely incomplete. When the active policy is "ignore" or "suppress", no action is taken and the constructed environment is likely incomplete. As implemented, the default global policy is "warning". The ability to set the global policy via an SCons command-line diff --git a/RELEASE.txt b/RELEASE.txt index d7a2690..4a3d06c 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -53,7 +53,7 @@ NEW FUNCTIONALITY construction variable is MSVC_NOTFOUND_POLICY. When defined, the environment construction variable overrides the global policy setting for a given environment. When the active policy is "error" or "exception", an MSVCVersionNotFound exception is raised. When the active policy - is "warning" or "warn", an MSVCVersionNotFoundWarning warning is issued and the constructed + is "warning" or "warn", a VisualCMissingWarning warning is issued and the constructed environment is likely incomplete. When the active policy is "ignore" or "suppress", no action is taken and the constructed environment is likely incomplete. As implemented, the default global policy is "warning". The ability to set the global policy via an SCons command-line diff --git a/SCons/Tool/MSCommon/MSVC/Policy.py b/SCons/Tool/MSCommon/MSVC/Policy.py index 870c73c..95643b2 100644 --- a/SCons/Tool/MSCommon/MSVC/Policy.py +++ b/SCons/Tool/MSCommon/MSVC/Policy.py @@ -50,7 +50,6 @@ from .Exceptions import ( ) from .Warnings import ( - MSVCVersionNotFoundWarning, MSVCScriptExecutionWarning, ) @@ -213,7 +212,7 @@ def msvc_notfound_handler(env, msg): elif notfound_policy_def.value: raise MSVCVersionNotFound(msg) else: - SCons.Warnings.warn(MSVCVersionNotFoundWarning, msg) + SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, msg) def _msvc_scripterror_policy_lookup(symbol): diff --git a/SCons/Tool/MSCommon/MSVC/Warnings.py b/SCons/Tool/MSCommon/MSVC/Warnings.py index 9f20972..c4a0f15 100644 --- a/SCons/Tool/MSCommon/MSVC/Warnings.py +++ b/SCons/Tool/MSCommon/MSVC/Warnings.py @@ -28,7 +28,6 @@ Warnings for Microsoft Visual C/C++. __all__ = [ 'VisualCWarning', 'MSVCScriptExecutionWarning', - 'MSVCVersionNotFoundWarning', ] import SCons.Warnings @@ -39,6 +38,3 @@ class VisualCWarning(SCons.Warnings.WarningOnByDefault): class MSVCScriptExecutionWarning(VisualCWarning): pass -class MSVCVersionNotFoundWarning(VisualCWarning): - pass - |