Browse Source

Update own dogfood

Alois Mahdal 8 years ago
parent
commit
bffaef242c
3 changed files with 20 additions and 3 deletions
  1. 1
    1
      utils/mkit/include/build.sh
  2. 18
    1
      utils/mkit/include/release.sh
  3. 1
    1
      utils/mkit/make

+ 1
- 1
utils/mkit/include/build.sh View File

115
     # Add meat to all skeletons
115
     # Add meat to all skeletons
116
     #
116
     #
117
     local srcpath
117
     local srcpath
118
-    find src -type f -name '*.skel' \
118
+    find -type f -name '*.skel' \
119
      | while read srcpath;
119
      | while read srcpath;
120
        do
120
        do
121
            _build1 "$srcpath"
121
            _build1 "$srcpath"

+ 18
- 1
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 - $(ini 1value project:codename)" "$newtag"
102
+    git tag -m "$(_release_msg)" "$newtag"
103
 
103
 
104
     reldst=$(ini 1value project:reldst)
104
     reldst=$(ini 1value project:reldst)
105
     debug_var reldst
105
     debug_var reldst
109
     fi
109
     fi
110
 }
110
 }
111
 
111
 
112
+_release_msg() {
113
+    #
114
+    # Generate message for annotated tag
115
+    #
116
+    # The last commit before issuing a release must be "Bump version" commit
117
+    # suggested by _vbump_gitmsg() and  manually edited by user.  Since the
118
+    # commit contains changelog, this function just uses the message body.
119
+    #
120
+    # The sort message (first line) is replaced with a nicer one (with project
121
+    # name, codename and version).
122
+    #
123
+    echo "$(ini 1value project:name) $newtag - $(ini 1value project:codename)"
124
+    echo
125
+    git show -s --format=%B \
126
+      | tail -n +3
127
+}
128
+
112
 _vbump() {
129
 _vbump() {
113
     local rlevel="$1"
130
     local rlevel="$1"
114
     local nextver   # after the bump
131
     local nextver   # after the bump

+ 1
- 1
utils/mkit/make View File

66
 #
66
 #
67
 # This MKit version
67
 # This MKit version
68
 #
68
 #
69
-MKIT_VERSION=0.0.15+devel.g1364fa1
69
+MKIT_VERSION=0.0.17+devel.g99ff8e5
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"