> On 25/07/18 06:07, Frediano Ziglio wrote:
> > Check we get correctly project version
> > ---
> > meson.build | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index c564941b9..360d1a543 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1,14 +1,17 @@
> > #
> > # project definition
> > #
> > -# TODO: double check meson.project_version()
> > -# Ideally we would use the output of git-version-gen as input for meson,
> > because
> > -# we can not check the result of the command before declaring project().
> > #
> > project('spice', 'c',
> > version : run_command('build-aux/git-version-gen',
> > '.tarball-version').stdout().strip(),
> > license : 'LGPLv2.1',
> > meson_version : '>= 0.47.0')
> > +# double check meson.project_version()
> > +# we can not check the result of the command before declaring project().
> > +version = run_command('build-aux/git-version-gen', '.tarball-version',
> > check : true).stdout().strip()
> > +if meson.project_version() != version
> > + error('Wrong project version')
> > +endif
> >
>
>
> Thinking better about this one, wouldn't it be enough to add 'check :
> true' to the run_command in project definition only, instead of running
> it again?
>
Would... but not work! Meson die really badly if you try...
>
> diff --git a/meson.build b/meson.build
> index c564941b..bc5424cc 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1,12 +1,8 @@
> #
> # project definition
> #
> -# TODO: double check meson.project_version()
> -# Ideally we would use the output of git-version-gen as input for
> meson, because
> -# we can not check the result of the command before declaring project().
> -#
> project('spice', 'c',
> - version : run_command('build-aux/git-version-gen',
> '.tarball-version').stdout().strip(),
> + version : run_command('build-aux/git-version-gen',
> '.tarball-version', check : true).stdout().strip(),
> license : 'LGPLv2.1',
> meson_version : '>= 0.47.0')
>
>
>
>
> > spice_server_so_version = '1.12.4'
> >
> >
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel