8000 top: Update all manifest.py files to use new features. · micropython/micropython@daf609f · GitHub
[go: up one dir, main page]
Skip to content

Commit daf609f

Browse files
jimmojimmo
committed
top: Update all manifest.py files to use new features.
- Includes now use the directory path where possible (no longer necessary to include the manifest.py file explicitly). - Add manifest.py for all drivers and components that are referenced by port/board manifests. - Replace all uses of freeze() with package()/module(), except for port and board modules. - Use opt=3 everywhere. - Use require() instead of include() for all micropython-lib references. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
1 parent 0ea7c4e commit daf609f

File tree

35 files changed

+103
-102
lines changed

35 files changed

+103
-102
lines changed

‎drivers/codec/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("wm8960.py", opt=3)

‎drivers/dht/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("dht.py", opt=3)

‎drivers/display/manifest.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# TODO: Split these into separate directories with their own manifests.
2+
options.defaults(lcd160cr=False, ssd1306=False, test=True)
3+
4+
if options.lcd160cr:
5+
module("lcd160cr.py", opt=3)
6+
7+
if options.test:
8+
module("lcd160cr.py", opt=3)
9+
10+
if options.ssd1306:
11+
module("ssd1306.py", opt=3)

‎drivers/hts221/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("hts221.py", opt=3)

‎drivers/lps22h/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("lps22h.py", opt=3)

‎drivers/lsm6dsox/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("lsm6dsox.py", opt=3)

‎drivers/lsm9ds1/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("lsm9ds1.py", opt=3)

‎drivers/neopixel/manifest.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
freeze(
2-
".",
3-
"neopixel.py",
4-
opt=3,
5-
)
1+
module("neopixel.py", opt=3)

‎drivers/nrf24l01/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("nrf24l01.py", opt=3)

‎drivers/onewire/manifest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
options.defaults(ds18x20=False)
2+
3+
module("onewire.py", opt=3)
4+
5+
if options.ds18x20:
6+
module("ds18x20.py", opt=3)

‎drivers/sdcard/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module("sdcard.py", opt=3)

‎extmod/uasyncio/manifest.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
# This list of frozen files doesn't include task.py because that's provided by the C module.
2-
freeze(
3-
"..",
4-
(
5-
"uasyncio/__init__.py",
6-
"uasyncio/core.py",
7-
"uasyncio/event.py",
8-
"uasyncio/funcs.py",
9-
"uasyncio/lock.py",
10-
"uasyncio/stream.py",
11-
),
12-
opt=3,
13-
)
1+
# This list of package files doesn't include task.py because that's provided
2+
# by the C module.
3+
package("uasyncio", (
4+
"__init__.py",
5+
"core.py",
6+
"event.py",
7+
"funcs.py",
8+
"lock.py",
9+
"stream.py",
10+
), base_path="..", opt=3)

‎extmod/webrepl/manifest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
freeze(".", ("webrepl.py", "webrepl_setup.py", "websocket_helper.py"))
1+
module("webrepl.py", opt=3)
2+
module("webrepl_setup.py", opt=3)
3+
module("websocket_helper.py", opt=3)

‎ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("$(PORT_DIR)/boards/manifest.py")
22
freeze("modules")
33

4-
freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
4+
include("$(MPY_DIR)/drivers/display", ssd1306=True)

‎ports/esp32/boards/LOLIN_S2_PICO/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("$(PORT_DIR)/boards/manifest.py")
22
freeze("./modules")
33
1CF5
4-
freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
4+
include("$(MPY_DIR)/drivers/display", ssd1306=True)

‎ports/esp32/boards/manifest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
freeze("$(PORT_DIR)/modules")
22
freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
3-
freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")
4-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
5-
freeze("$(MPY_DIR)/drivers/onewire")
6-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
7-
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
8-
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
3+
module("ntptime.py", base_path=""$(MPY_DIR)/ports/esp8266/modules"")
4+
include("$(MPY_DIR)/drivers/dht")
5+
include("$(MPY_DIR)/drivers/onewire")
6+
include("$(MPY_DIR)/drivers/neopixel")
7+
include("$(MPY_DIR)/extmod/uasyncio")
8+
include("$(MPY_DIR)/extmod/webrepl")

‎ports/esp32/boards/manifest_release.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
include("manifest.py")
22

3-
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
4-
5-
freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
6-
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
7-
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
3+
require("urequests")
4+
require("upysh")
5+
require("umqtt.simple")
6+
require("umqtt.robust")

‎ports/esp8266/boards/GENERIC/manifest.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22
include("$(PORT_DIR)/boards/manifest.py")
33

44
# uasyncio
5-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
5+
include("$(MPY_DIR)/extmod/uasyncio")
66

77
# drivers
8-
freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
8+
include("$(MPY_DIR)/drivers/display", ssd1306=True)
99

10-
# Libraries from micropython-lib, include only if the library directory exists
11-
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
12-
# file utilities
13-
freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
10+
# file utilities
11+
require("upysh")
1412

15-
# requests
16-
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
17-
freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
13+
# requests
14+
require("urequests")
15+
require("urllib.urequest")
1816

19-
# umqtt
20-
freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
21-
freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
17+
# umqtt
18+
require("umqtt.simple")
19+
require("umqtt.robust")

‎ports/esp8266/boards/GENERIC_512K/manifest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
freeze("$(BOARD_DIR)", "_boot.py", opt=3)
22
freeze("$(PORT_DIR)/modules", ("apa102.py", "ntptime.py", "port_diag.py"))
3-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
4-
freeze("$(MPY_DIR)/drivers/onewire")
5-
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
6-
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
3+
include("$(MPY_DIR)/drivers/dht")
4+
include("$(MPY_DIR)/drivers/onewire")
5+
include("$(MPY_DIR)/extmod/webrepl")
6+
include("$(MPY_DIR)/drivers/neopixel")

‎ports/esp8266/boards/manifest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
freeze("$(PORT_DIR)/modules")
22
freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
3-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
4-
freeze("$(MPY_DIR)/drivers/onewire")
5-
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
6-
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
3+
include("$(MPY_DIR)/drivers/dht")
4+
include("$(MPY_DIR)/drivers/onewire")
5+
include("$(MPY_DIR)/extmod/webrepl")
6+
include("$(MPY_DIR)/drivers/neopixel")

‎ports/mimxrt/boards/manifest.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
freeze("$(PORT_DIR)/modules")
2-
freeze("$(MPY_DIR)/drivers/onewire")
3-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
4-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
5-
try:
6-
include("$(BOARD_DIR)/manifest.py")
7-
except FileNotFoundError:
8-
pass
2+
include("$(MPY_DIR)/drivers/onewire")
3+
include("$(MPY_DIR)/drivers/dht")
4+
include("$(MPY_DIR)/extmod/uasyncio")
5+
include_maybe("$(BOARD_DIR)/manifest.py")

‎ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("$(PORT_DIR)/modules/manifest.py")
2-
freeze("$(MPY_DIR)/drivers/hts221", "hts221.py")
3-
freeze("$(MPY_DIR)/drivers/lps22h", "lps22h.py")
4-
freeze("$(MPY_DIR)/drivers/lsm9ds1", "lsm9ds1.py")
2+
include("$(MPY_DIR)/drivers/hts221")
3+
include("$(MPY_DIR)/drivers/lps22h")
4+
include("$(MPY_DIR)/drivers/lsm9ds1")

‎ports/nrf/modules/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
freeze("$(PORT_DIR)/modules/scripts", "_mkfs.py")
2-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
2+
include("$(MPY_DIR)/extmod/uasyncio")

‎ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# We do not want to include default frozen modules,
< 10000 /td>
2-
freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
2+
include("$(MPY_DIR)/drivers/sdcard")

‎ports/renesas-ra/boards/RA4M1_EK/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# We do not want to include default frozen modules,
2-
freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
2+
include("$(MPY_DIR)/drivers/sdcard")

‎ports/renesas-ra/boards/manifest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
2-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
3-
freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
4-
freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
1+
include("$(MPY_DIR)/extmod/uasyncio")
2+
include("$(MPY_DIR)/drivers/dht")
3+
include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
4+
include("$(MPY_DIR)/drivers/sdcard")

‎ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
include("$(PORT_DIR)/boards/manifest.py")
2-
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
3-
freeze("$(MPY_DIR)/drivers/lsm6dsox/", "lsm6dsox.py")
4-
include(
5-
"$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
6-
client=True,
7-
central=True,
8-
l2cap=True,
9-
security=True,
10-
)
11-
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
12-
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
2+
3+
include("$(MPY_DIR)/extmod/webrepl")
4+
include("$(MPY_DIR)/drivers/lsm6dsox")
5+
require("aioble", client=True, central=True, l2cap=True, security=True)
6+
require("urequests")

‎ports/rp2/boards/PICO_W/manifest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
freeze("$(MPY_DIR)/tools", "upip.py")
44
freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
55

6-
if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
7-
freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
6+
require("urequests")

‎ports/rp2/boards/manifest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
freeze("$(PORT_DIR)/modules")
2-
freeze("$(MPY_DIR)/drivers/onewire")
3-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
4-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
5-
include("$(MPY_DIR)/drivers/neopixel/manifest.py")
2+
include("$(MPY_DIR)/drivers/onewire")
3+
include("$(MPY_DIR)/drivers/dht")
4+
include("$(MPY_DIR)/extmod/uasyncio")
5+
include("$(MPY_DIR)/drivers/neopixel")

‎ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
include("$(PORT_DIR)/boards/manifest.py")
2-
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
3-
include(
4-
"$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
5-
client=True,
6-
central=True,
7-
l2cap=True,
8-
security=True,
9-
)
2+
include("$(MPY_DIR)/extmod/webrepl")
3+
require("aioble", client=True, central=True, l2cap=True, security=True)

‎ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
21
freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))

‎ports/stm32/boards/PYBD_SF2/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include("$(PORT_DIR)/boards/manifest.py")
2-
include("$(MPY_DIR)/extmod/webrepl/manifest.py")
2+
include("$(MPY_DIR)/extmod/webrepl")

‎ports/stm32/boards/manifest.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
2-
freeze("$(MPY_DIR)/drivers/dht", "dht.py")
3-
freeze("$(MPY_DIR)/drivers/display", ("lcd160cr.py", "lcd160cr_test.py"))
4-
freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
1+
include("$(MPY_DIR)/extmod/uasyncio")
2+
3+
include("$(MPY_DIR)/drivers/dht")
4+
include("$(MPY_DIR)/drivers/display", lcd160cr=True, test=True)
5+
include("$(MPY_DIR)/drivers/onewire", ds18x20=False)

‎ports/unix/variants/dev/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include("$(PORT_DIR)/variants/manifest.py")
22

3-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
3+
include("$(MPY_DIR)/extmod/uasyncio")

‎ports/windows/variants/dev/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include("$(PORT_DIR)/variants/manifest.py")
2-
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
2+
include("$(MPY_DIR)/extmod/uasyncio")

0 commit comments

Comments
 (0)
0