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: Add variable DEP_PROJECTS

Browse source 
make git-show-pushable-master-branches misses projects which should
better be pulled in as dependencies. It searches $(BUILLD_PROJECTS)
for repositories with pushable commits, that variable leaves some
out, and DEP_PROJECTS has them. It make use of the renovated
pkg-requires command.

This move should be extended to other uses of BUILD_PROJECTS as well,
after giving it some test runs. And the legacy and redundant command
prereq should be removed.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-04-03 18:41:57 +02:00
commit 5916dca0c5
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/projects-dir.mk
View file

@ -145,6 +145,7 @@ JANWARE_PACKAGE_FILTER = url =~ janware
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)) BUILD_PROJECTS = $(shell $(JW_PKG_PY_BUILD) --build-order all $(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,$(BUILD_PROJECTS))))) GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS)))))
PROJECTS_WITH_PROJECT_CONF = $(patsubst %/make/project.conf,%,$(wildcard $(addsuffix /make/project.conf,$(BUILD_PROJECTS)))) PROJECTS_WITH_PROJECT_CONF = $(patsubst %/make/project.conf,%,$(wildcard $(addsuffix /make/project.conf,$(BUILD_PROJECTS))))
@ -359,7 +360,7 @@ git-show-non-master-branches:
done done
git-show-pushable-master-branches: git-show-pushable-master-branches:
$(Q)for p in $(BUILD_PROJECTS); do \ $(Q)for p in $(DEP_PROJECTS); do \
if git -C $$p log --oneline origin/master.. | grep . >/dev/null; then \ if git -C $$p log --oneline origin/master.. | grep . >/dev/null; then \
echo ======================= $$p ;\ echo ======================= $$p ;\
git -C $$p log --oneline origin/master.. ;\ git -C $$p log --oneline origin/master.. ;\