meson: fix building technical and howto docs
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> Acked-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Mar 2, 2025 at 16:02 UTC
87eccc3a81d133e636150268c24d2220cad70fe5
2 files changed
+48
-48
Documentation/howto/meson.build
+17
-17
@@ -1,20 +1,20 @@
1
howto_sources = [
2
- 'coordinate-embargoed-releases.txt',
3
- 'keep-canonical-history-correct.txt',
4
- 'maintain-git.txt',
5
- 'new-command.txt',
6
- 'rebase-from-internal-branch.txt',
7
- 'rebuild-from-update-hook.txt',
8
- 'recover-corrupted-blob-object.txt',
9
- 'recover-corrupted-object-harder.txt',
10
- 'revert-a-faulty-merge.txt',
11
- 'revert-branch-rebase.txt',
12
- 'separating-topic-branches.txt',
13
- 'setup-git-server-over-http.txt',
14
- 'update-hook-example.txt',
15
- 'use-git-daemon.txt',
16
- 'using-merge-subtree.txt',
17
- 'using-signed-tag-in-pull-request.txt',
2
+ 'coordinate-embargoed-releases.adoc',
3
+ 'keep-canonical-history-correct.adoc',
4
+ 'maintain-git.adoc',
5
+ 'new-command.adoc',
6
+ 'rebase-from-internal-branch.adoc',
7
+ 'rebuild-from-update-hook.adoc',
8
+ 'recover-corrupted-blob-object.adoc',
9
+ 'recover-corrupted-object-harder.adoc',
10
+ 'revert-a-faulty-merge.adoc',
11
+ 'revert-branch-rebase.adoc',
12
+ 'separating-topic-branches.adoc',
13
+ 'setup-git-server-over-http.adoc',
14
+ 'update-hook-example.adoc',
15
+ 'use-git-daemon.adoc',
16
+ 'using-merge-subtree.adoc',
17
+ 'using-signed-tag-in-pull-request.adoc',
18
]
19
20
howto_index = custom_target(
@@ -26,7 +26,7 @@ howto_index = custom_target(
26
env: script_environment,
27
capture: true,
28
input: howto_sources,
29
- output: 'howto-index.txt',
29
+ output: 'howto-index.adoc',
30
)
31
32
custom_target(
Documentation/technical/meson.build
+31
-31
@@ -1,37 +1,37 @@
1
api_docs = [
2
- 'api-error-handling.txt',
3
- 'api-merge.txt',
4
- 'api-parse-options.txt',
5
- 'api-simple-ipc.txt',
6
- 'api-trace2.txt',
2
+ 'api-error-handling.adoc',
3
+ 'api-merge.adoc',
4
+ 'api-parse-options.adoc',
5
+ 'api-simple-ipc.adoc',
6
+ 'api-trace2.adoc',
7
]
8
9
articles = [
10
- 'bitmap-format.txt',
11
- 'build-systems.txt',
12
- 'bundle-uri.txt',
13
- 'commit-graph.txt',
14
- 'directory-rename-detection.txt',
15
- 'hash-function-transition.txt',
16
- 'long-running-process-protocol.txt',
17
- 'multi-pack-index.txt',
18
- 'packfile-uri.txt',
19
- 'pack-heuristics.txt',
20
- 'parallel-checkout.txt',
21
- 'partial-clone.txt',
22
- 'platform-support.txt',
23
- 'racy-git.txt',
24
- 'reftable.txt',
25
- 'remembering-renames.txt',
26
- 'repository-version.txt',
27
- 'rerere.txt',
28
- 'scalar.txt',
29
- 'send-pack-pipeline.txt',
30
- 'shallow.txt',
31
- 'sparse-checkout.txt',
32
- 'sparse-index.txt',
33
- 'trivial-merge.txt',
34
- 'unit-tests.txt',
10
+ 'bitmap-format.adoc',
11
+ 'build-systems.adoc',
12
+ 'bundle-uri.adoc',
13
+ 'commit-graph.adoc',
14
+ 'directory-rename-detection.adoc',
15
+ 'hash-function-transition.adoc',
16
+ 'long-running-process-protocol.adoc',
17
+ 'multi-pack-index.adoc',
18
+ 'packfile-uri.adoc',
19
+ 'pack-heuristics.adoc',
20
+ 'parallel-checkout.adoc',
21
+ 'partial-clone.adoc',
22
+ 'platform-support.adoc',
23
+ 'racy-git.adoc',
24
+ 'reftable.adoc',
25
+ 'remembering-renames.adoc',
26
+ 'repository-version.adoc',
27
+ 'rerere.adoc',
28
+ 'scalar.adoc',
29
+ 'send-pack-pipeline.adoc',
30
+ 'shallow.adoc',
31
+ 'sparse-checkout.adoc',
32
+ 'sparse-index.adoc',
33
+ 'trivial-merge.adoc',
34
+ 'unit-tests.adoc',
35
]
36
37
api_index = custom_target(
@@ -43,7 +43,7 @@ api_index = custom_target(
43
],
44
env: script_environment,
45
input: api_docs,
46
- output: 'api-index.txt',
46
+ output: 'api-index.adoc',
47
)
48
49
custom_target(