On Tue, Sep 25, 2018 at 02:37:55PM -0300, Eduardo Lima (Etrunko) wrote: > This new version ships the fix for the issue where 'check' keyword could > not be used in project definition, so we had to run that command again > only to check if it succeeded. > > https://github.com/mesonbuild/meson/issues/3944 > > Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx> Acked-by: Victor Toso <victortoso@xxxxxxxxxx> > --- > meson.build | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/meson.build b/meson.build > index 875e07f..85f6e78 100644 > --- a/meson.build > +++ b/meson.build > @@ -2,17 +2,9 @@ > # project definition > # > project('spice-gtk', 'c', > - version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version').stdout().strip(), > + version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(), > license : 'LGPLv2.1', > - meson_version : '>= 0.47.0') > - > -# double check meson.project_version() > -# we can not use 'check' keyword in run_command() for git-version-gen above > -# https://github.com/mesonbuild/meson/issues/3944 > -version = run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip() > -if meson.project_version() != version > - error('Wrong project version') > -endif > + meson_version : '>= 0.47.2') > > message('Updating submodules') > run_command('build-aux/meson/check-spice-common', check : true) > -- > 2.17.1 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel