[Spice-devel] [PATCH spice-gtk 08/12] meson: remove our own submodule update

[Marc-André Lureau]

Hi

On Fri, Feb 15, 2019 at 5:19 PM Frediano Ziglio <fziglio at redhat.com> wrote:
>
> > Hi
> >
> > On Fri, Feb 15, 2019 at 3:57 PM Frediano Ziglio <fziglio at redhat.com> wrote:
> > >
> > > > From: Marc-André Lureau <marcandre.lureau at redhat.com>
> > > >
> > > > Our own handling was limited, since it checked only spice-common.
> > > >
> > > > This is handled by meson since v0.40 for subprojects.
> > > >
> > > > Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
> > > > ---
> > > >  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 29d5fed..c5dc438 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)
> > > > -
> > > >  #
> > > >  # global C defines
> > > >  #
> > >
> > > Without this patch Meson does not sync the submodules automatically.
> >
> >
> > Hmm weird, what error do you get?
> >
> > (obviously it requires "Move src/keycodemapdb ->
> > subprojects/keycodemapdb" before)
> >
>
> If I checkout an old spice-common it does not update it and
> give error that cannot find meson.build.

I don't understand what you are trying to do.

All the build-sys should do wrt submodule handling is initial checkout.

If you modify the submodule later, it shouldn't re-sync it on configure/build.


-- 
Marc-André Lureau