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

Merge branch 'feature/msys2_env_update' into 'master'

Browse source 
windows: Update MSYS2 pre-compiled legacy build environment

Closes IDF-1289 and IDF-1526

See merge request espressif/esp-idf!9034
This commit is contained in:
Angus Gratton 2020-06-12 07:26:09 +08:00
parent 625bd5eb18 091ce8a124
commit eef0e178a0
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/en/get-started-legacy/windows-setup.rst
View file

@ -16,7 +16,7 @@ Toolchain Setup
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_gcc8_toolchain-20191231.zip
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_esp2020r2_toolchain-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.

2
docs/zh_CN/get-started-legacy/windows-setup.rst
View file

@ -16,7 +16,7 @@ Windows 系统没有内置的 "make" 环境，所以除了安装工具链之外
最简便的工具链设置方法是从下方地址下载 Windows 多合一工具链和 MSYS2 压缩包文件：
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20190611.zip
https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_esp2020r2_toolchain-20200601.zip
请将压缩包文件解压至 ``C:\``（或其他目录，但本文档中以 ``C:\`` 为例），该文件将为您创建一个带有预配置环境的 ``msys32`` 目录。

4
tools/check_python_dependencies.py
View file

@ -80,7 +80,7 @@ if __name__ == "__main__":
elif 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 "
@ -95,7 +95,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 follow the instructions found in the "Set up the tools" section of '