[geary] Re-enable reporting git version in Meson dev builds.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Re-enable reporting git version in Meson dev builds.
- Date: Mon, 15 Jan 2018 00:58:02 +0000 (UTC)
commit e8e713962906de0b2857dbb110b3162605a9831c
Author: Michael James Gratton <mike vee net>
Date: Mon Jan 15 11:40:41 2018 +1100
Re-enable reporting git version in Meson dev builds.
src/meson.build | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index ae1a470..3c206b4 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 = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]