diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-11-19 05:02:55 (GMT) |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-11-19 05:02:55 (GMT) |
| commit | 4e972790d389101d871f584feb3ab11b9534f9c9 (patch) | |
| tree | 2bcbcdfb8e1dea392e692a8750de48050cc3d781 | |
| parent | 36826d2da44b3a304e23c1db60933a273549645c (diff) | |
| download | SCons-4e972790d389101d871f584feb3ab11b9534f9c9.zip SCons-4e972790d389101d871f584feb3ab11b9534f9c9.tar.gz SCons-4e972790d389101d871f584feb3ab11b9534f9c9.tar.bz2 | |
ENH: handle MSVS_VERSION additionally to MSVC_VERSION, but raise deprecation warnings if used.
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 16 | ||||
| -rw-r--r-- | src/engine/SCons/Warnings.py | 5 |
3 files changed, 22 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index d2f672a..6aba90f 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -776,6 +776,7 @@ def _main(parser): SCons.Warnings.MisleadingKeywordsWarning, SCons.Warnings.ReservedVariableWarning, SCons.Warnings.StackSizeWarning, + SCons.Warnings.VisualVersionMismatch, ] for warning in default_warnings: diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 48af5a3..623c511 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -168,6 +168,22 @@ def get_default_version(env): debug('get_default_version()') msvc_version = env.get('MSVC_VERSION') + msvs_version = env.get('MSVS_VERSION') + + if msvs_version and not msvc_version: + SCons.Warnings.warn( + SCons.Warnings.DeprecatedWarning, + "MSVS_VERSION is deprecated: please use MSVC_VERSION instead ") + return msvs_version + elif msvc_version and msvs_version: + 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" \ + % (msvc_version, msvs_version)) + return msvs_version if not msvc_version: installed_vcs = get_installed_vcs() debug('installed_vcs:%s' % installed_vcs) diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py index c783d1e..797ff41 100644 --- a/src/engine/SCons/Warnings.py +++ b/src/engine/SCons/Warnings.py @@ -118,6 +118,11 @@ class TaskmasterNeedsExecuteWarning(FutureDeprecatedWarning): class VisualCMissingWarning(Warning): pass +# Used when MSVC_VERSION and MSVS_VERSION do not point to the +# same version (MSVS_VERSION is deprecated) +class VisualVersionMismatch(Warning): + pass + class VisualStudioMissingWarning(Warning): pass |