Update MKit to v0.0.35

utils/mkit/include/facts.sh

@@ -54,6 +54,9 @@ git_fact() {
         latest_sha)
             git log -1 --pretty=format:%h HEAD
             ;;
+        latest_cdate)
+            git log -1 --format=%ct HEAD
+            ;;
         *)
             warn "unknown git fact asked: $fact_name"
             ;;
@@ -139,9 +142,15 @@ 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         # timestamp or nothing (see $MKIT_TTAG)
     local suffix        # version suffix
     prerl=$(ini 1value project:prerl)
+    case $MKIT_TTAG in
+        none)   btime= ;;
+        btime)  btime=$(date -u +%Y%m%d%H%M%S) ;;
+        ctime)  btime=$(date -d @"$(git_fact latest_cdate)" -u +%Y%m%d%H%M%S) ;;
+    esac
     grep ":" <<<"$prerl" \
      && warn "colon in project:prerl may corrupt version data: $prerl"
     git_present || {
@@ -161,14 +170,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/vars.sh

@@ -55,7 +55,35 @@ MKIT_LOCAL=${MKIT_LOCAL:-.mkit}
 #
 MKIT_PROJ_PKGNAME=""
 
+#
+# Add time-based ordinal tag to SemVer build data?
+#
+# Can be 'none', 'ctime' or 'btime'.
+#
+# If 'ctime', devel builds have also timestamp-based tag in format of
+# `t%Y%m%d%H%M%S`, that is, a small character 't' followed by timestamp
+# without non-digit characters.  The timestamps are in UTC, ie. timezones
+# need not apply.  'btime' has the same format, except that it's derived
+# from build time, while 'ctime' is from last commit's commit date.
+#
+# This helps with deploying development builds where packaging system
+# is not SemVer-compliant and makes it hard to install arbitrary version.
+# For example, old yum version (as of RHEL-6) will not let you install
+# version that it deems older than is installed, making it hard to
+# continually upgrade during active development.  While packaging
+# systems have their own rukes (and SemVer says both versions should be
+# considered same) this tag will make it more likely to "win" the build
+# you made later.
+#
+# Note that this does not affect clean builds (ie. builds from clean
+# repo with HEAD corresponding to latest version tag.).
+#
+# Also note that 'btime' makes the version non-deterministic: merely
+# initiating the build a second later will result in different version.
+#
+MKIT_TTAG=${MKIT_TTAG:-ctime}
+
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.32
+MKIT_VERSION=0.0.35