diff options
| author | Paweł Krupa <pawel@krupa.net.pl> | 2019-01-04 13:13:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 13:13:19 +0100 |
| commit | 792a0e805454c79732c42caa72bc74aa489129e4 (patch) | |
| tree | 2c7cdcbca8403b283fcfafe21d1aba453005d904 /configure.ac | |
| parent | 8e42b85b44cf1753f09efdf4de5674c7860ee49d (diff) | |
Unify versioning (#5051)
* use 'git describe'
* no need to embed version string anymore
* fallback mechanism for package versioning
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 8458c9eb7f..9ed1e83873 100644 --- a/configure.ac +++ b/configure.ac @@ -4,24 +4,19 @@ # AC_PREREQ(2.60) -define([VERSION_MAJOR], [1]) -define([VERSION_MINOR], [12]) -define([VERSION_FIX], [1]) -define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) - # We do not use m4_esyscmd_s to support older autoconf. -define([VERSION_STRING], m4_esyscmd(git describe 2>/dev/null | sed 's/^v//' | tr -d '\n')) -m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_NUMBER)]) +define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n'])) +define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n'])) +m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)]) AC_INIT([netdata], VERSION_STRING[]) AM_MAINTAINER_MODE([disable]) if test x"$USE_MAINTAINER_MODE" = xyes; then AC_MSG_NOTICE(***************** MAINTAINER MODE *****************) -PACKAGE_BUILT_DATE=$(date '+%d %b %Y') fi -PACKAGE_RPM_VERSION="VERSION_NUMBER" +PACKAGE_RPM_VERSION="VERSION_STRING" AC_SUBST([PACKAGE_RPM_VERSION]) # ----------------------------------------------------------------------------- |