janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-16 04:23:31 +01:00
Code Activity

projects-dir.mk: Make projects.txt a variable (PROJECTS_TXT)

Browse source 
This mostly allows for a shortcut to disable an existing projects.txt
on the command line: Make xyz PROJECTS_TXT=

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-10-24 19:25:56 +00:00
commit 7f95d89164
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/projects-dir.mk
View file

@ -23,8 +23,10 @@ ifneq ($(PROJECTS),)
export PGIT_CLONE_PROJECTS = $(PROJECTS)
endif
ifneq ($(wildcard projects.txt),)
PROJECTS ?= $(shell cat projects.txt | sed '/^ *\#/ d')
PROJECTS_TXT ?= projects.txt
ifneq ($(wildcard $(PROJECTS_TXT)),)
PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d')
# TODO: this could be nicer
CVS_PROJECTS = $(PROJECTS)
else
@ -182,8 +184,8 @@ pkg-release-all:
/bin/bash ./packager-client/scripts/packager-client-2.sh
pkg-fetch-from-%:
ssh $* /opt/jw-base/bin/jw-pkg info -s > projects.txt.tmp
mv projects.txt.tmp projects.txt
ssh $* /opt/jw-base/bin/jw-pkg info -s > $(PROJECTS_TXT).tmp
mv $(PROJECTS_TXT).tmp $(PROJECTS_TXT)
pkg-init-%:
$(CREATE_PROJECT_SH) $*
@ -303,7 +305,7 @@ list-maintainers: $(SSH_WRAPPER_SH)
git-update-project-descriptions: $(SSH_WRAPPER_SH)
$(GIT_SRV_ADMIN_SH) -j update-descriptions all
projects.txt:
$(PROJECTS_TXT):
echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@
edit-%: | $(TEXT_FILES_CACHE)