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

projects-dir.mk: Add safety target cvs-check-user

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-03-08 09:26:57 +00:00
commit dc23912d5b
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/projects-dir.mk
View file

@ -68,9 +68,8 @@ ifeq ($(JANWARE_USER),)
UNAVAILABLE_TARGETS ?= pull.done update.done clone.done UNAVAILABLE_TARGETS ?= pull.done update.done clone.done
else else
UNAVAILABLE_TARGETS ?= UNAVAILABLE_TARGETS ?=
endif
export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
endif
ifneq ($(JW_BUILD_SSH),) ifneq ($(JW_BUILD_SSH),)
export CVS_RSH := $(JW_BUILD_SSH) export CVS_RSH := $(JW_BUILD_SSH)
@ -300,16 +299,22 @@ clean.ssh-wrapper:
rm -f $(SSH_WRAPPER_SH) rm -f $(SSH_WRAPPER_SH)
clean: clean.ssh-wrapper clean: clean.ssh-wrapper
cvs-check-user:
@if ! grep -q ":ext:$(JANWARE_USER)@" CVS/Root; then \
echo "Wrong username in CVS/Root, change that to: $(CVSROOT)" ;\
exit 1; \
fi
cvsdir.done: $(SSH_WRAPPER_SH) cvsdir.done: $(SSH_WRAPPER_SH)
if [ ! -d CVS ]; then \ if [ ! -d CVS ]; then \
mkdir CVS && \ mkdir CVS && \
echo :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs > CVS/Root && \ echo $(CVSROOT) > CVS/Root && \
echo proj > CVS/Repository && \ echo proj > CVS/Repository && \
echo "/Makefile/$Revision$ ///" | sed 's/ *evision: *\([0-9.]*\) */\1/; s/ *$$ *//' > CVS/Entries ;\ echo "/Makefile/$Revision$ ///" | sed 's/ *evision: *\([0-9.]*\) */\1/; s/ *$$ *//' > CVS/Entries ;\
fi fi
touch $@ touch $@
cvs-update.done: $(filter-out $(UNAVAILABLE_TARGETS),cvsdir.done $(SSH_WRAPPER_SH)) cvs-update.done: cvsdir.done $(SSH_WRAPPER_SH) cvs-check-user
cvs update -dP Makefile $(shell $(CVS_ADMIN_SH) list-projects) cvs update -dP Makefile $(shell $(CVS_ADMIN_SH) list-projects)
touch $@ touch $@