[Spice-commits] meson.build

[GitLab Mirror]

 meson.build |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b18b6e0b0a607130ae2ac1ca29fe208827f4d59c
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Jan 22 10:52:59 2019 +0000

    build-sys: Make git-version-gen work again with Meson
    
    d0cbd9618f0b removed the ability to use git-version-gen to generate
    proper version string.
    Generate .tarball-version file in the distribution file to allow
    building from tarball.
    Do not use MESON_SOURCE_ROOT when calling git-version-gen command as
    this won't be expanded.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/meson.build b/meson.build
index 5f39ff4..8e540c9 100644
--- a/meson.build
+++ b/meson.build
@@ -2,13 +2,15 @@
 # project definition
 #
 project('spice-gtk', 'c',
-         version : '0.36',
+         version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check : true).stdout().strip(),
          license : 'LGPLv2.1',
          meson_version : '>= 0.49')
 
 message('Updating submodules')
 run_command('build-aux/meson/check-spice-common', check : true)
 
+meson.add_dist_script('sh', '-c', 'echo @0@>"$MESON_DIST_ROOT/.tarball-version"'.format(meson.project_version()))
+
 #
 # global C defines
 #