alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Replace meson generator with custom_target

Browse source 
This change mimics the wlroots protocol meson.build. It replaces
meson generators with custom_targets, which will only run wayland-scanner
once per output file.

The idle protocol is not used by any clients, so its client protocol
header is not generated.

The check for the availability of the private-code scanner options has
been removed, since the wlroots dependency requires wayland >= 1.16.
This commit is contained in:
Manuel Stoeckl 2019-06-22 23:02:24 -04:00 committed by Simon Ser
parent a18d1c55ce
commit 5becce8005
1 changed files with 47 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
protocols/meson.build
View file

@ -1,85 +1,79 @@
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner') wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
if wayland_scanner_dep.found()
# should check wayland_scanner's version, but it is hard to get wayland_scanner = find_program(
if wayland_server.version().version_compare('>=1.14.91') wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'),
code_type = 'private-code' native: true,
)
else else
code_type = 'code' wayland_scanner = find_program('wayland-scanner', native: true)
endif endif
wayland_scanner_code = generator( protocols = [
wayland_scanner,
output: '@BASENAME@-protocol.c',
arguments: [code_type, '@INPUT@', '@OUTPUT@'],
)
wayland_scanner_client = generator(
wayland_scanner,
output: '@BASENAME@-client-protocol.h',
arguments: ['client-header', '@INPUT@', '@OUTPUT@'],
)
wayland_scanner_server = generator(
wayland_scanner,
output: '@BASENAME@-protocol.h',
arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
)
client_protocols = [
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
['wlr-layer-shell-unstable-v1.xml'],
['idle.xml'],
['wlr-input-inhibitor-unstable-v1.xml'],
]
server_protocols = [
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
[wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
[wl_protocol_dir, 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml'], [wl_protocol_dir, 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml'],
['wlr-layer-shell-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'],
['idle.xml'],
['wlr-input-inhibitor-unstable-v1.xml'], ['wlr-input-inhibitor-unstable-v1.xml'],
] ]
client_protos_src = [] client_protocols = [
client_protos_headers = [] [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
['wlr-layer-shell-unstable-v1.xml'],
['wlr-input-inhibitor-unstable-v1.xml'],
]
server_protos_src = [] wl_protos_src = []
server_protos_headers = [] wl_protos_headers = []
foreach p : protocols
xml = join_paths(p)
wl_protos_src += custom_target(
xml.underscorify() + '_server_c',
input: xml,
output: '@BASENAME@-protocol.c',
command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
)
wl_protos_headers += custom_target(
xml.underscorify() + '_server_h',
input: xml,
output: '@BASENAME@-protocol.h',
command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
)
endforeach
foreach p : client_protocols foreach p : client_protocols
xml = join_paths(p) xml = join_paths(p)
client_protos_src += wayland_scanner_code.process(xml) wl_protos_headers += custom_target(
client_protos_headers += wayland_scanner_client.process(xml) xml.underscorify() + '_client_h',
endforeach input: xml,
output: '@BASENAME@-client-protocol.h',
foreach p : server_protocols command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
xml = join_paths(p) )
server_protos_src += wayland_scanner_code.process(xml)
server_protos_headers += wayland_scanner_server.process(xml)
endforeach endforeach
lib_client_protos = static_library( lib_client_protos = static_library(
'client_protos', 'client_protos',
client_protos_src + client_protos_headers, wl_protos_src + wl_protos_headers,
dependencies: [wayland_client] dependencies: wayland_client.partial_dependency(compile_args: true),
) # for the include directory )
client_protos = declare_dependency( client_protos = declare_dependency(
link_with: lib_client_protos, link_with: lib_client_protos,
sources: client_protos_headers, sources: wl_protos_headers,
) )
lib_server_protos = static_library( lib_server_protos = static_library(
'server_protos', 'server_protos',
server_protos_src + server_protos_headers, wl_protos_src + wl_protos_headers,
dependencies: [wayland_client] dependencies: wayland_server.partial_dependency(compile_args: true),
) # for the include directory )
server_protos = declare_dependency( server_protos = declare_dependency(
link_with: lib_server_protos, link_with: lib_server_protos,
sources: server_protos_headers, sources: wl_protos_headers,
) )