diff --git a/docs/en/get-started-legacy/windows-setup.rst b/docs/en/get-started-legacy/windows-setup.rst index eb6b28922..5f5df50fd 100644 --- a/docs/en/get-started-legacy/windows-setup.rst +++ b/docs/en/get-started-legacy/windows-setup.rst @@ -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. diff --git a/docs/zh_CN/get-started-legacy/windows-setup.rst b/docs/zh_CN/get-started-legacy/windows-setup.rst index 853bfdb62..f9a067b1c 100644 --- a/docs/zh_CN/get-started-legacy/windows-setup.rst +++ b/docs/zh_CN/get-started-legacy/windows-setup.rst @@ -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`` 目录。 diff --git a/tools/check_python_dependencies.py b/tools/check_python_dependencies.py index ab86999ea..a8d7ad7ce 100755 --- a/tools/check_python_dependencies.py +++ b/tools/check_python_dependencies.py @@ -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 \" for" " searching the package database and if found then " - "\"pacman -S mingw-w64-i686-python{}-\" for installing it.".format(sys.version_info[0],)) + "\"pacman -S mingw-w64-i686-python-\" 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 '