mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 03:04:18 +00:00
release: remove "nano" version
Now that NM is >= 1.0 there is no need for a "nano" version.
This commit is contained in:
parent
fa6a9e9dbf
commit
471375a3e1
|
@ -4,9 +4,8 @@ dnl The NM version number
|
|||
m4_define([nm_major_version], [1])
|
||||
m4_define([nm_minor_version], [1])
|
||||
m4_define([nm_micro_version], [0])
|
||||
m4_define([nm_nano_version], [0])
|
||||
m4_define([nm_version],
|
||||
[nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version])
|
||||
[nm_major_version.nm_minor_version.nm_micro_version])
|
||||
m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
|
||||
|
||||
AC_INIT([NetworkManager], [nm_version],
|
||||
|
|
|
@ -24,14 +24,14 @@ abs_path() {
|
|||
}
|
||||
|
||||
get_version() {
|
||||
local major minor micro nano
|
||||
local major minor micro
|
||||
local F="${1:-"$GITDIR/configure.ac"}"
|
||||
|
||||
vars="$(sed -n 's/^m4_define(\[nm_\(major\|minor\|micro\|nano\)_version\], *\[\([0-9]\+\)\]) *$/local \1='\''\2'\''/p' "$F" 2>/dev/null)"
|
||||
vars="$(sed -n 's/^m4_define(\[nm_\(major\|minor\|micro\)_version\], *\[\([0-9]\+\)\]) *$/local \1='\''\2'\''/p' "$F" 2>/dev/null)"
|
||||
eval "$vars"
|
||||
|
||||
[[ -n "$major" && -n "$minor" && "$micro" && "$nano" ]] || return 1
|
||||
echo "$major.$minor.$micro.$nano"
|
||||
[[ -n "$major" && -n "$minor" && "$micro" ]] || return 1
|
||||
echo "$major.$minor.$micro"
|
||||
}
|
||||
|
||||
write_changelog() {
|
||||
|
|
Loading…
Reference in a new issue