From 0917d5135d73afc567f601ae81da0606b59aac01 Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Tue, 28 Jan 2020 18:32:42 +0000 Subject: [PATCH] Makefile: Switch to FROZEN_MANIFEST This not only avoids the use of a deprecated feature but it also makes it easier to decouple the wasp/ directory structure from what actually gets copied to the target. --- Makefile | 2 +- manifest/dsd6.py | 0 manifest/nitrogen.py | 0 manifest/pinetime.py | 8 ++++++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 manifest/dsd6.py create mode 100644 manifest/nitrogen.py create mode 100644 manifest/pinetime.py diff --git a/Makefile b/Makefile index 4656b9c..0aed765 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ micropython: $(MAKE) -C micropython/mpy-cross $(MAKE) -C micropython/ports/nrf \ BOARD=$(BOARD) SD=s132 \ - FROZEN_MPY_DIR=$(PWD)/wasp + FROZEN_MANIFEST=$(PWD)/manifest/$(BOARD).py python3 -m nordicsemi dfu genpkg \ --dev-type 0x0052 \ --application micropython/ports/nrf/build-$(BOARD)-s132/firmware.hex \ diff --git a/manifest/dsd6.py b/manifest/dsd6.py new file mode 100644 index 0000000..e69de29 diff --git a/manifest/nitrogen.py b/manifest/nitrogen.py new file mode 100644 index 0000000..e69de29 diff --git a/manifest/pinetime.py b/manifest/pinetime.py new file mode 100644 index 0000000..54533eb --- /dev/null +++ b/manifest/pinetime.py @@ -0,0 +1,8 @@ +freeze_as_mpy('$(MPY_DIR)/../wasp', ( + 'main.py', + 'demo.py', + 'drivers/st7789.py', + 'logo.py', + 'pinetime.py' +)) +