[Spice-devel] [PATCH] build-sys: remove meson/check-spice-common

Frediano Ziglio fziglio at redhat.com
Tue Feb 19 15:13:36 UTC 2019


> 
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
> 
> This is not necessary, as meson already checks out the git submodules.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>

But Meson do this only once while current code to it every time.
It can work for me, if you need to work on some different branch you
can do a checkout and git submodules update.
I think, like autogen script, it would be good to do automatically
an update when Meson is called to generate (not update!) the build
files again.

If nobody complain I'll ack and merge in a week.

> ---
>  build-aux/meson/check-spice-common | 5 -----
>  meson.build                        | 3 ---
>  2 files changed, 8 deletions(-)
>  delete mode 100755 build-aux/meson/check-spice-common
> 
> diff --git a/build-aux/meson/check-spice-common
> b/build-aux/meson/check-spice-common
> deleted file mode 100755
> index a0d03a6..0000000
> --- a/build-aux/meson/check-spice-common
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#!/bin/sh
> -set -e
> -if git ls-files --error-unmatch
> ${MESON_SOURCE_ROOT}/subprojects/spice-common > /dev/null 2>&1; then
> -    git --git-dir="${MESON_SOURCE_ROOT}/.git" submodule update --init
> --recursive
> -fi
> diff --git a/meson.build b/meson.build
> index c015de7..197789a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -6,9 +6,6 @@ project('spice-gtk', 'c',
>           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()))
>  
>  #

Frediano


More information about the Spice-devel mailing list