Browse Source

Update dogfood

Alois Mahdal 8 years ago
parent
commit
5bba6c61b9
2 changed files with 6 additions and 5 deletions
  1. 5
    4
      utils/mkit/include/release.sh
  2. 1
    1
      utils/mkit/make

+ 5
- 4
utils/mkit/include/release.sh View File

39
         old_c)
39
         old_c)
40
             x=$(__ver_info nextver_g)
40
             x=$(__ver_info nextver_g)
41
             __ver_info currver_c \
41
             __ver_info currver_c \
42
-              | grep -qFx "$x" config.mk \
42
+              | grep -qFx "$x" \
43
              || die "new version not in config.mk: $x"
43
              || die "new version not in config.mk: $x"
44
             ;;
44
             ;;
45
     esac
45
     esac
63
     #
63
     #
64
     local info="$1"
64
     local info="$1"
65
     case "$info" in
65
     case "$info" in
66
-        lastver_g)  __git_info lasttag | sed s/v$// ;;
66
+        lastver_g)  __git_info lasttag | sed s/^v// ;;
67
         nextver_g)  __make_ver "$level" "$(__ver_info lastver_g)" ;;
67
         nextver_g)  __make_ver "$level" "$(__ver_info lastver_g)" ;;
68
-        currver_c)  grep -m 1 -w VERSION config.mk | cut -d = -f 2 | xargs echo ;;
68
+        currver_c)  grep -m 1 -w VERSION config.mk \
69
+                     | sed 's/ *= */=/' | cut -d = -f 2 | xargs echo ;;
69
         nextver_c)  __make_ver "$level" "$(__ver_info currver_c)" ;;
70
         nextver_c)  __make_ver "$level" "$(__ver_info currver_c)" ;;
70
     esac
71
     esac
71
 }
72
 }
118
 __git_msg_vbump() {
119
 __git_msg_vbump() {
119
     echo "Bump version"
120
     echo "Bump version"
120
     echo ""
121
     echo ""
121
-    __git_info reldiff | sed 's/^/ *  '
122
+    __git_info reldiff | sed 's/^/ *  /'
122
 }
123
 }
123
 
124
 
124
 __vbump() {
125
 __vbump() {

+ 1
- 1
utils/mkit/make View File

6
     echo "$@" && exit 9
6
     echo "$@" && exit 9
7
 }
7
 }
8
 
8
 
9
-export MKIT_VERSION=0.0.7
9
+export MKIT_VERSION=0.0.7+master.g8b044c5
10
 
10
 
11
 export MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
11
 export MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
12
 export MKIT_LOCAL=${MKIT_LOCAL:-.mkit}
12
 export MKIT_LOCAL=${MKIT_LOCAL:-.mkit}