Merge branch 'feature/msys2_env_update_v3.3' into 'release/v3.3'
windows: Update pre-compiled MSYS2 environment See merge request espressif/esp-idf!9035
This commit is contained in:
commit
332e243f17
6 changed files with 8 additions and 8 deletions
|
@ -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:
|
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.
|
Note: Currently it is not possible to build docs on Windows without using a Unix-on-Windows layer such as MSYS2 MINGW32.
|
||||||
|
|
|
@ -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.
|
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.
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ Toolchain Setup
|
||||||
|
|
||||||
The quick setup is to download the Windows all-in-one toolchain & MSYS2 zip file from dl.espressif.com:
|
The quick setup is to download the Windows all-in-one toolchain & MSYS2 zip file from dl.espressif.com:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_gcc5_toolchain-20191220.zip
|
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain_idf3-20200601.zip
|
||||||
|
|
||||||
Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an ``msys32`` directory with a pre-prepared environment.
|
Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an ``msys32`` directory with a pre-prepared environment.
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ Windows 没有内置的 "make" 环境,因此如果要安装工具链,你需
|
||||||
|
|
||||||
快速设置的方法是从 dl.espressif.com 下载集成在一起的工具链和 MSYS2 压缩文件:
|
快速设置的方法是从 dl.espressif.com 下载集成在一起的工具链和 MSYS2 压缩文件:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20181001.zip
|
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain_idf3-20200601.zip
|
||||||
|
|
||||||
将 zip 压缩文件解压到 ``C:\`` (或其它路径,这里假设是 ``C:\``),它会使用预先准备的环境创建一个 ``msys32`` 目录。
|
将 zip 压缩文件解压到 ``C:\`` (或其它路径,这里假设是 ``C:\``),它会使用预先准备的环境创建一个 ``msys32`` 目录。
|
||||||
|
|
||||||
|
|
|
@ -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:
|
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"
|
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 "
|
" 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 "
|
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.")
|
"previous run updated \"pacman\" itself.")
|
||||||
print("Please read https://github.com/msys2/msys2/wiki/Using-packages for further information about using "
|
print("Please read https://github.com/msys2/msys2/wiki/Using-packages for further information about using "
|
||||||
|
@ -82,7 +82,7 @@ if __name__ == "__main__":
|
||||||
continue
|
continue
|
||||||
elif requirement.startswith('setuptools'):
|
elif requirement.startswith('setuptools'):
|
||||||
print("Please run the following command to install MSYS2's MINGW Python setuptools package:")
|
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
|
continue
|
||||||
else:
|
else:
|
||||||
print('Please refer to the Get Started section of the ESP-IDF Programming Guide for setting up the required'
|
print('Please refer to the Get Started section of the ESP-IDF Programming Guide for setting up the required'
|
||||||
|
|
|
@ -34,7 +34,7 @@ set -e
|
||||||
pacman --noconfirm -Syu # This step may require the terminal to be closed and restarted
|
pacman --noconfirm -Syu # This step may require the terminal to be closed and restarted
|
||||||
|
|
||||||
pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim \
|
pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim \
|
||||||
mingw-w64-i686-python2-pip mingw-w64-i686-python2-cryptography unzip winpty
|
mingw-w64-i686-python-pip mingw-w64-i686-python-cryptography unzip winpty
|
||||||
|
|
||||||
# if IDF_PATH is set, install requirements now as well
|
# if IDF_PATH is set, install requirements now as well
|
||||||
if [ -n "$IDF_PATH" ]; then
|
if [ -n "$IDF_PATH" ]; then
|
||||||
|
|
Loading…
Reference in a new issue