diff --git a/conf/topdir/pyproject.toml b/conf/templates/pyproject.toml similarity index 100% rename from conf/topdir/pyproject.toml rename to conf/templates/pyproject.toml diff --git a/make/py-topdir.mk b/make/py-topdir.mk index 8cadbb07..a58e1207 100644 --- a/make/py-topdir.mk +++ b/make/py-topdir.mk @@ -1,6 +1,12 @@ -TD_COPY_FILES += pyproject.toml +include $(JWBDIR)/make/ldlibpath.mk + +TD_GENERATE_FILES += pyproject.toml PY_CHECK_EXCLUDE ?= + +MYPY_CONFIG_PATH = $(subst :,:$$MYPY_CONFIG_FILE_DIR/,:$(PYTHONPATH)) +MYPY_PATH_DIRECTIVE = mypy_path = "$(MYPY_CONFIG_PATH)" + ifndef PY_CHECK_ROOTS PY_CHECK_ROOTS += $(wildcard $(TOPDIR)/src $(TOPDIR)/tools) endif @@ -70,7 +76,12 @@ clean.topdir: clean.py-check clean.py-check: rm -rf .mypy_cache +pyproject.toml: + $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered projects create-file --format tmpl \ + --template-name $@ --search-path $(JW_PKG_CONF_BASE_DIR)/templates --field mypypath='$(MYPY_PATH_DIRECTIVE)' $(PROJECT) > $@.tmp + mv $@.tmp $@ + pyrightconfig.json: $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format unaltered projects create-file --format pyright \ - $(PROJECT) --field base=$(JW_PKG_CONF_BASE_DIR)/project/pyrightconfig-base.json $(addprefix --field include=,$(wildcard src/python tools/python)) > $@.tmp + --field base=$(JW_PKG_CONF_BASE_DIR)/project/pyrightconfig-base.json $(addprefix --field include=,$(wildcard src/python tools/python)) $(PROJECT) > $@.tmp mv $@.tmp $@