From b20b81ae32f75869345268801d6995c8f4f471da Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Apr 2022 15:36:18 +0200 Subject: [PATCH] add maj/min package version --- CMakeLists.txt | 6 ++++++ config.h.cmake | 6 ++++++ configure.ac | 2 ++ 3 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32eca74b..5b89c0a3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,12 @@ set(PACKAGE_LOGFILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/${PACKAGE}.log") execute_process(COMMAND echo -n ${VERSION} COMMAND sed "-e" "s/^\\([0-9]*\\.[0-9]*\\).*/\\1/" "-e" "s/\\.\\([0-9]\\)\$/0\\1/" "-e" "s/\\.//" OUTPUT_VARIABLE SCAN_VERSION) +execute_process(COMMAND echo -n ${VERSION} + COMMAND sed "-e" "s/^\\([0-9]*\\.[0-9]*\\).*/\\1/" "-e" "s/^\\([0-9]*\\)\\..*$/\\1/" + OUTPUT_VARIABLE PACKAGE_VERSION_MAJOR) +execute_process(COMMAND echo -n ${VERSION} + COMMAND sed "-e" "s/^\\([0-9]*\\.[0-9]*\\).*/\\1/" "-e" "s/^.*\\.\\([0-9]*\\)$/\\1/" + OUTPUT_VARIABLE PACKAGE_VERSION_MINOR) execute_process(COMMAND git describe --always OUTPUT_VARIABLE REVISION diff --git a/config.h.cmake b/config.h.cmake index 8758cb1d..a5397fd4 100755 --- a/config.h.cmake +++ b/config.h.cmake @@ -60,3 +60,9 @@ /* The version of the package. */ #cmakedefine VERSION "${VERSION}" + +/* The major version of the package. */ +#cmakedefine PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR} + +/* The minor version of the package. */ +#cmakedefine PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR} diff --git a/configure.ac b/configure.ac index d2547140..fe9f68b6 100755 --- a/configure.ac +++ b/configure.ac @@ -135,6 +135,8 @@ AM_COND_IF([CONTRIB], [AC_CONFIG_FILES([ AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, LOCALSTATEDIR "/run/" PACKAGE ".pid", [The path and name of the PID file.]) AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE ".log", [The path and name of the log file.]) AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\.[0-9]*\).*#\1#' -e 's#\.\([0-9]\)$#0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.]) +AC_DEFINE(PACKAGE_VERSION_MAJOR, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])]", [The major version of the package.]) +AC_DEFINE(PACKAGE_VERSION_MINOR, "[m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])]", [The minor version of the package.]) AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision of the package.]) AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], [])