janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

topdir.mk: Add JW_PKG_TMPL_XXX

Browse source 
Add variables to shorten typical invocations of "jw-pkg project update
--format tmpl", and use them in py-topdir.mk

 JW_PKG_TMPL_SEARCH_PATH
 JW_PKG_TMPL_UPDATE

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-09-11 20:06:13 +02:00
commit bf3484c2c9
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/py-topdir.mk
View file

@ -19,8 +19,7 @@ clean: clean.topdir
clean.topdir: clean.py-check clean.topdir: clean.py-check
pyproject.toml: pyproject.toml:
$(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered projects create-file --format tmpl \ $(JW_PKG_TMPL_UPDATE) $@ --field mypypath='$(MYPY_PATH_DIRECTIVE)' $(PROJECT) > $@.tmp
--template-name $@ --search-path $(JW_PKG_CONF_BASE_DIR)/templates --field mypypath='$(MYPY_PATH_DIRECTIVE)' $(PROJECT) > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
pyrightconfig.json: pyrightconfig.json:

4
make/topdir.mk
View file

@ -95,6 +95,10 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
endif endif
endif endif
JW_PKG_TMPL_SEARCH_PATH ?= $(JW_PKG_CONF_BASE_DIR)/templates
JW_PKG_TMPL_UPDATE ?= $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered \
projects create-file --format tmpl --search-path $(subst $(space),:,$(JW_PKG_TMPL_SEARCH_PATH)) --template-name
all: topdir config all: topdir config
test: all test: all