Skip to content

Conversation

phillipwood
Copy link

@phillipwood phillipwood commented Mar 2, 2025

Cc: Patrick Steinhardt [email protected]
Cc: Junio C Hamano [email protected]
cc: Phillip Wood [email protected]

When our asciidoc files were renamed from "*.txt" to "*.adoc" in
1f010d6 (doc: use .adoc extension for AsciiDoc files, 2025-01-20)
the "meson.build" file in "Documentation" was updated but the
"meson.build" files in the "technical" and "howto" subdirectories were
not. This causes the meson build to fail when configured with
-Ddocs=html. Fix this by updating the relevant "meson.build" files.

Signed-off-by: Phillip Wood <[email protected]>
@phillipwood
Copy link
Author

/submit

Copy link

gitgitgadget bot commented Mar 2, 2025

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1870/phillipwood/meson-doc-fixes-v1

To fetch this version to local tag pr-1870/phillipwood/meson-doc-fixes-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1870/phillipwood/meson-doc-fixes-v1

Copy link

gitgitgadget bot commented Mar 3, 2025

On the Git mailing list, Patrick Steinhardt wrote (reply to this):

On Sun, Mar 02, 2025 at 04:02:30PM +0000, Phillip Wood via GitGitGadget wrote:
> From: Phillip Wood <[email protected]>
> 
> When our asciidoc files were renamed from "*.txt" to "*.adoc" in
> 1f010d6bdf7 (doc: use .adoc extension for AsciiDoc files, 2025-01-20)
> the "meson.build" file in "Documentation" was updated but the
> "meson.build" files in the "technical" and "howto" subdirectories were
> not. This causes the meson build to fail when configured with
> -Ddocs=html. Fix this by updating the relevant "meson.build" files.

Good catch, thanks! I wonder: do we maybe also want to start building
documentation with Meson so that we would catch issues like this
earlier?

In any case, I'm happy to defer that to a later point and for now only
land the fix.

Patrick

Copy link

gitgitgadget bot commented Mar 3, 2025

On the Git mailing list, Phillip Wood wrote (reply to this):

Hi Patrick

On 03/03/2025 10:17, Patrick Steinhardt wrote:
> On Sun, Mar 02, 2025 at 04:02:30PM +0000, Phillip Wood via GitGitGadget wrote:
>> From: Phillip Wood <[email protected]>
>>
>> When our asciidoc files were renamed from "*.txt" to "*.adoc" in
>> 1f010d6bdf7 (doc: use .adoc extension for AsciiDoc files, 2025-01-20)
>> the "meson.build" file in "Documentation" was updated but the
>> "meson.build" files in the "technical" and "howto" subdirectories were
>> not. This causes the meson build to fail when configured with
>> -Ddocs=html. Fix this by updating the relevant "meson.build" files.
> > Good catch, thanks! I wonder: do we maybe also want to start building
> documentation with Meson so that we would catch issues like this
> earlier?

I think that would be a good idea.

> In any case, I'm happy to defer that to a later point and for now only
> land the fix.

Yes, I was hoping this minimal fix would be acceptable for inclusion in the upcoming release. We can change the CI once that's out the door.

Best Wishes

Phillip


> Patrick

Copy link

gitgitgadget bot commented Mar 3, 2025

User Phillip Wood <[email protected]> has been added to the cc: list.

Copy link

gitgitgadget bot commented Mar 3, 2025

On the Git mailing list, Junio C Hamano wrote (reply to this):

Phillip Wood <[email protected]> writes:

> Yes, I was hoping this minimal fix would be acceptable for inclusion
> in the upcoming release. We can change the CI once that's out the
> door.

Thanks, both.  Will queue.

Copy link

gitgitgadget bot commented Mar 3, 2025

This patch series was integrated into seen via git@335411b.

@gitgitgadget gitgitgadget bot added the seen label Mar 3, 2025
Copy link

gitgitgadget bot commented Mar 3, 2025

This patch series was integrated into seen via git@4fe584f.

Copy link

gitgitgadget bot commented Mar 4, 2025

This branch is now known as pw/build-meson-technical-and-howto-docs.

Copy link

gitgitgadget bot commented Mar 4, 2025

This patch series was integrated into seen via git@0643a34.

Copy link

gitgitgadget bot commented Mar 4, 2025

This patch series was integrated into next via git@fd3038f.

@gitgitgadget gitgitgadget bot added the next label Mar 4, 2025
Copy link

gitgitgadget bot commented Mar 4, 2025

There was a status update in the "New Topics" section about the branch pw/build-meson-technical-and-howto-docs on the Git mailing list:

Meson-based build procedure forgot to build some docs, which has
been corrected.

Will merge to 'master'.
source: <[email protected]>

Copy link

gitgitgadget bot commented Mar 4, 2025

There was a status update in the "New Topics" section about the branch pw/build-meson-technical-and-howto-docs on the Git mailing list:

Meson-based build procedure forgot to build some docs, which has
been corrected.

Will merge to 'master'.
source: <[email protected]>

Copy link

gitgitgadget bot commented Mar 4, 2025

This patch series was integrated into seen via git@cf0d9e6.

Copy link

gitgitgadget bot commented Mar 5, 2025

This patch series was integrated into seen via git@22fab08.

Copy link

gitgitgadget bot commented Mar 5, 2025

This patch series was integrated into master via git@22fab08.

Copy link

gitgitgadget bot commented Mar 5, 2025

This patch series was integrated into next via git@22fab08.

@gitgitgadget gitgitgadget bot added the master label Mar 5, 2025
@gitgitgadget gitgitgadget bot closed this Mar 5, 2025
Copy link

gitgitgadget bot commented Mar 5, 2025

Closed via 22fab08.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant