mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-06 07:15:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'macos' into 'main'

Browse source 
build: Fix build and tests on macOS

See merge request wayland/wayland!508
This commit is contained in:
Martin Lopatář 2026-01-30 14:42:10 +00:00
commit 2b84b27989
16 changed files with 180 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/meson.build
View file

@ -21,8 +21,16 @@ if vers.version_compare('< 2.26.0')
error('Dot (Graphviz) 2.26 or later is required for building documentation, found @0@.'.format(vers))
endif
run_env = environment()
if catalog_path != ''
if not catalog_path.startswith('/')
catalog_path = meson.project_source_root() / catalog_path
endif
run_env.set('XML_CATALOG_FILES', catalog_path)
endif
manpage_xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
cmd = run_command(xsltproc, '--nonet', manpage_xsl, check: false)
cmd = run_command(xsltproc, '--nonet', manpage_xsl, env: run_env, check: false)
if cmd.returncode() != 0
error('The style sheet for man pages providing "@0@" was not found.'.format(manpage_xsl))
endif

8
doc/publican/meson.build
View file

@ -28,6 +28,7 @@ endforeach
publican_inputs += custom_target(
'ProtocolSpec.xml',
command: [ xsltproc, '-o', '@OUTPUT@', proto_to_docboox_xsl, '@INPUT@' ],
env: run_env,
input: wayland_protocol_xml,
output: 'ProtocolSpec.xml'
)
@ -35,6 +36,7 @@ publican_inputs += custom_target(
publican_inputs += custom_target(
'ProtocolInterfaces.xml',
command: [ xsltproc, '-o', '@OUTPUT@', proto_iface_to_docboox_xsl, '@INPUT@' ],
env: run_env,
input: wayland_protocol_xml,
output: 'ProtocolInterfaces.xml'
)
@ -45,6 +47,7 @@ publican_inputs += custom_target(
ClientAPI_combined = custom_target(
'ClientAPI-combine-doxygen-files',
command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT@' ],
env: run_env,
input: [ doxygen_Client_combine_xslt, doxygen_Client_index_xml ],
output: 'ClientAPI-combined.xml'
)
@ -53,6 +56,7 @@ ClientAPI_combined = custom_target(
publican_inputs += custom_target(
'ClientAPI-doxygen-to-docbook',
command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'which', 'Client', to_publican_xsl, '@INPUT@' ],
env: run_env,
input: ClientAPI_combined,
output: 'ClientAPI.xml'
)
@ -60,6 +64,7 @@ publican_inputs += custom_target(
ServerAPI_combined = custom_target(
'ServerAPI-combine-doxygen-files',
command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT@' ],
env: run_env,
input: [ doxygen_Server_combine_xslt, doxygen_Server_index_xml ],
output: 'ServerAPI-combined.xml'
)
@ -67,6 +72,7 @@ ServerAPI_combined = custom_target(
publican_inputs += custom_target(
'ServerAPI-doxygen-to-docbook',
command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'which', 'Server', to_publican_xsl, '@INPUT@' ],
env: run_env,
input: ServerAPI_combined,
output: 'ServerAPI.xml'
)
@ -88,6 +94,7 @@ foreach src : files([
merge_mapcoords_xsl,
'@INPUT@',
],
env: run_env,
input: src,
output: [name],
depends: publican_image_maps,
@ -108,6 +115,7 @@ custom_target(
'html',
'@INPUT0@'
],
env: run_env,
input: publican_inputs,
output: 'html',
build_by_default: true,