brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Use / operator instead of format for Wayland protocol paths

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2985>
This commit is contained in:
Jonas Ådahl 2023-05-04 13:55:11 +02:00 committed by Marge Bot
parent 61b42e5303
commit 8a4095308e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/meson.build
View File

@ -1055,15 +1055,11 @@ if have_wayland
if protocol_type == 'stable' if protocol_type == 'stable'
output_base = protocol_name output_base = protocol_name
input = protocols_dir / '@0@/@1@/@2@.xml'.format(protocol_type, input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base)
protocol_name,
output_base)
elif protocol_type == 'staging' elif protocol_type == 'staging'
protocol_version = p.get(2) protocol_version = p.get(2)
output_base = '@0@-@1@'.format(protocol_name, protocol_version) output_base = '@0@-@1@'.format(protocol_name, protocol_version)
input = protocols_dir / '@0@/@1@/@2@.xml'.format(protocol_type, input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base)
protocol_name,
output_base)
elif protocol_type == 'private' elif protocol_type == 'private'
output_base = protocol_name output_base = protocol_name
input = 'wayland/protocol/@0@.xml'.format(protocol_name) input = 'wayland/protocol/@0@.xml'.format(protocol_name)
@ -1076,9 +1072,7 @@ if have_wayland
output_base = '@0@-@1@-@2@'.format(protocol_name, output_base = '@0@-@1@-@2@'.format(protocol_name,
protocol_type, protocol_type,
protocol_version) protocol_version)
input = protocols_dir / '@0@/@1@/@2@.xml'.format(protocol_type, input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base)
protocol_name,
output_base)
endif endif
server_header = custom_target('@0@ server header'.format(output_base), server_header = custom_target('@0@ server header'.format(output_base),