diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-11-08 14:36:06 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-11-08 14:36:06 +1100 |
| commit | fcda6a2a786eeddc78af5493d28c0054a43027c9 (patch) | |
| tree | 6c4ca5d78c9af6e06d22812a93052e41d4e8d445 /py | |
| parent | bdf33bc1367fa6fc888c791ce00b326bbd279bdf (diff) | |
| download | micropython-fcda6a2a786eeddc78af5493d28c0054a43027c9.tar.gz micropython-fcda6a2a786eeddc78af5493d28c0054a43027c9.zip | |
py: Strip leading dirs from frozen mpy files, so any path can be used.
With this patch one can now do "make FROZEN_MPY_DIR=../../frozen" to
specify a directory containing scripts to be frozen (as well as absolute
paths).
The compiled .mpy files are now stored in $(BUILD)/frozen_mpy/.
Diffstat (limited to 'py')
| -rw-r--r-- | py/mkrules.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk index 9b6dc2470f..ea647e86f8 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -108,11 +108,11 @@ endif ifneq ($(FROZEN_MPY_DIR),) # make a list of all the .py files that need compiling and freezing -FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py') -FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy)) +FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py' -printf '%P\n') +FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.py=.mpy)) # to build .mpy files from .py files -$(BUILD)/$(FROZEN_MPY_DIR)/%.mpy: $(FROZEN_MPY_DIR)/%.py +$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py @$(ECHO) "MPY $<" $(Q)$(MKDIR) -p $(dir $@) $(Q)$(MPY_CROSS) -o $@ -s $(^:$(FROZEN_MPY_DIR)/%=%) $^ |