Horton

Thread

Commits

  1. Add meson.build to version_stamp.pl

  1. Add meson.build to version_stamp.pl

    Peter Eisentraut <peter.eisentraut@enterprisedb.com> — 2022-10-05T08:34:44Z

    Thinking ahead a bit, we need to add meson.build to version_stamp.pl.

Maybe someone can think of a better sed expression, but this one seems 
good enough to me for now.

  2. Re: Add meson.build to version_stamp.pl

    Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> — 2022-10-05T10:36:36Z

    Peter Eisentraut <peter.eisentraut@enterprisedb.com> writes:

> Thinking ahead a bit, we need to add meson.build to version_stamp.pl.
>
> Maybe someone can think of a better sed expression, but this one seems
> good enough to me for now.
[…]
> +sed_file("meson.build",
> +	qq{-e "1,20s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}
> +);

I think it would be better to not rely on the line numbers, but instead
limit it to the project() stanza, something like this:

sed_file("meson.build",
	qq{-e "/^project(/,/^)/ s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}
);

- ilmari

  3. Re: Add meson.build to version_stamp.pl

    Andres Freund <andres@anarazel.de> — 2022-10-05T18:20:50Z

    Hi,

On 2022-10-05 11:36:36 +0100, Dagfinn Ilmari Mannsåker wrote:
> Peter Eisentraut <peter.eisentraut@enterprisedb.com> writes:
> 
> > Thinking ahead a bit, we need to add meson.build to version_stamp.pl.

Good idea.  I was wondering for a moment whether we should put the version
into some file instead, and reference that from meson.build - but the
convenient way to do that is only in 0.56, which we currently don't want to
require...  We could work around it, but it doesn't seem necessary for now.


> > Maybe someone can think of a better sed expression, but this one seems
> > good enough to me for now.
> […]
> > +sed_file("meson.build",
> > +	qq{-e "1,20s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}
> > +);
> 
> I think it would be better to not rely on the line numbers, but instead
> limit it to the project() stanza, something like this:

> sed_file("meson.build",
> 	qq{-e "/^project(/,/^)/ s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}
> );

Yea, that looks nicer.

Greetings,

Andres Freund

  4. Re: Add meson.build to version_stamp.pl

    Michael Paquier <michael@paquier.xyz> — 2022-10-06T00:31:11Z

    On Wed, Oct 05, 2022 at 11:20:50AM -0700, Andres Freund wrote:
> On 2022-10-05 11:36:36 +0100, Dagfinn Ilmari Mannsåker wrote:
>> sed_file("meson.build",
>> 	qq{-e "/^project(/,/^)/ s/ version: '[0-9a-z.]*',/ version: '$fullversion',/"}
>> );
> 
> Yea, that looks nicer.

Oh.  That's nice..
--
Michael