Update MKit to v0.0.40

mkit.ini

@@ -30,4 +30,4 @@
 [files]
     bin = src/app dummy
 
-#mkit version=0.0.37
+#mkit version=0.0.40

utils/mkit/include/build.sh

@@ -80,6 +80,7 @@ __expand_macros() {
     MacroMap[__MKIT_PROJ_MAINTAINER__]=$(ini 1value project:maintainer)
     MacroMap[__MKIT_PROJ_VCS_BROWSER__]=$(ini 1value project:vcs_browser)
     MacroMap[__MKIT_PROJ_GIT_LASTHASH__]=$(__cached git_lasthash)
+    MacroMap[__MKIT_PROJ_GIT_LASTSUMMARY__]=$(__cached git_lastsummary)
     MacroMap[__MKIT_PROJ_VERSION__]=$(__cached semver)
     for section in "$@"; do
         for mname in $(ini lskeys "$section"); do
@@ -161,7 +162,7 @@ __rec_built() {
     #
     local file=$1
     mkdir -p "$MKIT_LOCAL"
-    echo "$file" >> "$MKIT_LOCAL/built.lst"
+    echo "1:$file" >> "$MKIT_LOCAL/built.lst"
 }
 
 _mkit_data() {
@@ -185,6 +186,7 @@ _mkit_data() {
         echo "  x_MKIT_PROJ_MAINTAINER__ => '__MKIT_PROJ_MAINTAINER__'"
         echo "  x_MKIT_PROJ_VCS_BROWSER__ => '__MKIT_PROJ_VCS_BROWSER__'"
         echo "  x_MKIT_PROJ_GIT_LASTHASH__ => '__MKIT_PROJ_GIT_LASTHASH__'"
+        echo "  x_MKIT_PROJ_GIT_LASTSUMMARY__ => '__MKIT_PROJ_GIT_LASTSUMMARY__'"
         echo "  x_MKIT_PROJ_VERSION__ => '__MKIT_PROJ_VERSION__'"
         for section in "${sections[@]}"; do
             echo "$section:"
@@ -212,12 +214,31 @@ clean() {
     #
     # Clean up tree after building
     #
-    test -f "$MKIT_LOCAL/built.lst" && {
-        <"$MKIT_LOCAL/built.lst" grep -v -e '\.\.' -e ^/ \
-          | xargs -r rm -rf
-        rm -f "$MKIT_LOCAL/built.lst"
-        rmdir --ignore-fail-on-non-empty "$MKIT_LOCAL"
-    }
+    local path
+    local line
+    local depth
+    test -f "$MKIT_LOCAL/built.lst" || return 0
+    {
+        cat "$MKIT_LOCAL/built.lst"
+        echo "1:$MKIT_LOCAL/built.lst"
+        echo "1:$MKIT_LOCAL"
+    } \
+      | grep -v -e '\.\.' -e ^/ -e '^~' \
+      | while IFS=: read -r depth path; do
+            test -e "$path" || continue
+            case $depth in
+                1)  warn "removing: $path"
+                    test -d "$path" \
+                     && rmdir -p --ignore-fail-on-non-empty "$path"
+                    test -f "$path" && rm "$path"
+                    ;;
+                r)  warn "removing recursively: $path"
+                    rm -r "$path"
+                    ;;
+                *)  warn "invalid built.lst format!"
+                    ;;
+            esac
+        done
     true
 }
 

utils/mkit/include/facts.sh

@@ -103,6 +103,27 @@ git_lasthash() {
     git_bool dirty && echo -n ".dirty"
 }
 
+git_lastsummary() {
+    #
+    # Show last commit summary
+    #
+    # We can't do it outside git repo (or without git) but we should
+    # not be asked to; targets that don't require git should make use
+    # of cache built by dist target.
+    #
+    git_present || {
+        echo UNKNOWN_SUMMARY
+        warn "no git present; could not determine last summary"
+        return 3
+    }
+    git_bool dirty && {
+        echo "(index is dirty)"
+        return
+    }
+    git log -1 --format=oneline HEAD \
+      | cut -d' ' -f2-
+}
+
 semver() {
     #
     # Build proper SemVer version string
@@ -171,7 +192,7 @@ semver() {
     if ! git describe --tags --exact-match HEAD >&/dev/null;
     then    # we are at a later commit than the last tag
         is_tagged=F
-        brname=$(git_fact current_branch)
+        brname=$(git_fact current_branch | sed 's/[^[:alnum:]]/_/g')
         ghash=$(git_fact latest_sha)
     fi
     git_bool dirty && is_dirty=T

utils/mkit/include/release.sh

@@ -154,7 +154,7 @@ __vbump() {
     git add mkit.ini \
       || die "failed to add mkit.ini to the index"
     cache=$(mktemp -t "mkit._vbump_gitmsg.XXXXXXXX")
-    _vbump_gitmsg > "$cache"
+    _vbump_gitmsg "$nextver" > "$cache"
     git commit -e -F "$cache"   # note: reading from stdin will break vim
     rm "$cache"
 }
@@ -163,7 +163,8 @@ _vbump_gitmsg() {
     #
     # Compose git message template for 'Bump version' commit
     #
-    echo "Bump version"
+    local nextver=$1
+    echo "Bump version to $nextver"
     echo ""
     echo "Overview of changes:"
     echo ""

utils/mkit/include/vars.sh

@@ -86,4 +86,4 @@ MKIT_TSTAMP=${MKIT_TSTAMP:-ctime}
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.37
+MKIT_VERSION=0.0.40