From eb8dc75d3808c93068df232ddb3afda704cc36bb Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 25 Dec 2021 13:02:05 +0100 Subject: rbutil: Create git version information at build time. Change-Id: Iaf701f4d64d6852423f6a28a753b27abc43477e2 --- utils/rbutilqt/CMakeLists.txt | 2 +- utils/rbutilqt/version.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'utils/rbutilqt') diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt index 138d0903cf..da453c3d11 100644 --- a/utils/rbutilqt/CMakeLists.txt +++ b/utils/rbutilqt/CMakeLists.txt @@ -122,7 +122,7 @@ if(APPLE) PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif() -target_link_libraries(RockboxUtility rbbase cutelogger +target_link_libraries(RockboxUtility rbbase cutelogger gitversion Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia) target_include_directories(RockboxUtility PRIVATE diff --git a/utils/rbutilqt/version.h b/utils/rbutilqt/version.h index b2d24d369b..1a1d78f643 100644 --- a/utils/rbutilqt/version.h +++ b/utils/rbutilqt/version.h @@ -18,6 +18,8 @@ * ****************************************************************************/ +#include "gitversion.h" + // PUREVERSION is needed to be able to just compare versions. It does not // contain a build timestamp because it needs to be the same in different // files @@ -38,7 +40,7 @@ #define VERSIONSTRING(a, b, c) STR(a) "." STR(b) "." STR(c) #define VERSION VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO) BUILDID // PUREVERSION should identify the build uniquely. Use version string for now. -#define PUREVERSION "$Rev$" +#define PUREVERSION GITHASH -#define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__ +#define FULLVERSION VERSION " (" GITHASH "), built " __DATE__ " " __TIME__ -- cgit v1.2.3