Update own dogfood

utils/mkit/include/build.sh

@@ -77,7 +77,8 @@ clean() {
     # Clean up tree after building
     #
     test -f "$MKIT_LOCAL/built.lst" && {
-        <"$MKIT_LOCAL/built.lst" xargs -r rm -f
+        <"$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"
     }
@@ -103,6 +104,36 @@ dist() {
     rm -rf "$dirname"
 }
 
+debstuff() {
+    #
+    # Build Debian stuff (eamed tarball, debian dir)
+    #
+    local version="$(get_version)"
+
+    # tarball - we should already have by means of 'dist'
+    #
+    mv "${MKIT_PROJ_PKGNAME}-$version.tar.gz" \
+       "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" \
+     || die "could not rename tarball"
+    echo "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" >> "$MKIT_LOCAL/built.lst"
+
+    # read content of each mandatory file from debian_skel
+    #
+    local debian_skel=$(ini 1value debstuff:debian_skel)
+    test -n "$debian_skel" || die "debstuff:debian_skel not specified"
+    test -d "$debian_skel" || die "debian directory template found: $debian_skel"
+    mkdir -p debian/source
+    local dfsrc dftgt
+    find "$debian_skel" -type f \
+      | while read dfsrc;
+        do
+            dftgt="debian/${dfsrc#$debian_skel}"
+            mkdir -p "$(dirname "$dftgt")"
+            build1 "$dfsrc" "$dftgt"
+        done
+    echo debian >> "$MKIT_LOCAL/built.lst"
+}
+
 rpmstuff() {
     #
     # Build specfile
@@ -145,20 +176,24 @@ expand_variables() {
     #
     local script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
     local section varname varvalue
-    for section in "$@";
-    do
-        debug_var section
-        ini lskeys "$section" \
-          | while read varname;
-            do
-                varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
-                echo "s|$varname|$varvalue|;" >> "$script"
-                debug_var varname varvalue
-            done
-    done
-    echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|;" >> "$script"
-    echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|;" >> "$script"
-    echo "s|__MKIT_PROJ_VERSION__|$(get_version)|;" >> "$script"
+    {
+        for section in "$@";
+        do
+            debug_var section
+            ini lskeys "$section" \
+              | while read varname;
+                do
+                    varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
+                    echo "s|$varname|$varvalue|;"
+                    debug_var varname varvalue
+                done
+        done
+        echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|;"
+        echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname)|;"
+        echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|;"
+        echo "s|__MKIT_PROJ_VERSION__|$(get_version)|;"
+        echo "s|__MKIT_SELF_VERSION__|$MKIT_VERSION|;"
+    } >> "$script"
     perl -wp "$script" || die "expand_variables failed"
     rm "$script"
 }

utils/mkit/include/mkit.sh

@@ -87,11 +87,35 @@ route() {
     #
     # Call correct function based on $1
     #
-    case $1 in
-        build|build_manpages|clean|dist|rpmstuff|install|release_?|uninstall|vbump_?)
-            $1
-            ;;
-        *)
-            echo "usage: $(basename "$0") build|clean|dist|rpmstuff|install|uninstall" >&2
-    esac
+    if valid_targets | grep -qwx "^$1";
+    then
+        "$1"
+    else
+        {
+            echo "usage: $(basename "$0") TARGET"
+            echo
+            echo "valid targets:"
+            valid_targets | sed 's/^/    /'
+        } >&2
+    fi
+}
+
+valid_targets() {
+    #
+    # List valid routes
+    #
+    echo build
+    echo build_manpages
+    echo clean
+    echo debstuff
+    echo dist
+    echo install
+    echo release_x
+    echo release_y
+    echo release_z
+    echo rpmstuff
+    echo uninstall
+    echo vbump_x
+    echo vbump_y
+    echo vbump_z
 }

utils/mkit/make

@@ -6,7 +6,7 @@ die() {
     echo "$@" && exit 9
 }
 
-export MKIT_VERSION=0.0.8+master.gf95e2e5.dirty
+export MKIT_VERSION=0.0.10+devel.gd450a45
 
 export MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
 export MKIT_LOCAL=${MKIT_LOCAL:-.mkit}

utils/mkit/mkit.mk

@@ -14,6 +14,9 @@ manpages: build
 clean:
 	@$(MKIT_DIR)/make clean
 
+debstuff: dist
+	@$(MKIT_DIR)/make debstuff
+
 dist: clean
 	@$(MKIT_DIR)/make dist