diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-07-04 11:21:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-04 11:21:51 -0400 |
| commit | d9a42d354a9651606695a31cbcb1977e29abedeb (patch) | |
| tree | 8f4f342c149500ba2f5f479cd4c52b414e9f207d | |
| parent | fd01aba56e1ab8658d5bda3e08556d8f7120b1bc (diff) | |
| parent | cb29ee77631530b6e15bc84ba8762bcda0ad4467 (diff) | |
| download | external_python_setuptools-d9a42d354a9651606695a31cbcb1977e29abedeb.tar.gz external_python_setuptools-d9a42d354a9651606695a31cbcb1977e29abedeb.tar.bz2 external_python_setuptools-d9a42d354a9651606695a31cbcb1977e29abedeb.zip | |
Merge pull request #628 from JGoutin/patch-1
Minor change : Link to MSVC14 Standalone
| -rw-r--r-- | CHANGES.rst | 10 | ||||
| -rw-r--r-- | setuptools/msvc.py | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 94d99fda..e04bdf05 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ CHANGES ======= +v24.0.2 +------- + +* If MSVC++14 is needed ``setuptools.msvc`` now redirect + user to Visual C++ Build Tools web page. + v24.0.1 ------- @@ -14,8 +20,8 @@ v24.0.0 * Pull Request #174: Add more aggressive support for standalone Microsoft Visual C++ compilers in msvc9compiler patch. - Particularly : Windows SDK 6.0 and 6.1 - (MSVC++ 9.0), Windows SDK 7.0 (MSVC++ 10.0), + Particularly : Windows SDK 6.1 and 7.0 + (MSVC++ 9.0), Windows SDK 7.1 (MSVC++ 10.0), Visual C++ Build Tools 2015 (MSVC++14) * Renamed ``setuptools.msvc9_support`` to ``setuptools.msvc``. diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 8c612129..b543c568 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -221,7 +221,7 @@ def _augment_exception(exc, version, arch=''): if "vcvarsall" in message.lower() or "visual c" in message.lower(): # Special error message if MSVC++ not installed - tmpl = 'Microsoft Visual C++ {version:0.1f} is required {message}.' + tmpl = 'Microsoft Visual C++ {version:0.1f} is required.' message = tmpl.format(**locals()) msdownload = 'www.microsoft.com/download/details.aspx?id=%d' if version == 9.0: @@ -239,6 +239,10 @@ def _augment_exception(exc, version, arch=''): # For VC++ 10.0 Redirect user to Windows SDK 7.1 message += ' Get it with "Microsoft Windows SDK 7.1": ' message += msdownload % 8279 + elif version >= 14.0: + # For VC++ 14.0 Redirect user to Visual C++ Build Tools + message += (' Get it with "Microsoft Visual C++ Build Tools": ' + r'http://landinghub.visualstudio.com/visual-cpp-build-tools') exc.args = (message, ) |