From e8e713962906de0b2857dbb110b3162605a9831c Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Mon, 15 Jan 2018 11:40:41 +1100 Subject: [PATCH] Re-enable reporting git version in Meson dev builds. --- src/meson.build | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index ae1a4703..3c206b49 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,9 +1,21 @@ # Version -geary_version_vala = configure_file( - input: 'geary-version.vala.in', - output: 'geary-version.vala', - configuration: conf, -) + +if meson.project_version().endswith('-dev') + # Development build + geary_version_vala = vcs_tag( + command: '../build-aux/git_version.py', + input: 'geary-version.vala.in', + output: 'geary-version.vala', + replace_string: '@VERSION@' + ) +else + # Release build + geary_version_vala = configure_file( + input: 'geary-version.vala.in', + output: 'geary-version.vala', + configuration: conf, + ) +endif # Common vala options geary_vala_options = [