Re: [PATCH 3/3] meson: don't install git-pack-redundant(1) docs with breaking changes

From: Patrick Steinhardt <ps@pks.im>
Date: Mar 17, 2025, 13:57 UTC
Message-ID: <Z9gqP3ng0a9Zfpqc@pks.im>
In-Reply-To: <44a3ad4e-fb50-447f-bb66-f43b5c5ae012@gmail.com>

On Sun, Mar 16, 2025 at 03:19:48PM +0000, Phillip Wood wrote:

Show 23 quoted lines

> On 12/03/2025 13:17, Patrick Steinhardt wrote:
> > +manpages_breaking_changes = {
> > +  'git-pack-redundant.adoc' : 1,
> > +}
> > +
> > +if not get_option('breaking_changes')
> > +  manpages += manpages_breaking_changes
> > +endif
> > +
> >   docs_backend = get_option('docs_backend')
> >   if docs_backend == 'auto'
> >     if find_program('asciidoc', dirs: program_path, required: false).found()
> > @@ -479,7 +486,9 @@ endif
> >   # Sanity check that we are not missing any tests present in 't/'. This check
> >   # only runs once at configure time and is thus best-effort, only. Furthermore,
> >   # it only verifies man pages for the sake of simplicity.
> > -configured_manpages = manpages.keys() + [ 'git-bisect-lk2009.adoc', 'git-tools.adoc' ]
> > +configured_manpages = manpages.keys()
> > +configured_manpages += manpages_breaking_changes.keys()
> > +configured_manpages += [ 'git-bisect-lk2009.adoc', 'git-tools.adoc' ]
> 
> I don't think we need this hunk as we add manpages_breaking_changes into
> manpages in the hunk above.

We indeed need it: it's required in case the 'breaking_changes' option is enabled. In that case we still need to have the man pages here in this variable because we use it to check that the manpage is handled at all. Otherwise we would error out because Meson thinks that we forgot to wire up this manpage that we found in the source directory.

Patrick