janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 15:52:49 +01:00
Code Activity

projects-dir.mk: Beautify code

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-12 15:17:05 +00:00
commit c39b7cc977
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/projects-dir.mk
View file

@ -1,6 +1,6 @@
# #
# This is the toplevel Makefile for a janware GmbH software build tree. It is # This is the toplevel Makefile for a janware GmbH software build tree. It is
# provided under the terms of the Gnu Lesser Public License, Version 2. # provided under the terms of the GNU Lesser Public License, Version 2.
# #
# You will need a janware.com user account for pretty much anything this # You will need a janware.com user account for pretty much anything this
# Makefile does. Ask admin@janware.com if you want one. # Makefile does. Ask admin@janware.com if you want one.
@ -9,7 +9,7 @@
# for some on-line documentation of how this is meant to work. # for some on-line documentation of how this is meant to work.
# #
# ------------ makefile and environment variables # ------------ Makefile and environment variables
ifneq ($(PROJECTS),) ifneq ($(PROJECTS),)
export PGIT_CLONE_PROJECTS = $(PROJECTS) export PGIT_CLONE_PROJECTS = $(PROJECTS)
@ -60,7 +60,7 @@ ifneq ($(EXCLUDE_FROM_BUILD),)
BUILD_PY_EXTRA_ARGS += --exclude "$(EXCLUDE_FROM_BUILD)" BUILD_PY_EXTRA_ARGS += --exclude "$(EXCLUDE_FROM_BUILD)"
endif endif
# ------------ commands # ------------ external programs
MOD_SCRIPT_DIR = ./jw-build/scripts MOD_SCRIPT_DIR = ./jw-build/scripts
PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/jw-build/bin/pgit.sh) pgit.sh-not-found) PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/jw-build/bin/pgit.sh) pgit.sh-not-found)
@ -70,8 +70,8 @@ PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge
RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/jw-build/bin/build-release.sh) release-not-found) RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/jw-build/bin/build-release.sh) release-not-found)
PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
BROWSER ?= firefox BROWSER ?= firefox
GIT_SRV_ADMIN = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh
CVS_ADMIN = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh
# ------------ targets # ------------ targets
@ -181,12 +181,12 @@ git-conv-%:
} }
check-conv: check-conv:
for p in `$(GIT_SRV_ADMIN) -u jan -j list-personal-projects`; do \ for p in `$(GIT_SRV_ADMIN_SH) -u jan -j list-personal-projects`; do \
make git-conv-$$p ;\ make git-conv-$$p ;\
done done
list-maintainers: list-maintainers:
$(GIT_SRV_ADMIN) $@ $(GIT_SRV_ADMIN_SH) $@
projects.txt: projects.txt:
echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@ echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@
@ -217,7 +217,7 @@ cvsdir.done: ssh-wrapper.sh
touch $@ touch $@
cvs-update.done: cvsdir.done cvs-update.done: cvsdir.done
cvs update -dP Makefile $(shell $(CVS_ADMIN) list-projects) cvs update -dP Makefile $(shell $(CVS_ADMIN_SH) list-projects)
touch $@ touch $@
update.done: purge update.done: purge