From 35def547bfe87631ca9eb0a5b3fec254c335e8a5 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 28 Oct 2019 12:20:51 +0000 Subject: [PATCH] py-mod.mk: Add support to async function definitions The async keyword confused python-tools.sh, this commit fixes that. Signed-off-by: Jan Lindemann --- make/py-mod.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/py-mod.mk b/make/py-mod.mk index d3cd9efb..9bc19293 100644 --- a/make/py-mod.mk +++ b/make/py-mod.mk @@ -4,7 +4,7 @@ include $(JWBDIR)/make/dirs.mk include $(JWBDIR)/make/dev-utils.mk PY_INIT_TMPL = $(wildcard __init__.py.tmpl) -PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*// +PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(async\)* *\(class\|def\) *//; s/[(:].*// #leftparen := ( #PY_EXPORT ?= $(shell sed '/\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[$(leftparen):].*//' $(PY_SRC_PY)) @@ -18,5 +18,6 @@ include $(JWBDIR)/make/py-rules.mk __init__.py: $(PY_INIT_TMPL) $(filter-out __init__.py,$(PY_SRC_PY)) if [ "$(PY_INIT_TMPL)" ]; then cat "$(PY_INIT_TMPL)" > $@.tmp; else > $@.tmp; fi - /bin/bash +H $(JWB_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" *.py | tee -a $@.tmp + /bin/bash +H $(JWB_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" \ + $(filter-out __init__.py,$(PY_ALL_PY)) $(SUBDIRS_TO_ITERATE) | tee -a $@.tmp mv $@.tmp $@