djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top: Use micropython-lib unconditionally in manifests.

Browse Source 
micropython-lib is now a submodule, and the manifest compilation process
will ensure it is available, so manifests no longer need to check that it
is available.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-08-10 22:53:39 +10:00
parent 0b26efe73d
commit da7f2537a1
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/esp8266/boards/GENERIC/manifest.py
View File

@ -7,15 +7,13 @@ include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
# drivers # drivers
freeze("$(MPY_DIR)/drivers/display", "ssd1306.py") freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
# Libraries from micropython-lib, include only if the library directory exists # micropython-lib: file utilities
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")): freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
# file utilities
freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
# requests # micropython-lib: requests
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py") freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py") freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
# umqtt # micropython-lib: umqtt
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py") freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py") freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")

3
ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
View File

@ -8,5 +8,4 @@ include(
l2cap=True, l2cap=True,
security=True, security=True,
) )
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")): freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

3
ports/rp2/boards/PICO_W/manifest.py
View File

@ -4,5 +4,4 @@ freeze("$(MPY_DIR)/tools", "upip.py")
freeze("$(MPY_DIR)/tools", "upip_utarfile.py") freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
freeze("$(MPY_DIR)/extmod", "ntptime.py") freeze("$(MPY_DIR)/extmod", "ntptime.py")
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")): freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")