mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/build-meson-technical-and-howto-docs'

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

* pw/build-meson-technical-and-howto-docs:
  meson: fix building technical and howto docs
This commit is contained in:
Junio C Hamano
2025-03-05 10:37:45 -08:00
parent cdf458c60e 87eccc3a81
commit 22fab08fb8
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Documentation/howto/meson.build
View File

@ -1,20 +1,20 @@
howto_sources = [ howto_sources = [
'coordinate-embargoed-releases.txt', 'coordinate-embargoed-releases.adoc',
'keep-canonical-history-correct.txt', 'keep-canonical-history-correct.adoc',
'maintain-git.txt', 'maintain-git.adoc',
'new-command.txt', 'new-command.adoc',
'rebase-from-internal-branch.txt', 'rebase-from-internal-branch.adoc',
'rebuild-from-update-hook.txt', 'rebuild-from-update-hook.adoc',
'recover-corrupted-blob-object.txt', 'recover-corrupted-blob-object.adoc',
'recover-corrupted-object-harder.txt', 'recover-corrupted-object-harder.adoc',
'revert-a-faulty-merge.txt', 'revert-a-faulty-merge.adoc',
'revert-branch-rebase.txt', 'revert-branch-rebase.adoc',
'separating-topic-branches.txt', 'separating-topic-branches.adoc',
'setup-git-server-over-http.txt', 'setup-git-server-over-http.adoc',
'update-hook-example.txt', 'update-hook-example.adoc',
'use-git-daemon.txt', 'use-git-daemon.adoc',
'using-merge-subtree.txt', 'using-merge-subtree.adoc',
'using-signed-tag-in-pull-request.txt', 'using-signed-tag-in-pull-request.adoc',
] ]
howto_index = custom_target( howto_index = custom_target(
@ -26,7 +26,7 @@ howto_index = custom_target(
env: script_environment, env: script_environment,
capture: true, capture: true,
input: howto_sources, input: howto_sources,
output: 'howto-index.txt', output: 'howto-index.adoc',
) )
custom_target( custom_target(

62
Documentation/technical/meson.build
View File

@ -1,37 +1,37 @@
api_docs = [ api_docs = [
'api-error-handling.txt', 'api-error-handling.adoc',
'api-merge.txt', 'api-merge.adoc',
'api-parse-options.txt', 'api-parse-options.adoc',
'api-simple-ipc.txt', 'api-simple-ipc.adoc',
'api-trace2.txt', 'api-trace2.adoc',
] ]
articles = [ articles = [
'bitmap-format.txt', 'bitmap-format.adoc',
'build-systems.txt', 'build-systems.adoc',
'bundle-uri.txt', 'bundle-uri.adoc',
'commit-graph.txt', 'commit-graph.adoc',
'directory-rename-detection.txt', 'directory-rename-detection.adoc',
'hash-function-transition.txt', 'hash-function-transition.adoc',
'long-running-process-protocol.txt', 'long-running-process-protocol.adoc',
'multi-pack-index.txt', 'multi-pack-index.adoc',
'packfile-uri.txt', 'packfile-uri.adoc',
'pack-heuristics.txt', 'pack-heuristics.adoc',
'parallel-checkout.txt', 'parallel-checkout.adoc',
'partial-clone.txt', 'partial-clone.adoc',
'platform-support.txt', 'platform-support.adoc',
'racy-git.txt', 'racy-git.adoc',
'reftable.txt', 'reftable.adoc',
'remembering-renames.txt', 'remembering-renames.adoc',
'repository-version.txt', 'repository-version.adoc',
'rerere.txt', 'rerere.adoc',
'scalar.txt', 'scalar.adoc',
'send-pack-pipeline.txt', 'send-pack-pipeline.adoc',
'shallow.txt', 'shallow.adoc',
'sparse-checkout.txt', 'sparse-checkout.adoc',
'sparse-index.txt', 'sparse-index.adoc',
'trivial-merge.txt', 'trivial-merge.adoc',
'unit-tests.txt', 'unit-tests.adoc',
] ]
api_index = custom_target( api_index = custom_target(
@ -43,7 +43,7 @@ api_index = custom_target(
], ],
env: script_environment, env: script_environment,
input: api_docs, input: api_docs,
output: 'api-index.txt', output: 'api-index.adoc',
) )
custom_target( custom_target(