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

meson: consistently use custom program paths to resolve programs

Browse Source 
The calls to `find_program()` in our documentation don't use our custom
program path. This variable gets populated on Windows with the location
of Git for Windows so that we can use it to provide our build tools.
Consequently, we may not be able to find all necessary binaries on
Windows.

Adapt the calls to use the program path to fix this. While at it, drop
`required: true` arguments, which are the default anyway.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-02-26 09:22:22 +01:00
committed by Junio C Hamano
parent 3ee3a6eb52
commit 2c374ea4bb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/meson.build
View File

@ -206,9 +206,9 @@ manpages = {
docs_backend = get_option('docs_backend')
if docs_backend == 'auto'
if find_program('asciidoc', required: false).found()
if find_program('asciidoc', dirs: program_path, required: false).found()
docs_backend = 'asciidoc'
elif find_program('asciidoctor', required: false).found()
elif find_program('asciidoctor', dirs: program_path, required: false).found()
docs_backend = 'asciidoctor'
else
error('Neither asciidoc nor asciidoctor were found.')
@ -216,7 +216,7 @@ if docs_backend == 'auto'
endif
if docs_backend == 'asciidoc'
asciidoc = find_program('asciidoc', required: true)
asciidoc = find_program('asciidoc', dirs: program_path)
asciidoc_html = 'xhtml11'
asciidoc_docbook = 'docbook'
xmlto_extra = [ ]
@ -245,7 +245,7 @@ if docs_backend == 'asciidoc'
asciidoc_conf,
]
elif docs_backend == 'asciidoctor'
asciidoctor = find_program('asciidoctor', required: true)
asciidoctor = find_program('asciidoctor', dirs: program_path)
asciidoc_html = 'xhtml5'
asciidoc_docbook = 'docbook5'
xmlto_extra = [
@ -283,7 +283,7 @@ elif docs_backend == 'asciidoctor'
]
endif
xmlto = find_program('xmlto')
xmlto = find_program('xmlto', dirs: program_path)
cmd_lists = [
'cmds-ancillaryinterrogators.txt',
@ -404,7 +404,7 @@ if get_option('docs').contains('html')
pointing_to: 'git.html',
)
xsltproc = find_program('xsltproc')
xsltproc = find_program('xsltproc', dirs: program_path)
user_manual_xml = custom_target(
command: asciidoc_common_options + [