[gentoo-commits] proj/R_overlay:master commit in: /

[André Erdmann]

commit:     356e6985f87066652d625e20d0834f371aed253b
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Apr  2 19:55:36 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Apr  2 20:12:47 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=356e6985

Makefile: add 'setver', 'version-bump' targets

---
 Makefile | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f308e44..505f0cf 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ BUILDDIR := ./tmp
 ROVERLAY_TARGET_TYPE := gentoo
 RELEASE_NOT_DIRTY    := n
 RELEASE_DIRTY_SUFFIX := -dirty
+VBUMP_COMMIT         := y
 
 PYMOD_FILE_LIST := ./roverlay_files.list
 
@@ -23,9 +24,11 @@ MANIFEST      := $(CURDIR)/MANIFEST
 LICENSES_FILE := $(CURDIR)/files/licenses
 VERSION_FILE  := $(CURDIR)/VERSION
 
+X_GIT         := git
+
 MANIFEST_GEN  := ./bin/build/create_manifest.sh
 LICENSES_GEN  := ./bin/build/make-licenses.sh
-
+X_SETVER      := ./bin/build/setver.sh
 RV_SETUP      := ./bin/roverlay-setup
 
 SETUP_PY      := ./setup.py
@@ -57,6 +60,23 @@ PHONY += version
 version:
        @cat $(VERSION_FILE)
 
+PHONY += setver
+setver: $(X_SETVER)
+ifeq ($(VER),)
+       $(error $$VER is not set.)
+else
+       $< $(VER)
+endif
+
+PHONY += version-bump
+version-bump: $(X_SETVER)
+       { ! $(X_GIT) status --porcelain -- $(notdir $(VERSION_FILE)) | grep .; }
+ifeq ($(VBUMP_COMMIT),$(filter $(VBUMP_COMMIT),y Y 1 yes YES true TRUE))
+       X_GIT="$(X_GIT)" $< --reset --git-add --git-commit --git-tag +
+else
+       X_GIT="$(X_GIT)" $< --reset --git-add +
+endif
+
 PHONY += test
 test: ./bin/run_tests
        ./bin/run_tests