From 6473c914965a679b02d813309ba90ba0ebc22e1e Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Fri, 30 Aug 2019 08:11:29 -0700 Subject: [PATCH 1/2] Fix the python3 directory so scripts work on Win32 --- package/package_esp8266com_index.template.json | 4 ++-- platform.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index a1bd0b5c27..ba749e0fdb 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -127,7 +127,7 @@ { "packager": "esp8266", "version": "3.7.2-post1", - "name": "python" + "name": "python3" } ], "help": { @@ -359,4 +359,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/platform.txt b/platform.txt index 5e7ab768b7..e11d4c3fe2 100644 --- a/platform.txt +++ b/platform.txt @@ -83,7 +83,7 @@ compiler.objcopy.eep.extra_flags= compiler.elf2hex.extra_flags= ## generate file with git version number -## needs bash, git, and echo +## needs git recipe.hooks.sketch.prebuild.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h" recipe.hooks.core.prebuild.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.makecorever}" --build_path "{build.path}" --platform_path "{runtime.platform.path}" --version "unix-{version}" From 28b758920014ec6b32f702f1c6c29dc38126ae2c Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Fri, 30 Aug 2019 09:07:55 -0700 Subject: [PATCH 2/2] Rename the python3 zip to fix renaming issue The get.py renamer uses some logic which results in the Win32 extracted directory always ending up as `tools/python` and not `tools/python3`. Adjust the zip archive and title to work around this (and the IDE proper) issue. --- package/package_esp8266com_index.template.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index ba749e0fdb..63bd091e44 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -142,17 +142,17 @@ "systems": [ { "host": "x86_64-mingw32", - "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python-3.7.2.post1-embed-win32v2a.zip", - "archiveFileName": "python-3.7.2.post1-embed-win32v2a.zip", - "checksum": "SHA-256:8eb71cd637c42abbeea9f31912bbaca22222405d8624ace8901c801519321d35", - "size": "6481988" + "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python3-3.7.2.post1-embed-win32v2a.zip", + "archiveFileName": "python3-3.7.2.post1-embed-win32v2a.zip", + "checksum": "SHA-256:f57cb2daf86176d2929e7c58990c2ac32554e3219d454dcac10e464ddda35bf2", + "size": "6428926" }, { "host": "i686-mingw32", - "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python-3.7.2.post1-embed-win32v2a.zip", - "archiveFileName": "python-3.7.2.post1-embed-win32va2.zip", - "checksum": "SHA-256:8eb71cd637c42abbeea9f31912bbaca22222405d8624ace8901c801519321d35", - "size": "6481988" + "url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python3-3.7.2.post1-embed-win32v2a.zip", + "archiveFileName": "python3-3.7.2.post1-embed-win32va2.zip", + "checksum": "SHA-256:f57cb2daf86176d2929e7c58990c2ac32554e3219d454dcac10e464ddda35bf2", + "size": "6428926" }, { "host": "aarch64-linux-gnu",