[Spice-devel] [PATCH spice-gtk 4/4] ci: Try Meson dist

Frediano Ziglio fziglio at redhat.com
Mon Jul 8 13:10:00 UTC 2019


> 
> On 5/20/19 10:39 AM, Frediano Ziglio wrote:
> > Make sure Meson is able to generate a correct tarball.
> > 
> > Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> > ---
> >   .gitlab-ci.yml | 6 ++++++
> >   1 file changed, 6 insertions(+)
> > 
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index a6cb2cda..5ddb4db8 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -82,6 +82,12 @@ fedora-meson:
> >   
> >     script:
> >       - meson --buildtype=release build-default
> > +    # Meson does not update submodules recursively
> 
> Autotools do not do that either, it's done in the autogen.sh script
> 

But Meson is supposed to deal with submodules, Autotools has nothing
to do with the repositories, it's quite a different mindset.

> > +    - git submodule update --init --recursive
> > +    # this fix an issue with Meson dist
> > +    - if ! test -r ../spice-common.git; then DIR=`basename "$PWD"`; ln -s
> > "$DIR/.git/modules/spice-common" ../spice-common.git; fi
> 
> That's weird. It does work for me locally.

Maybe you already have the link. Or they fixed the issue on a later version.

> It is expected that ../spice-common.git would be relative to 'origin'.
> 

What do you mean? ../spice-common.git is a directory link and origin
is a branch.

> > +    - rm -rf meson-dist
> > +    - ninja -C build-default dist
> 
> Note, that the generated tarball does not contain a configure script.
> This is probably expected as autotools are not used, but I wanted
> to emphasize that the two tarballs are different.
> 
> Uri.
> 

Yes, Meson "dist" is not powerful enough to generated such a tarball
and a manual script would be quite an hack.

> >       - ninja -C build-default
> >       - ninja -C build-default test
> >   
> > 
> 
> 

Frediano


More information about the Spice-devel mailing list