Update MKit to v0.0.33

utils/mkit/include/build.sh

@@ -47,15 +47,19 @@ __expand_line() {
     local line=$1   # line to process
     local mname     # macro name
     local mvline    # line of macro value
+    local xline     # expanded line
+    xline=$line
     for mname in "${!MacroMap[@]}"; do
         if ! test "${line//$mname}" == "$line"; then
-            while IFS= read -r mvline; do
-                echo "${line//$mname/$mvline}"
-            done <<<"${MacroMap[$mname]}"
-            return 0
+            xline=$(
+                while IFS= read -r mvline; do
+                    echo "${line//$mname/$mvline}"
+                done <<<"${MacroMap[$mname]}"
+            )
         fi
+        line=$xline
     done
-    echo "$line"
+    echo "$xline"
     return 1
 }
 

utils/mkit/include/facts.sh

@@ -139,9 +139,14 @@ semver() {
     local prerl         # pre-release keyword (from mkit.ini, eg. 'beta')
     local latest_tag    # latest git tag
     local commit        # commit indicator (CURRENT_BRANCH.gHASH)
-    local dirty         # 0 if dirty, 1 if clean
+    local dirty=F       # F if dirty, T if clean
+    local btime         # hex timestamp or nothing (see $MKIT_TTAG)
     local suffix        # version suffix
     prerl=$(ini 1value project:prerl)
+    case $MKIT_TTAG in
+        none)   btime= ;;
+        btime)  btime=$(printf '%08x' "$(date +%s)") ;;
+    esac
     grep ":" <<<"$prerl" \
      && warn "colon in project:prerl may corrupt version data: $prerl"
     git_present || {
@@ -161,14 +166,17 @@ semver() {
     then    # we are at a later commit than the last tag
         commit="$(git_fact current_branch).g$(git_fact latest_sha)"
     fi
-    git_bool dirty; dirty=$?
-    case "$dirty:$commit" in
-        1:)  suffix=""               ;;
-        0:)  suffix="+dirty"         ;;
-        1:*) suffix="+$commit"       ;;
-        0:*) suffix="+$commit.dirty" ;;
-        *)   suffix=MKIT_BUG
-             warn "MKIT_BUG: bad dirt/commit detection" ;;
+    git_bool dirty && dirty=T
+    case "$dirty:$btime:$commit" in
+        F:*:)   suffix=""                       ;;
+        T::)    suffix="+dirty"                 ;;
+        T:*:)   suffix="+t$btime.dirty"           ;;
+        F::*)   suffix="+$commit"               ;;
+        F:*:*)  suffix="+t$btime.$commit"         ;;
+        T::*)   suffix="+$commit.dirty"         ;;
+        T:*:*)  suffix="+t$btime.$commit.dirty"   ;;
+        *)      suffix=MKIT_BUG
+                warn "MKIT_BUG: bad dirt/commit detection" ;;
     esac
     test -n "$prerl" && suffix="-$prerl$suffix"
     echo "$xyz$suffix"

utils/mkit/include/ini.sh

@@ -79,7 +79,6 @@ __ini_grepsec() {
     local ok=false      # are we in the section?
     local line          # each input line
     grep '.' \
-      | grep -v '\s*#' \
       | while read -r line; do
             case "$line" in
                 \[$wnt\]) ok=true;  continue ;;

utils/mkit/include/vars.sh

@@ -55,7 +55,23 @@ MKIT_LOCAL=${MKIT_LOCAL:-.mkit}
 #
 MKIT_PROJ_PKGNAME=""
 
+#
+# Add time-based ordinal tag to SemVer build data?
+#
+# Can be 'none' or 'btime'.
+#
+# If 'btime', devel builds have also 'tXXXXXXXX' tag, where each
+# 'X' is a hexa-decimal digit of Unix timestamp taken when build
+# is initiated.  This way, builds from same branch are guarranteed
+# to order based on build time (that is, until February 7th, 2106).
+#
+# Note that this makes devel and dirty builds non-deterministic,
+# but does not affect clean builds (ie. builds from clean repo
+# with HEAD corresponding to latest version tag.).
+#
+MKIT_TTAG=${MKIT_TTAG:-btime}
+
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.31
+MKIT_VERSION=0.0.33