Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8; format=Flowed
Date: Thu, 25 Jan 2024 10:25:19 -0600
Message-Id: <CYNXE6A4IB2S.V1YYOX54IVJ@neon.tech>
Cc: "pgsql-hackers" <pgsql-hackers@postgresql.org>
Subject: Re: make dist using git archive
To: "Peter Eisentraut" <peter@eisentraut.org>
From: "Tristan Partin" <tristan@neon.tech>
References: <40e80f77-a294-4f29-a16f-e21bc7bc75fc@eisentraut.org>
 <CYLI6IZ5RAVR.3RBBF4F3P8MHX@neon.tech>
 <673bbcc2-3e38-44b6-9710-e7c1b2446334@eisentraut.org>
In-Reply-To: <673bbcc2-3e38-44b6-9710-e7c1b2446334@eisentraut.org>
Archived-At: 
 <https://www.postgresql.org/message-id/CYNXE6A4IB2S.V1YYOX54IVJ%40neon.tech>
Precedence: bulk

On Thu Jan 25, 2024 at 10:04 AM CST, Peter Eisentraut wrote:
> On 22.01.24 21:04, Tristan Partin wrote:
> >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 'H=
EAD', '.'],
> >> +=C2=A0 install: false,
> >> +=C2=A0 output: distdir + '.tar.bz2',
> >> +)
> >=20
> > The bz2 target should be wrapped in an `if bzip2.found()`.

The way that this currently works is that you will fail at configure=20
time if bz2 doesn't exist on the system. Meson will try to resolve=20
a .path() method on a NotFoundProgram. You might want to define the bz2=20
target to just call `exit 1` in this case.

if bzip2.found()
  # do your current target
else
  bz2 =3D run_target('tar.bz2', command: ['exit', 1])
endif

This should cause pgdist to appropriately fail at run time when=20
generating the bz2 tarball.

> Well, I think we want the dist step to fail if bzip2 is not there.  At=20
> least that is the current expectation.
>
> >> +alias_target('pgdist', [check_dirty_index, tar_gz, tar_bz2])
> >=20
> > Are you intending for the check_dirty_index target to prohibit the othe=
r=20
> > two targets from running? Currently that is not the case.
>
> Yes, that was the hope, and that's how the make dist variant works.  But=
=20
> I couldn't figure this out with meson.  Also, the above actually also=20
> doesn't work with older meson versions, so I had to comment this out to=
=20
> get CI to work.
>
> > If it is what=20
> > you intend, use a stamp file or something to indicate a relationship.=
=20
> > Alternatively, inline the git diff-index into the other commands. These=
=20
> > might also do better as external scripts. It would reduce duplication=
=20
> > between the autotools and Meson builds.
>
> Yeah, maybe that's a direction.

For what it's worth, I run Meson 1.3, and the behavior of generating the=20
tarballs even though it is a dirty tree still occurred. In the new patch=20
you seem to say it was fixed in 0.60.

--=20
Tristan Partin
Neon (https://neon.tech)