janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

Makefile, git-cvs-bridge.mk, srcdist.mk: Add git-cvs-bridge.mk

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-08 08:55:17 +00:00
commit c8e664bcb9
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -5,6 +5,7 @@ RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/ft
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/topdir.mk include $(MODDIR)/make/topdir.mk
include $(MODDIR)/make/srcdist.mk include $(MODDIR)/make/srcdist.mk
include $(MODDIR)/make/git-cvs-bridge.mk
all: all:
clean: clean.pkgconfig clean: clean.pkgconfig

21
make/git-cvs-bridge.mk Normal file
View file

@ -0,0 +1,21 @@
# is "origin" by default, but this clashes with the remote's name in some situations
CVS_HEAD_BRANCH ?= cvs-head
all:
ifeq ($(VCS),cvs)
ifneq ($(GIT_BUDDY_DIR),)
git2cvs:
cvs up -dP
git -C $(GIT_BUDDY_DIR) cherry $(CVS_HEAD_BRANCH) HEAD | sed -n 's/^+ //p' | xargs -r -l1 git -C $(GIT_BUDDY_DIR) cvsexportcommit -w $(CWD) -c -p -v
endif
else ifeq ($(VCS),git)
cvs2git:
git cvsimport -o $(CVS_HEAD_BRANCH) -v -kk proj/$(PROJECT)
endif
$(WD_PKG_DIR):
mkdir -p $@
pkg-upload-wd: | $(WD_PKG_DIR)
make -s list-files | xargs echo $(WD_PKG_VCS_FILES) | xargs tar --transform "s|^|$(WD_PKG_BASE_NAME)/|" -cjf $(WD_PKG_PATH)

19
make/srcdist.mk
View file

@ -12,22 +12,3 @@ WD_PKG = $(WD_PKG_BASE_NAME).tar.bz2
WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG) WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG)
WD_PKG_UPLOAD_SERVER = pkg.janware.com WD_PKG_UPLOAD_SERVER = pkg.janware.com
WD_PKG_UPLOAD_PATH = /srv/dav/pub/clients/jw WD_PKG_UPLOAD_PATH = /srv/dav/pub/clients/jw
all:
ifeq ($(VCS),cvs)
ifneq ($(GIT_BUDDY_DIR),)
git2cvs:
cvs up -dP
git -C $(GIT_BUDDY_DIR) cherry origin HEAD | sed -n 's/^+ //p' | xargs -l1 git -C $(GIT_BUDDY_DIR) cvsexportcommit -w $(CWD) -c -p -v
endif
else ifeq ($(VCS),git)
cvs2git:
git cvsimport -v -kk proj/$(PROJECT)
endif
$(WD_PKG_DIR):
mkdir -p $@
pkg-upload-wd: | $(WD_PKG_DIR)
make -s list-files | xargs echo $(WD_PKG_VCS_FILES) | xargs tar --transform "s|^|$(WD_PKG_BASE_NAME)/|" -cjf $(WD_PKG_PATH)