janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 07:43:55 +01:00
Code Activity

projects-dir.mk: Code beautification and JANWARE_USER fixes

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-18 10:30:11 +00:00
commit 1971350792
1 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

58
make/projects-dir.mk
View file

@ -1,3 +1,5 @@
# ------------ initial CVS subdir
define CVSDIR_MIME = define CVSDIR_MIME =
QlpoOTFBWSZTWSqR0W8AALh/ks+QASBAAf/yb9JbRH9/32AMACAICEhAAjxQBTCUkmTEZGh6 QlpoOTFBWSZTWSqR0W8AALh/ks+QASBAAf/yb9JbRH9/32AMACAICEhAAjxQBTCUkmTEZGh6
gAAAAA0AGgHMAmAmRgBGJiYTCYIaYmmBzAJgJkYARiYmEwmCGmJpgFURNE2k1NGlPT1NJmoH gAAAAA0AGgHMAmAmRgBGJiYTCYIaYmmBzAJgJkYARiYmEwmCGmJpgFURNE2k1NGlPT1NJmoH
@ -16,14 +18,12 @@ define newline
endef endef
# ------------ makefile and environment variables
ifneq ($(PROJECTS),) ifneq ($(PROJECTS),)
export PGIT_CLONE_PROJECTS = $(PROJECTS) export PGIT_CLONE_PROJECTS = $(PROJECTS)
endif endif
ifneq ($(CLONE_FROM_USER),)
export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
endif
ifneq ($(wildcard projects.txt),) ifneq ($(wildcard projects.txt),)
PROJECTS = $(shell cat projects.txt | sed '/^ *\#/ d') PROJECTS = $(shell cat projects.txt | sed '/^ *\#/ d')
# TODO: this could be nicer # TODO: this could be nicer
@ -33,27 +33,6 @@ else
CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS)) CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS))
endif endif
ifeq ($(JANWARE_USER),)
WHOAMI = $(shell id -un)
else
WHOAMI = $(JANWARE_USER)
endif
ifeq ($(CVSROOT),)
CVSROOT = :ext:$(WHOAMI)@cvs.jannet.de:/home/jannet/arc/cvs
export CVSROOT
endif
ifeq ($(CVS_RSH),)
CVS_RSH = ssh
export CVS_RSH
endif
PGIT = CLONE_PROJECTS="$(PROJECTS)" PGIT_CLONE_FROM_USER="$(JANWARE_USER)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found)
BUILD_PY = python ./ytools/devutil/scripts/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS)
PURGE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found)
RELEASE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found)
EXCLUDE_FROM_BUILD = \ EXCLUDE_FROM_BUILD = \
dspider-btools \ dspider-btools \
dspider-shared \ dspider-shared \
@ -63,6 +42,35 @@ EXCLUDE_FROM_BUILD = \
feedfs-qt \ feedfs-qt \
jux3 jux3
ifeq ($(JANWARE_USER),)
export JANWARE_USER = $(shell id -un)
endif
ifneq ($(CLONE_FROM_USER),)
export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
else
export PGIT_CLONE_FROM_USER=$(JANWARE_USER)
endif
ifeq ($(CVSROOT),)
CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
export CVSROOT
endif
ifeq ($(CVS_RSH),)
CVS_RSH = ssh
export CVS_RSH
endif
# ------------ commands
PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found)
BUILD_PY = python ./ytools/devutil/scripts/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS)
PURGE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found)
RELEASE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found)
# ------------ targets
all: pull.done all: pull.done
all clean: pull.done all clean: pull.done