From 319fa2264f6c3d931e535ca865d5efd52a03c524 Mon Sep 17 00:00:00 2001 From: Angus Gratton <angus@espressif.com> Date: Mon, 1 Oct 2018 13:58:51 +1000 Subject: [PATCH] windows: Update MSYS2 environment, add Python requirements to setup script --- docs/en/get-started/windows-setup.rst | 2 +- docs/zh_CN/get-started/windows-setup.rst | 2 +- tools/windows/windows_install_prerequisites.sh | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/en/get-started/windows-setup.rst b/docs/en/get-started/windows-setup.rst index 9b143920b9..ad7d821011 100644 --- a/docs/en/get-started/windows-setup.rst +++ b/docs/en/get-started/windows-setup.rst @@ -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: -https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20180110.zip +https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20181001.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/windows-setup.rst b/docs/zh_CN/get-started/windows-setup.rst index 25edb9d15d..348f5f6e77 100644 --- a/docs/zh_CN/get-started/windows-setup.rst +++ b/docs/zh_CN/get-started/windows-setup.rst @@ -15,7 +15,7 @@ Windows 没æå ç½®ç "make" ç¯å¢ï¼å æ¤å¦æè¦å®è£ å·¥å ·é¾ï¼ä½ é å¿«é设置çæ¹æ³æ¯ä» dl.espressif.com ä¸è½½éæå¨ä¸èµ·çå·¥å ·é¾å MSYS2 å缩æä»¶ï¼ -https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20180110.zip +https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20181001.zip å° zip å缩æ件解åå° ``C:\`` (æå ¶å®è·¯å¾ï¼è¿éåè®¾æ¯ ``C:\``)ï¼å®ä¼ä½¿ç¨é¢å åå¤çç¯å¢å建ä¸ä¸ª ``msys32`` ç®å½ã diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh index a08137197f..cf1527e1eb 100644 --- a/tools/windows/windows_install_prerequisites.sh +++ b/tools/windows/windows_install_prerequisites.sh @@ -33,13 +33,13 @@ set -e 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 mingw-w64-i686-python2-pip unzip winpty +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 -# Workaround for errors when running "git submodule" commands -# See https://github.com/Alexpux/MSYS2-packages/issues/735 -rm -f /mingw32/bin/envsubst.exe - -python -m pip install --upgrade pip +# if IDF_PATH is set, install requirements now as well +if [ -n $IDF_PATH ]; then + python -m pip install -r $IDF_PATH/requirements.txt +fi # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/ TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip -- 2.40.0