servo: Merge #13661 - Warn and exit mach if it detects MinGW Python (from UK992:mingw-python); r=Wafflespeanut

<!-- Please describe your changes on the following line: -->
r? @Wafflespeanut

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13644

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: c1cc2bbbaebf13710bee1cb426484c2eed155f7c
This commit is contained in:
UK992 2016-10-10 13:45:18 -05:00
Родитель 815f962e81
Коммит 8433990a3e
1 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -195,6 +195,14 @@ def bootstrap(topdir):
print('Current path:', topdir) print('Current path:', topdir)
sys.exit(1) sys.exit(1)
# We don't support MinGW Python
if os.path.join(os.sep, 'mingw64', 'bin') in sys.executable:
print('Cannot run mach with MinGW Python.')
print('\nPlease rename following files:')
print(' /mingw64/bin/python2.exe -> /mingw64/bin/python2-mingw64.exe')
print(' /mingw64/bin/python2.7.exe -> /mingw64/bin/python2.7-mingw64.exe')
sys.exit(1)
# Ensure we are running Python 2.7+. We put this check here so we generate a # Ensure we are running Python 2.7+. We put this check here so we generate a
# user-friendly error message rather than a cryptic stack trace on module import. # user-friendly error message rather than a cryptic stack trace on module import.
if not (3, 0) > sys.version_info >= (2, 7): if not (3, 0) > sys.version_info >= (2, 7):