Update own dogfood

utils/mkit/include/deploy.sh

@@ -2,6 +2,8 @@
 # MKit - simple install helper
 # See LICENSE file for copyright and license details.
 
+mkit_import ini
+
 _deploy_item() {
     #
     # Deploy item and make it look like wanted

utils/mkit/include/mkit.sh

@@ -40,11 +40,13 @@ _valid_targets() {
     echo debstuff
     echo dist
     echo install
+    echo release
     echo release_x
     echo release_y
     echo release_z
     echo rpmstuff
     echo uninstall
+    echo vbump
     echo vbump_x
     echo vbump_y
     echo vbump_z

utils/mkit/include/release.sh

@@ -91,6 +91,7 @@ _release() {
     #
     local rlevel=$1     # release level (x, y or z)
     local newtag        # new tag
+    local relsrc        # release source branch (if any)
     local reldst        # release destination branch (if any)
 
     _relck git_present
@@ -107,9 +108,10 @@ _release() {
     $MKIT_DRY && return
     git tag -m "$(_release_msg)" "$newtag"
 
+    relsrc=$(ini 1value project:relsrc)
     reldst=$(ini 1value project:reldst)
-    debug_var reldst
-    if test -n "$reldst"; then
+    debug_var relsrc reldst
+    if test -n "$reldst" && test "$reldst" != "$relsrc"; then
         git branch -f "$reldst" "$newtag"
     fi
 }
@@ -169,6 +171,13 @@ _vbump_gitmsg() {
         '
 }
 
+release() {
+    #
+    # Perform release on Z level
+    #
+    _release z
+}
+
 release_x() {
     #
     # Perform release on X level
@@ -190,6 +199,13 @@ release_z() {
     _release z
 }
 
+vbump() {
+    #
+    # Perform version bump on Z level
+    #
+    _vbump z
+}
+
 vbump_x() {
     #
     # Perform version bump on X level

utils/mkit/include/vars.sh

@@ -57,4 +57,4 @@ MKIT_PROJ_PKGNAME=""
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.22+master.gaafa785
+MKIT_VERSION=0.0.23+master.g1a2dd96

utils/mkit/make

@@ -24,9 +24,9 @@ MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
 init_core
 
 case "$1" in
-    --version-semver) echo "$MKIT_VERSION"; exit 0 ;;
-    --version)        echo "Mkit (Simple Makefile target helper) $MKIT_VERSION"
-                      exit 0 ;;
+    -V|--version-semver)    echo "$MKIT_VERSION"; exit 0 ;;
+    --version)              echo "Mkit (Simple Makefile target helper) $MKIT_VERSION"
+                            exit 0 ;;
 esac
 
 mkit_init

utils/mkit/mkit.mk

@@ -27,7 +27,7 @@ install: all
 	@$(MKIT_DIR)/make install
 
 release:
-	@$(MKIT_DIR)/make release_z
+	@$(MKIT_DIR)/make release
 
 release_x:
 	@$(MKIT_DIR)/make release_x
@@ -42,7 +42,7 @@ uninstall:
 	@$(MKIT_DIR)/make uninstall
 
 vbump:
-	@$(MKIT_DIR)/make vbump_z
+	@$(MKIT_DIR)/make vbump
 
 vbump_x:
 	@$(MKIT_DIR)/make vbump_x
@@ -53,4 +53,4 @@ vbump_y:
 vbump_z:
 	@$(MKIT_DIR)/make vbump_z
 
-.PHONY: all clean dist rpmstuff install uninstall release_x release_y release_z vbump_x vbump_y vbump_z
+.PHONY: all clean dist rpmstuff install uninstall release release_x release_y release_z vbump vbump_x vbump_y vbump_z

utils/mkit/stub

@@ -47,7 +47,7 @@ deploy() {
             echo -n "# $any_name"
             test -n "$Tagline" && echo -n " - $Tagline"
             echo
-            echo '# See LICENSE.md file for copyright and license details.'
+            $MkLicense && echo '# See LICENSE.md file for copyright and license details.'
             echo ''
             echo 'MKIT_DIR=utils/mkit'
             #shellcheck disable=SC2016
@@ -106,7 +106,7 @@ deploy() {
                 echo "    doc     = [ENV:PREFIX]/share/doc/$PackageName"
                 echo ""
                 echo "[tokens]"
-                echo "    __BIN_DIR__ = [roots:bin]"
+                echo "    __${PackageName^^}_FOO__ = Barr.."
                 echo ""
                 echo "[modes]"
                 echo "    bin     = 755"
@@ -144,7 +144,7 @@ deploy() {
             echo 'make %{?_smp_mflags}'
             echo ''
             echo '%install'
-            echo '%make_install'
+            echo '%make_install PREFIX=/usr'
             echo ''
             echo '%files'
             echo 'MKIT_STUB_FILELIST'
@@ -197,7 +197,7 @@ deploy() {
             echo ''
             echo 'override_dh_auto_install:'
             echo ''
-            echo '	make install DESTDIR=debian/tmp'
+            echo '	make install PREFIX=/usr DESTDIR=debian/tmp'
             echo ''
             echo 'override_dh_usrlocal:'
             echo ''
@@ -318,6 +318,17 @@ deploy() {
             echo "     *  \`MKIT_STUB_FILELIST\` - List of full paths to"
             echo "        your files after installation."
             echo ""
+            echo "        Note that in case of debian/package.install files,"
+            echo "        PREFIX based paths (eg. /usr/bin) in this file should"
+            echo "        should be as if PREFIX was /usr/local, despite PREFIX"
+            echo "        being set to /usr in debian/rules.  (Debian's script"
+            echo "        dh_usrlocal will take care of that.)"
+            echo ""
+            echo "        In case of Fedora-based distro, you should make use"
+            echo "        of RPM macros:"
+            echo ""
+            echo "            https://fedoraproject.org/wiki/Packaging:RPMMacros"
+            echo ""
             echo "    Refer to these documents for further details:"
             echo ""
             echo "        http://rpm-guide.readthedocs.io/"
@@ -545,7 +556,6 @@ deploy_packaging() {
     deploy packaging/debian/rules
     deploy packaging/debian/source/format
     deploy packaging/debian/"$PackageName".install
-    deploy packaging/template.spec
 }
 
 init_from_existing() {
@@ -660,7 +670,7 @@ main() {
         *)        usage ;;
     esac
     updating && init_from_existing
-    if test -n $License; then
+    if test -n "$License"; then
         known_licenses | grep -qxF "$License" \
          || die "unknown license (use -L to get list): $License"
         MkLicense=true