[Spice-commits] server/meson.build

[GitLab Mirror]

 server/meson.build |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 2d971c6ec050d339368229977799b34ccff33117
Author: Kevin Pouget <kpouget at redhat.com>
Date:   Tue May 19 09:17:03 2020 +0200

    server/meson.build: fix bug when project version is unknown
    
    When `build-aux/git-version-gen` is not able to find the project
    version (no git tags and no `.tarball-version`), it returns 'UNKNOWN'
    (instead of the project version like `0.14.3.185-15b1`).
    
    This `UNKNOWN` value fails `meson build` command:
    
        server/meson.build:8:0: ERROR: Index 1 out of bounds of array of size 1.
    
    With this patch, we set a default major/minor/micro value when the
    actual version is unknown. This is the same as the `autoconf`
    historical behavior.
    
    Fixes #41.
    
    Signed-off-by: Kevin Pouget <kpouget at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/meson.build b/server/meson.build
index 1df43bbc..acb85f2f 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -3,14 +3,21 @@ spice_server_include += [include_directories('.')]
 #
 # generate spice-version.h
 #
-version_info = meson.project_version().split('.')
-major = '@0@'.format(version_info[0])
-minor = '@0@'.format(version_info[1])
-micro = version_info[2].to_int()
-if not version_info.contains('git')
-  micro += 1
+if meson.project_version().startswith('UNKNOWN')
+  major = '0'
+  minor = '0'
+  micro = '1'
+else
+  version_info = meson.project_version().split('.')
+  major = '@0@'.format(version_info[0])
+  minor = '@0@'.format(version_info[1])
+  micro = version_info[2].to_int()
+  if not version_info.contains('git')
+    micro += 1
+  endif
+  micro = '@0@'.format(micro)
 endif
-micro = '@0@'.format(micro)
+
 cmd = run_command('printf', ['0x%02x%02x%02x', major, minor, micro], check : true)
 version_data = configuration_data()
 version_data.set('SPICE_SERVER_VERSION', cmd.stdout().strip())