From 78003e94373f702ba904aa4242d80993b30e2652 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 13 Aug 2020 11:18:03 +1000 Subject: [PATCH] docs: Fix toolchain URL generation for macos Didn't backport the new URL scheme when we updated the toolchain version. Have put a link on the server so in this case the "osx" toolchain URL remains valid. Closes https://github.com/espressif/esp-idf/issues/5720 --- docs/en/get-started-cmake/macos-setup.rst | 4 ++-- docs/en/get-started/macos-setup.rst | 4 ++-- docs/gen-toolchain-links.py | 2 +- docs/zh_CN/get-started-cmake/macos-setup.rst | 6 +++--- docs/zh_CN/get-started/macos-setup.rst | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/en/get-started-cmake/macos-setup.rst b/docs/en/get-started-cmake/macos-setup.rst index 75130d71ae..3b023eb49f 100644 --- a/docs/en/get-started-cmake/macos-setup.rst +++ b/docs/en/get-started-cmake/macos-setup.rst @@ -47,11 +47,11 @@ Toolchain Setup ESP32 toolchain for macOS is available for download from Espressif website: -|download_link_osx| +|download_link_macos| Download this file, then extract it in ``~/esp`` directory: -.. include:: /_build/inc/unpack-code-osx.inc +.. include:: /_build/inc/unpack-code-macos.inc .. _setup-macos-toolchain-add-it-to-path-cmake: diff --git a/docs/en/get-started/macos-setup.rst b/docs/en/get-started/macos-setup.rst index 7e1921a6c3..b69ae12374 100644 --- a/docs/en/get-started/macos-setup.rst +++ b/docs/en/get-started/macos-setup.rst @@ -21,11 +21,11 @@ Toolchain Setup ESP32 toolchain for macOS is available for download from Espressif website: -|download_link_osx| +|download_link_macos| Download this file, then extract it in ``~/esp`` directory: -.. include:: /_build/inc/unpack-code-osx.inc +.. include:: /_build/inc/unpack-code-macos.inc .. _setup-macos-toolchain-add-it-to-path: diff --git a/docs/gen-toolchain-links.py b/docs/gen-toolchain-links.py index ea90f47c70..0a93d63069 100644 --- a/docs/gen-toolchain-links.py +++ b/docs/gen-toolchain-links.py @@ -51,7 +51,7 @@ def main(): platform_info = [["linux64", "tar.gz", "z", unpack_code_linux_macos], ["linux32", "tar.gz", "z", unpack_code_linux_macos], - ["osx", "tar.gz", "z", unpack_code_linux_macos], + ["macos", "tar.gz", "z", unpack_code_linux_macos], ["win32", "zip", None, None]] with open(os.path.join(out_dir, 'download-links.inc'), "w") as links_file: diff --git a/docs/zh_CN/get-started-cmake/macos-setup.rst b/docs/zh_CN/get-started-cmake/macos-setup.rst index 83536dbe3b..6d0f72cf59 100644 --- a/docs/zh_CN/get-started-cmake/macos-setup.rst +++ b/docs/zh_CN/get-started-cmake/macos-setup.rst @@ -48,11 +48,11 @@ ESP-IDF 将使用 Mac OS 上默认安装的 Python 版本。 下载 MacOS 版本的 ESP32 工具链，请前往乐鑫官网： -|download_link_osx| +|download_link_macos| 完成下载后，请在 ``~/esp`` 目录下进行解压： -.. include:: /_build/inc/unpack-code-osx.inc +.. include:: /_build/inc/unpack-code-macos.inc .. _setup-macos-toolchain-add-it-to-path-cmake: @@ -92,4 +92,4 @@ ESP-IDF 将使用 Mac OS 上默认安装的 Python 版本。 .. _ninja: https://ninja-build.org/ .. _ccache: https://ccache.samba.org/ .. _homebrew: https://brew.sh/ -.. _MacPorts: https://www.macports.org/install.php \ No newline at end of file +.. _MacPorts: https://www.macports.org/install.php diff --git a/docs/zh_CN/get-started/macos-setup.rst b/docs/zh_CN/get-started/macos-setup.rst index 72596ead23..502b37cf92 100644 --- a/docs/zh_CN/get-started/macos-setup.rst +++ b/docs/zh_CN/get-started/macos-setup.rst @@ -23,11 +23,11 @@ Mac OS 版本的 ESP32 工具链可以从以下地址下载： -|download_link_osx| +|download_link_macos| 下载压缩文件之后，解压到 ``~/esp`` 目录中: -.. include:: /_build/inc/unpack-code-osx.inc +.. include:: /_build/inc/unpack-code-macos.inc .. _setup-macos-toolchain-add-it-to-path: