From 8e159acff97584f39ce22fccc9cdb029947a4286 Mon Sep 17 00:00:00 2001
From: dongheng <Dong Heng>
Date: Thu, 30 May 2019 15:09:21 +0800
Subject: [PATCH] tools(setup): fix windows install prerequisites

---
 docs/en/get-started/windows-setup.rst         |  2 +-
 .../windows/windows_install_prerequisites.sh  | 43 +++++++++----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/docs/en/get-started/windows-setup.rst b/docs/en/get-started/windows-setup.rst
index 5d3526e7..f7eb0e9b 100644
--- a/docs/en/get-started/windows-setup.rst
+++ b/docs/en/get-started/windows-setup.rst
@@ -13,7 +13,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/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh
index 66ee2236..94718570 100644
--- a/tools/windows/windows_install_prerequisites.sh
+++ b/tools/windows/windows_install_prerequisites.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Setup script to configure an MSYS2 environment for ESP-IDF.
+# Setup script to configure an MSYS2 environment for ESP8266_RTOS_SDK.
 #
 # Use of this script is optional, there is also a prebuilt MSYS2 environment available
 # which can be downloaded and used as-is.
 #
-# See http://esp-idf.readthedocs.io/en/latest/windows-setup.html for full details.
+# See https://docs.espressif.com/projects/esp8266-rtos-sdk/en/latest/get-started/windows-setup.html for full details.
 
 if [ "$OSTYPE" != "msys" ]; then
   echo "This setup script expects to be run from an MSYS2 environment on Windows."
@@ -33,30 +33,27 @@ 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 tar
 
-# Workaround for errors when running "git submodule" commands
-# See https://github.com/Alexpux/MSYS2-packages/issues/735
-rm -f /mingw32/bin/envsubst.exe
+if [ -n $IDF_PATH ]; then
+	python -m pip install -r $IDF_PATH/requirements.txt
+fi
 
-python -m pip install --upgrade pip
-
-pip install pyserial
-
-# 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
-echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
+# Automatically download precompiled toolchain, unpack at /opt/xtensa-lx106-elf/
+TOOLCHAIN_GZ=xtensa-lx106-elf-win32-1.22.0-92-g8facf4c-5.2.0.tar.gz
+echo "Downloading precompiled toolchain ${TOOLCHAIN_GZ}..."
 cd ~
-curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
+curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_GZ}
 cd /opt
-rm -rf /opt/xtensa-esp32-elf  # for upgrades
-unzip ~/${TOOLCHAIN_ZIP}
-rm ~/${TOOLCHAIN_ZIP}
+rm -rf /opt/xtensa-lx106-elf  # for upgrades
+tar -xf ~/${TOOLCHAIN_GZ} || echo "Uncompressing cross toolchain has some little error, you may ignore it if it can be used."
+rm ~/${TOOLCHAIN_GZ}
 
-cat > /etc/profile.d/esp32_toolchain.sh << EOF
-# This file was created by ESP-IDF windows_install_prerequisites.sh
+cat > /etc/profile.d/esp8266_toolchain.sh << EOF
+# This file was created by ESP8266_RTOS_SDK windows_install_prerequisites.sh
 # and will be overwritten if that script is run again.
-export PATH="\$PATH:/opt/xtensa-esp32-elf/bin"
+export PATH="\$PATH:/opt/xtensa-lx106-elf/bin"
 EOF
 
 # clean up pacman package cache to save some disk space
@@ -64,19 +61,19 @@ pacman --noconfirm -Scc
 
 cat << EOF
 ************************************************
-MSYS2 environment is now ready to use ESP-IDF.
+MSYS2 environment is now ready to use ESP8266_RTOS_SDK.
 
 1) Run 'source /etc/profile' to add the toolchain to
 your path in this terminal. This command produces no output.
 You only need to do this once, future terminals do this
 automatically when opened.
 
-2) After ESP-IDF is set up (see setup guide), edit the file
+2) After ESP8266_RTOS_SDK is set up (see setup guide), edit the file
 `cygpath -w /etc/profile`
 and add a line to set the variable IDF_PATH so it points to the
 IDF directory, ie:
 
-export IDF_PATH=/c/path/to/esp-idf/directory
+export IDF_PATH=/c/path/to/ESP8266_RTOS_SDK/directory
 
 ************************************************
 EOF