Add make snippet for MicroPython #148
Conversation
| MICROPYTHON_FROZEN_MANIFEST := manifest.py | ||
| include $(LIONSOS)/components/micropython/micropython.mk | ||
|
|
||
| manifest.py: webserver.py config.py |
There was a problem hiding this comment.
manifest.py doesn't get updated if webserver.py and config.py change. So it's not a dependency. you already have micropython.elf depending on these two files so if they change the recursive make will happen.
There was a problem hiding this comment.
Putting aside the fact that we are calling Make recursively and throwing away a bunch of information, the files referenced by manifest.py (such as config.py) are inputs into a file frozen_content.c. Ideally, they would be prerequisites of that file, as they need to exist before that file can be generated, and if they change, that file needs to be regenerated. But it's a bit impractical to make them dependencies of internal MicroPython targets, so making them transitive prerequisites (as MICROPYTHON_FROZEN_MANIFEST would be a prerequisite of frozen_content.c) ensures the required ordering, even if it's stricter than necessary. Making them prerequisites of micropython.elf is looser than necessary and doesn't capture the situation properly, because (if you are not calling the MicroPython makefile recursively and thereby enforcing a very coarse-grained ordering) they are not linker inputs and by the time you are building micropython.elf, frozen_content.c needs already to have been made.
micropython.mk is implemented as a recursive make hack, but webserver.mk and kitty.mk are written as if that weren't the case.
There was a problem hiding this comment.
You can fix this by adding:
# Micropython includes frozen versions of various python sources;
# note them here
micropython.elf: manifest.py webserver.py config.py
| include $(LIONSOS)/components/micropython/micropython.mk | ||
|
|
||
| manifest.py: webserver.py config.py | ||
| webserver.py: $(MICRODOT) config.py |
There was a problem hiding this comment.
Likewise, webserver.py doesn't change if config.py changes.
Signed-off-by: James Archer <[email protected]> P
| mpy-cross: FORCE $(LIONSOS)/dep/micropython/mpy-cross | ||
| make -C $(LIONSOS)/dep/micropython/mpy-cross BUILD=$(abspath ./mpy_cross) | ||
|
|
||
| FORCE: ; |
There was a problem hiding this comment.
If there's a 'FORCE' anywhere in any other snippet or in the top level Makefile this could cause an error to be thrown, depending on which version of Make you're using.
I suggest using
FORCE_MPY: ;
.PHONY: FORCE_MPY
and replace FORCE with FORCE_MPY in the rest of the snippet.
|
|
||
| MICROPYTHON_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) | ||
|
|
||
| micropython.elf: FORCE mpy-cross ${LIONSOS}/dep/libmicrokitco/Makefile $(MICROPYTHON_FROZEN_MANIFEST) $(MICROPYTHON_EXEC_MODULE) |
There was a problem hiding this comment.
It'd be better to depend not on the Makefile for libmicrokitco but on the generated library I think, if that's possible. We'll be moving to a snippet for libmicrokitco eventually I expect, so the Makefile will go away.
Right now, the Micropython component Makefile builds libmicrokitco, but I think we want to change that.
| MICROPYTHON_FROZEN_MANIFEST := manifest.py | ||
| include $(LIONSOS)/components/micropython/micropython.mk | ||
|
|
||
| manifest.py: webserver.py config.py |
There was a problem hiding this comment.
You can fix this by adding:
# Micropython includes frozen versions of various python sources;
# note them here
micropython.elf: manifest.py webserver.py config.py
No description provided.