[Spice-devel] [PATCH spice-server 1/3] fixup! Update gitlab-ci to use meson

Frediano Ziglio fziglio at redhat.com
Wed Jul 25 09:07:34 UTC 2018


Check we get correctly project version
---
 meson.build | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index c564941b9..360d1a543 100644
--- a/meson.build
+++ b/meson.build
@@ -1,14 +1,17 @@
 #
 # project definition
 #
-# TODO: double check meson.project_version()
-# Ideally we would use the output of git-version-gen as input for meson, because
-# we can not check the result of the command before declaring project().
 #
 project('spice', 'c',
          version : run_command('build-aux/git-version-gen', '.tarball-version').stdout().strip(),
          license : 'LGPLv2.1',
          meson_version : '>= 0.47.0')
+# double check meson.project_version()
+# we can not check the result of the command before declaring project().
+version = run_command('build-aux/git-version-gen', '.tarball-version', check : true).stdout().strip()
+if meson.project_version() != version
+  error('Wrong project version')
+endif
 
 spice_server_so_version = '1.12.4'
 
-- 
2.17.1



More information about the Spice-devel mailing list