janware/jw-pkg
1
Code Pull requests Activity Actions

topdir.mk: Fix: make topdir does only half a job

Browse source 
make topdir doesn't reliably regenerate pyrightconfig.json because of .SECONDEXPANSION. Adding a second dollar symbol $$(TD_GENERATE_FILES) solves the problem.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-01 13:38:55 +02:00
commit 5a1ef45cc0
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/py-topdir.mk
View file

@ -1,4 +1,5 @@
TD_COPY_FILES += pyproject.toml pyrightconfig.json TD_COPY_FILES += pyproject.toml
TD_GENERATE_FILES += pyrightconfig.json
PY_CHECK_EXCLUDE ?= PY_CHECK_EXCLUDE ?=
PY_SRC_ROOT += $(wildcard $(TOPDIR)/src $(TOPDIR)/tools) PY_SRC_ROOT += $(wildcard $(TOPDIR)/src $(TOPDIR)/tools)

3
make/topdir.mk
View file

@ -123,6 +123,7 @@ format: topdir
check-syntax: topdir check-syntax: topdir
check-format: topdir check-format: topdir
check: check-syntax check-format check: check-syntax check-format
@echo "Static code checks completed successfully!"
install: topdir.install install: topdir.install
clean: topdir.clean clean: topdir.clean
distclean: topdir.distclean distclean: topdir.distclean
@ -140,7 +141,7 @@ local-%: FORCE
unlocal: unlocal:
$(RM) -f $(shell find . -name local.mk) $(RM) -f $(shell find . -name local.mk)
topdir: $(TD_GENERATE_FILES) topdir: $$(TD_GENERATE_FILES)
topdir.clean: topdir.clean:
$(RM) -rf *.done $(TD_GENERATE_FILES) $(RM) -rf *.done $(TD_GENERATE_FILES)
clean: topdir.clean clean: topdir.clean