[Spice-commits] meson.build src/meson.build

[GitLab Mirror]

 meson.build     |    2 +-
 src/meson.build |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d0cbd9618f0b952e2a7cb2cbc9ec98e22bf4b95d
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Wed Jan 16 17:20:58 2019 +0400

    meson: fix ninja dist, and building from tarball
    
    meson doesn't handle git-version-gen correctly yet (see
    meson#688). Let's set the version manually for now.
    
    And a tag version vX.X will also fail to build, version_info[2]
    is out of array bounds.
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/meson.build b/meson.build
index d7062af..70dd318 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
 # project definition
 #
 project('spice-gtk', 'c',
-         version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
+         version : '0.36',
          license : 'LGPLv2.1',
          meson_version : '>= 0.49')
 
diff --git a/src/meson.build b/src/meson.build
index d9614cb..c55db44 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,9 +8,9 @@ spice_gtk_include += [include_directories('.')]
 version_info = meson.project_version().split('.')
 major = '@0@'.format(version_info[0])
 minor = '@0@'.format(version_info[1])
-micro = version_info[2].split('-')[0]
-if micro == ''
-  micro = '0'
+micro = '0'
+if version_info.length() > 2
+  micro = version_info[2].split('-')[0]
 endif
 version_data = configuration_data()
 version_data.set('SPICE_GTK_MAJOR_VERSION', major)