From cd63ba2cc0d32608a0f2f4c7ced6016cde0fc60c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 28 Feb 2018 21:29:38 +1000 Subject: [PATCH] tools: add the git version in the libinput-record output Signed-off-by: Peter Hutterer --- meson.build | 5 +++++ src/libinput-git-version.h.in | 3 +++ tools/libinput-record.c | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 src/libinput-git-version.h.in diff --git a/meson.build b/meson.build index c80f4b79..ba24a6fc 100644 --- a/meson.build +++ b/meson.build @@ -240,6 +240,11 @@ pkgconfig.generate( libraries : lib_libinput ) +vcs_tag(['git', 'describe'], + 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') + # Restore the SELinux context for the libinput.so.a.b.c on install # meson bug https://github.com/mesonbuild/meson/issues/1967 meson.add_install_script('src/libinput-restore-selinux-context.sh', diff --git a/src/libinput-git-version.h.in b/src/libinput-git-version.h.in new file mode 100644 index 00000000..c2d68af9 --- /dev/null +++ b/src/libinput-git-version.h.in @@ -0,0 +1,3 @@ +#pragma once + +#define LIBINPUT_GIT_VERSION "@VCS_TAG@" diff --git a/tools/libinput-record.c b/tools/libinput-record.c index 560ef45c..aaaa6cae 100644 --- a/tools/libinput-record.c +++ b/tools/libinput-record.c @@ -38,6 +38,7 @@ #include "libinput-util.h" #include "libinput-version.h" +#include "libinput-git-version.h" static const int FILE_VERSION_NUMBER = 1; @@ -278,6 +279,7 @@ print_libinput_header(struct record_context *ctx) iprintf(ctx, "libinput:\n"); indent_push(ctx); iprintf(ctx, "version: \"%s\"\n", LIBINPUT_VERSION); + iprintf(ctx, "git: \"%s\"\n", LIBINPUT_GIT_VERSION); if (ctx->timeout > 0) iprintf(ctx, "autorestart: %d\n", ctx->timeout); indent_pop(ctx);