From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH] meson: fix building technical and howto docs
Date: Sun, 02 Mar 2025 16:02:30 +0000 [thread overview]
Message-ID: <pull.1870.git.1740931350451.gitgitgadget@gmail.com> (raw)
From: Phillip Wood <phillip.wood@dunelm.org.uk>
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.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
meson: fix building technical and howto docs
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1870%2Fphillipwood%2Fmeson-doc-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1870/phillipwood/meson-doc-fixes-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1870
Documentation/howto/meson.build | 34 ++++++++--------
Documentation/technical/meson.build | 62 ++++++++++++++---------------
2 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/Documentation/howto/meson.build b/Documentation/howto/meson.build
index c023c104161..961e0533629 100644
--- a/Documentation/howto/meson.build
+++ b/Documentation/howto/meson.build
@@ -1,20 +1,20 @@
howto_sources = [
- 'coordinate-embargoed-releases.txt',
- 'keep-canonical-history-correct.txt',
- 'maintain-git.txt',
- 'new-command.txt',
- 'rebase-from-internal-branch.txt',
- 'rebuild-from-update-hook.txt',
- 'recover-corrupted-blob-object.txt',
- 'recover-corrupted-object-harder.txt',
- 'revert-a-faulty-merge.txt',
- 'revert-branch-rebase.txt',
- 'separating-topic-branches.txt',
- 'setup-git-server-over-http.txt',
- 'update-hook-example.txt',
- 'use-git-daemon.txt',
- 'using-merge-subtree.txt',
- 'using-signed-tag-in-pull-request.txt',
+ 'coordinate-embargoed-releases.adoc',
+ 'keep-canonical-history-correct.adoc',
+ 'maintain-git.adoc',
+ 'new-command.adoc',
+ 'rebase-from-internal-branch.adoc',
+ 'rebuild-from-update-hook.adoc',
+ 'recover-corrupted-blob-object.adoc',
+ 'recover-corrupted-object-harder.adoc',
+ 'revert-a-faulty-merge.adoc',
+ 'revert-branch-rebase.adoc',
+ 'separating-topic-branches.adoc',
+ 'setup-git-server-over-http.adoc',
+ 'update-hook-example.adoc',
+ 'use-git-daemon.adoc',
+ 'using-merge-subtree.adoc',
+ 'using-signed-tag-in-pull-request.adoc',
]
howto_index = custom_target(
@@ -26,7 +26,7 @@ howto_index = custom_target(
env: script_environment,
capture: true,
input: howto_sources,
- output: 'howto-index.txt',
+ output: 'howto-index.adoc',
)
custom_target(
diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build
index 3a65ee59b3c..a13aafcfbb8 100644
--- a/Documentation/technical/meson.build
+++ b/Documentation/technical/meson.build
@@ -1,37 +1,37 @@
api_docs = [
- 'api-error-handling.txt',
- 'api-merge.txt',
- 'api-parse-options.txt',
- 'api-simple-ipc.txt',
- 'api-trace2.txt',
+ 'api-error-handling.adoc',
+ 'api-merge.adoc',
+ 'api-parse-options.adoc',
+ 'api-simple-ipc.adoc',
+ 'api-trace2.adoc',
]
articles = [
- 'bitmap-format.txt',
- 'build-systems.txt',
- 'bundle-uri.txt',
- 'commit-graph.txt',
- 'directory-rename-detection.txt',
- 'hash-function-transition.txt',
- 'long-running-process-protocol.txt',
- 'multi-pack-index.txt',
- 'packfile-uri.txt',
- 'pack-heuristics.txt',
- 'parallel-checkout.txt',
- 'partial-clone.txt',
- 'platform-support.txt',
- 'racy-git.txt',
- 'reftable.txt',
- 'remembering-renames.txt',
- 'repository-version.txt',
- 'rerere.txt',
- 'scalar.txt',
- 'send-pack-pipeline.txt',
- 'shallow.txt',
- 'sparse-checkout.txt',
- 'sparse-index.txt',
- 'trivial-merge.txt',
- 'unit-tests.txt',
+ 'bitmap-format.adoc',
+ 'build-systems.adoc',
+ 'bundle-uri.adoc',
+ 'commit-graph.adoc',
+ 'directory-rename-detection.adoc',
+ 'hash-function-transition.adoc',
+ 'long-running-process-protocol.adoc',
+ 'multi-pack-index.adoc',
+ 'packfile-uri.adoc',
+ 'pack-heuristics.adoc',
+ 'parallel-checkout.adoc',
+ 'partial-clone.adoc',
+ 'platform-support.adoc',
+ 'racy-git.adoc',
+ 'reftable.adoc',
+ 'remembering-renames.adoc',
+ 'repository-version.adoc',
+ 'rerere.adoc',
+ 'scalar.adoc',
+ 'send-pack-pipeline.adoc',
+ 'shallow.adoc',
+ 'sparse-checkout.adoc',
+ 'sparse-index.adoc',
+ 'trivial-merge.adoc',
+ 'unit-tests.adoc',
]
api_index = custom_target(
@@ -43,7 +43,7 @@ api_index = custom_target(
],
env: script_environment,
input: api_docs,
- output: 'api-index.txt',
+ output: 'api-index.adoc',
)
custom_target(
base-commit: 03944513488db4a81fdb4c21c3b515e4cb260b05
--
gitgitgadget
next reply other threads:[~2025-03-02 16:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-02 16:02 Phillip Wood via GitGitGadget [this message]
2025-03-03 10:17 ` [PATCH] meson: fix building technical and howto docs Patrick Steinhardt
2025-03-03 14:32 ` Phillip Wood
2025-03-03 16:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1870.git.1740931350451.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.