Crash_Override
/
OVMS3-idf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

windows: Update other MSYS2 package names to all be Python 3

This commit is contained in:
Angus Gratton 2020-06-04 18:39:20 +10:00 committed by Angus Gratton
parent 90be3b4970
commit 14f4c196c0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/README.md
View File

@ -25,7 +25,7 @@ The above URLs are all for the master branch latest version. Click the drop-down
If using Windows and the MSYS2 MINGW32 terminal, run this command before running "make html" the first time:
```
pacman -S doxygen mingw-w64-i686-python2-pillow
pacman -S doxygen mingw-w64-i686-python-pillow
```
Note: Currently it is not possible to build docs on Windows without using a Unix-on-Windows layer such as MSYS2 MINGW32.

4
docs/en/contribute/documenting-code.rst
View File

@ -291,9 +291,9 @@ Installation of Doxygen is OS dependent:
::
$ pacman -S mingw32/mingw-w64-i686-python2-pillow
$ pacman -S mingw32/mingw-w64-i686-python-pillow
Check the log on the screen that ``mingw-w64-i686-python2-pillow-4.3.0-1`` is installed. Previous versions of *pillow* will not work.
Check the log on the screen that ``mingw-w64-i686-python-pillow-4.3.0-1`` is installed. Previous versions of *pillow* will not work.
A downside of Windows installation is that fonts of the `blockdiag pictures <add-illustrations>` do not render correctly, you will see some random characters instead. Until this issue is fixed, you can use the `interactive shell`_ to see how the complete picture looks like.

4
tools/check_python_dependencies.py
View File

@ -67,7 +67,7 @@ if __name__ == "__main__":
if sys.platform == "win32" and os.environ.get("MSYSTEM", None) == "MINGW32" and "/mingw32/bin/python" in sys.executable:
print("The recommended way to install a packages is via \"pacman\". Please run \"pacman -Ss <package_name>\" for"
" searching the package database and if found then "
"\"pacman -S mingw-w64-i686-python{}-<package_name>\" for installing it.".format(sys.version_info[0],))
"\"pacman -S mingw-w64-i686-python-<package_name>\" for installing it.")
print("NOTE: You may need to run \"pacman -Syu\" if your package database is older and run twice if the "
"previous run updated \"pacman\" itself.")
print("Please read https://github.com/msys2/msys2/wiki/Using-packages for further information about using "
@ -82,7 +82,7 @@ if __name__ == "__main__":
continue
elif requirement.startswith('setuptools'):
print("Please run the following command to install MSYS2's MINGW Python setuptools package:")
print("pacman -S mingw-w64-i686-python{}-setuptools".format(sys.version_info[0],))
print("pacman -S mingw-w64-i686-python-setuptools")
continue
else:
print('Please refer to the Get Started section of the ESP-IDF Programming Guide for setting up the required'