|
@@ -99,7 +99,7 @@ _release() {
|
99
|
99
|
set -e
|
100
|
100
|
debug_var newtag
|
101
|
101
|
$MKIT_DRY && return
|
102
|
|
- git tag -m "$(ini 1value project:name) $newtag - $CODENAME" "$newtag"
|
|
102
|
+ git tag -m "$(_release_msg)" "$newtag"
|
103
|
103
|
|
104
|
104
|
reldst=$(ini 1value project:reldst)
|
105
|
105
|
debug_var reldst
|
|
@@ -109,15 +109,31 @@ _release() {
|
109
|
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
|
129
|
_vbump() {
|
113
|
130
|
local rlevel="$1"
|
114
|
|
- local lastver # current from mkit.ini
|
115
|
131
|
local nextver # after the bump
|
116
|
132
|
_relck git_present
|
117
|
133
|
_relck at_relsrc
|
118
|
134
|
_relck not_dirty
|
119
|
135
|
nextver=$(ini 1value project:version | _bump_version "$rlevel")
|
120
|
|
- debug_var lastver nextver
|
|
136
|
+ debug_var nextver
|
121
|
137
|
$MKIT_DRY && return
|
122
|
138
|
update_version "$nextver" mkit.ini \
|
123
|
139
|
|| die "failed to update version in mkit.ini"
|