Add version bump/CL helper targets

src/include/mkit.sh

@@ -71,7 +71,7 @@ route() {
     # Call correct function based on $1
     #
     case $1 in
-        build|build_manpages|clean|dist|rpmstuff|install|release_?|uninstall)
+        build|build_manpages|clean|dist|rpmstuff|install|release_?|uninstall|vbump_?)
             $1
             ;;
         *)

src/include/release.sh

@@ -107,8 +107,6 @@ __release() {
     __die_if wip
     __die_if old_c
 
-    # FIXME: Have user prepare proper message with changelog
-
     newtag=v$(__ver_info nextver_g)
     set -e
     debug_var newtag
@@ -117,6 +115,42 @@ __release() {
     git branch -f "$RELDST" "$newtag"
 }
 
+__git_msg_vbump() {
+    echo "Bump version"
+    echo ""
+    __git_info reldiff | sed 's/^/ *  '
+}
+
+__vbump() {
+    local level="$1"
+    local lastver   # current from config.mk
+    local nextver   # after the bump
+    __die_if nogit
+    __die_if norelbr
+    __die_if dirty
+    lastver=$(__ver_info currver_c)
+    nextver=$(__ver_info nextver_c)
+    debug_var lastver nextver
+    $MKIT_DRY && return
+    sed -i "s/$lastver/$nextver/" config.mk \
+      || die "failed to update config.mk"
+    git add config.mk \
+      || die "failed to add config.mk to the index"
+    git commit -e -m "$(__git_msg_vbump)"
+}
+
+vbump_x() {
+    __vbump x
+}
+
+vbump_y() {
+    __vbump y
+}
+
+vbump_z() {
+    __vbump z
+}
+
 release_x() {
     __release x
 }

src/mkit.mk

@@ -42,4 +42,13 @@ release_z:
 uninstall:
 	@$(MKIT_DIR)/make uninstall
 
-.PHONY: all options clean dist rpmstuff install uninstall release_x release_y release_z
+vbump_x:
+	@$(MKIT_DIR)/make vbump_x
+
+vbump_y:
+	@$(MKIT_DIR)/make vbump_y
+
+vbump_z:
+	@$(MKIT_DIR)/make vbump_z
+
+.PHONY: all options clean dist rpmstuff install uninstall release_x release_y release_z vbump_x vbump_y vbump_z