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

upload.mk: Add support for committing version to git

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-03 21:20:42 +00:00
commit 5d2ec44113
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/upload.mk
View file

@ -18,6 +18,12 @@ UPLOAD_LAST_VERSION ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
REMOTE_TARGETS ?= \ REMOTE_TARGETS ?= \
$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)) $(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
ifneq ($(wildcard CVS),)
UPLOAD_SCM = cvs
else
UPLOAD_SCM = git
endif
all: all:
upload: upload.dist upload: upload.dist
@ -30,7 +36,8 @@ ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
make $(REMOTE_TARGETS) make $(REMOTE_TARGETS)
ifeq ($(UPLOAD_TEST_PREFIX),) ifeq ($(UPLOAD_TEST_PREFIX),)
echo $(VERSION) > $(UPLOAD_LAST_VERSION_FILE) echo $(VERSION) > $(UPLOAD_LAST_VERSION_FILE)
cvs commit -m "o $(VERSION)" $(UPLOAD_LAST_VERSION_FILE) $(UPLOAD_SCM) add $(UPLOAD_LAST_VERSION_FILE)
$(UPLOAD_SCM) commit -m "$(VERSION)" $(UPLOAD_LAST_VERSION_FILE)
endif endif
endif endif
touch $@.done touch $@.done
@ -38,8 +45,8 @@ endif
is-uploaded: is-uploaded:
ifneq ($(UPLOAD_LAST_VERSION),$(VERSION)) ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
echo $(VERSION) > $(UPLOAD_LAST_VERSION_FILE) echo $(VERSION) > $(UPLOAD_LAST_VERSION_FILE)
cvs add $(UPLOAD_LAST_VERSION_FILE) $(UPLOAD_SCM) add $(UPLOAD_LAST_VERSION_FILE)
cvs commit -m "initial checkin" $(UPLOAD_LAST_VERSION_FILE) $(UPLOAD_SCM) commit -m "`cat $(UPLOAD_LAST_VERSION_FILE)`" $(UPLOAD_LAST_VERSION_FILE)
endif endif
touch upload.dist.done touch upload.dist.done