Merge pull request #9901 from barbudor/pr-fix-pio-linux

Rename pio folder to pio-tools solve linux build errors
This commit is contained in:
Theo Arends 2020-11-18 09:04:27 +01:00 committed by GitHub
commit 2783ad3ed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 7 deletions

View File

@ -3,11 +3,11 @@ import os
# pio < 4.0.0
# from base64 import b64decode
# env.Replace(UPLOADER="pio\espupload.py")
# env.Replace(UPLOADER="pio-tools\espupload.py")
# env.Replace(UPLOADERFLAGS="")
# env.Replace(UPLOADCMD="$UPLOADER -u " + b64decode(ARGUMENTS.get("UPLOAD_PORT")) + " -f $SOURCES")
# pio >= 4.0.0
env.Replace(UPLOADER=os.path.join("pio", "espupload.py"))
env.Replace(UPLOADER=os.path.join("pio-tools", "espupload.py"))
env.Replace(UPLOADERFLAGS="")
env.Replace(UPLOADCMD="$UPLOADER -u $UPLOAD_PORT -f $SOURCES")

View File

@ -93,10 +93,10 @@ lib_extra_dirs =
lib/lib_div
[scripts_defaults]
extra_scripts = pio/strip-floats.py
pio/name-firmware.py
pio/gzip-firmware.py
pio/override_copy.py
extra_scripts = pio-tools/strip-floats.py
pio-tools/name-firmware.py
pio-tools/gzip-firmware.py
pio-tools/override_copy.py
[esp_defaults]
; *** remove undesired all warnings

View File

@ -58,7 +58,7 @@ build_flags = ${core.build_flags}
upload_port = COM5
extra_scripts = ${scripts_defaults.extra_scripts}
; pio/obj-dump.py
; pio-tools/obj-dump.py
lib_extra_dirs = ${library.lib_extra_dirs}