Skip to content

Commit 901410f

Browse files
Fix the python3 directory so scripts work on Win32 (#6472)
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.
1 parent d04f768 commit 901410f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

package/package_esp8266com_index.template.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
{
128128
"packager": "esp8266",
129129
"version": "3.7.2-post1",
130-
"name": "python"
130+
"name": "python3"
131131
}
132132
],
133133
"help": {
@@ -142,17 +142,17 @@
142142
"systems": [
143143
{
144144
"host": "x86_64-mingw32",
145-
"url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python-3.7.2.post1-embed-win32v2a.zip",
146-
"archiveFileName": "python-3.7.2.post1-embed-win32v2a.zip",
147-
"checksum": "SHA-256:8eb71cd637c42abbeea9f31912bbaca22222405d8624ace8901c801519321d35",
148-
"size": "6481988"
145+
"url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python3-3.7.2.post1-embed-win32v2a.zip",
146+
"archiveFileName": "python3-3.7.2.post1-embed-win32v2a.zip",
147+
"checksum": "SHA-256:f57cb2daf86176d2929e7c58990c2ac32554e3219d454dcac10e464ddda35bf2",
148+
"size": "6428926"
149149
},
150150
{
151151
"host": "i686-mingw32",
152-
"url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python-3.7.2.post1-embed-win32v2a.zip",
153-
"archiveFileName": "python-3.7.2.post1-embed-win32va2.zip",
154-
"checksum": "SHA-256:8eb71cd637c42abbeea9f31912bbaca22222405d8624ace8901c801519321d35",
155-
"size": "6481988"
152+
"url": "https://github.com/earlephilhower/esp-quick-toolchain/releases/download/2.5.0-4/python3-3.7.2.post1-embed-win32v2a.zip",
153+
"archiveFileName": "python3-3.7.2.post1-embed-win32va2.zip",
154+
"checksum": "SHA-256:f57cb2daf86176d2929e7c58990c2ac32554e3219d454dcac10e464ddda35bf2",
155+
"size": "6428926"
156156
},
157157
{
158158
"host": "aarch64-linux-gnu",
@@ -359,4 +359,4 @@
359359
]
360360
}
361361
]
362-
}
362+
}

platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ compiler.objcopy.eep.extra_flags=
8383
compiler.elf2hex.extra_flags=
8484

8585
## generate file with git version number
86-
## needs bash, git, and echo
86+
## needs git
8787
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"
8888
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}"
8989

0 commit comments

Comments
 (0)