janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

projects-dir.mk: Retire BUILD_PROJECTS

Browse source 
Use DEP_PROJECTS instead of BUILD_PROJECTS everywhere. DEP_PROJECTS
considers more projects, and for all targets it is relevant to, it's
desirable to have them operate on the maximum blast radius.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-04-04 14:59:26 +02:00
commit 1d17d16519
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/projects-dir.mk
View file

@ -144,10 +144,9 @@ JANWARE_PACKAGE_FILTER = url =~ janware
# ------------ projects to be built # ------------ projects to be built
TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS))
BUILD_PROJECTS = $(shell $(JW_PKG_PY_BUILD) --build-order all $(TARGET_PROJECTS)) DEP_PROJECTS = $(shell $(JW_PKG_PY_PROJECTS) pkg-requires --recursive --syntax names-only --no-subpackages --delimiter ' ' --subsections jw run,build,devel,release $(TARGET_PROJECTS))
DEP_PROJECTS = $(shell $(JW_PKG_PY_PROJECTS) pkg-requires --syntax names-only --no-subpackages --delimiter ' ' --subsections jw run,build,devel,release $(TARGET_PROJECTS)) GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(DEP_PROJECTS)))))
GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS))))) PROJECTS_WITH_PROJECT_CONF = $(patsubst %/make/project.conf,%,$(wildcard $(addsuffix /make/project.conf,$(DEP_PROJECTS))))
PROJECTS_WITH_PROJECT_CONF = $(patsubst %/make/project.conf,%,$(wildcard $(addsuffix /make/project.conf,$(BUILD_PROJECTS))))
# ------------ targets # ------------ targets
@ -210,7 +209,7 @@ distclean: clean.text-files-cache
clean.text-files-cache: clean.text-files-cache:
rm -f $(TEXT_FILES_CACHE) rm -f $(TEXT_FILES_CACHE)
list-files: list-files:
$(Q)for p in $(BUILD_PROJECTS); do \ $(Q)for p in $(DEP_PROJECTS); do \
$(LIST_VCS_FILES_SH) -znf $$p | sed -z "s/^/$$p\//" | \ $(LIST_VCS_FILES_SH) -znf $$p | sed -z "s/^/$$p\//" | \
xargs -0 realpath -q ;\ xargs -0 realpath -q ;\
done done
@ -230,10 +229,10 @@ cloc:
for p in $(GIT_PROJECTS); do \ for p in $(GIT_PROJECTS); do \
git -C $$p submodule status | sed "s|^ *\([^ ]\+\) \+\([^ ]\+\) *.*|$$p/\2|" ;\ git -C $$p submodule status | sed "s|^ *\([^ ]\+\) \+\([^ ]\+\) *.*|$$p/\2|" ;\
done > cloc-ignore.txt done > cloc-ignore.txt
for p in $(foreach s,dist include bin lib,$(addsuffix /$s,$(BUILD_PROJECTS))); do \ for p in $(foreach s,dist include bin lib,$(addsuffix /$s,$(DEP_PROJECTS))); do \
echo $$p >> cloc-ignore.txt ;\ echo $$p >> cloc-ignore.txt ;\
done done
cloc --exclude-list-file=cloc-ignore.txt $(BUILD_PROJECTS) cloc --exclude-list-file=cloc-ignore.txt $(DEP_PROJECTS)
# --- package-related targets # --- package-related targets