Browse Source

Update own dogfood

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

+ 2
- 3
utils/mkit/include/release.sh View File

99
     set -e
99
     set -e
100
     debug_var newtag
100
     debug_var newtag
101
     $MKIT_DRY && return
101
     $MKIT_DRY && return
102
-    git tag -m "$(ini 1value project:name) $newtag - $CODENAME" "$newtag"
102
+    git tag -m "$(ini 1value project:name) $newtag - $(ini 1value project:codename)" "$newtag"
103
 
103
 
104
     reldst=$(ini 1value project:reldst)
104
     reldst=$(ini 1value project:reldst)
105
     debug_var reldst
105
     debug_var reldst
111
 
111
 
112
 _vbump() {
112
 _vbump() {
113
     local rlevel="$1"
113
     local rlevel="$1"
114
-    local lastver   # current from mkit.ini
115
     local nextver   # after the bump
114
     local nextver   # after the bump
116
     _relck git_present
115
     _relck git_present
117
     _relck at_relsrc
116
     _relck at_relsrc
118
     _relck not_dirty
117
     _relck not_dirty
119
     nextver=$(ini 1value project:version | _bump_version "$rlevel")
118
     nextver=$(ini 1value project:version | _bump_version "$rlevel")
120
-    debug_var lastver nextver
119
+    debug_var nextver
121
     $MKIT_DRY && return
120
     $MKIT_DRY && return
122
     update_version "$nextver" mkit.ini \
121
     update_version "$nextver" mkit.ini \
123
       || die "failed to update version in mkit.ini"
122
       || die "failed to update version in mkit.ini"

+ 1
- 1
utils/mkit/make View File

66
 #
66
 #
67
 # This MKit version
67
 # This MKit version
68
 #
68
 #
69
-MKIT_VERSION=0.0.14+devel.g1630a27
69
+MKIT_VERSION=0.0.15+devel.g1364fa1
70
 
70
 
71
 
71
 
72
 . "$MKIT_DIR/include/mkit.sh" || die "failed to init; check if MKIT_DIR is set properly: $MKIT_DIR"
72
 . "$MKIT_DIR/include/mkit.sh" || die "failed to init; check if MKIT_DIR is set properly: $MKIT_DIR"