build: Separate unstable and version for wayland-protocols

We want to support staging protocols which have a version too, so don't
assume that anything versioned is unstable.

Signed-off-by: Daniel Stone <daniels@collabora.com>
dev
Daniel Stone 3 years ago committed by Marius Vlad
parent 9358706743
commit 0dcd000b3a
  1. 26
      protocol/meson.build

@ -15,19 +15,19 @@ install_data(
) )
generated_protocols = [ generated_protocols = [
[ 'input-method', 'v1' ], [ 'input-method', 'unstable', 'v1' ],
[ 'input-timestamps', 'v1' ], [ 'input-timestamps', 'unstable', 'v1' ],
[ 'ivi-application', 'internal' ], [ 'ivi-application', 'internal' ],
[ 'ivi-hmi-controller', 'internal' ], [ 'ivi-hmi-controller', 'internal' ],
[ 'fullscreen-shell', 'v1' ], [ 'fullscreen-shell', 'unstable', 'v1' ],
[ 'linux-dmabuf', 'v1' ], [ 'linux-dmabuf', 'unstable', 'v1' ],
[ 'linux-explicit-synchronization', 'v1' ], [ 'linux-explicit-synchronization', 'unstable', 'v1' ],
[ 'presentation-time', 'stable' ], [ 'presentation-time', 'stable' ],
[ 'pointer-constraints', 'v1' ], [ 'pointer-constraints', 'unstable', 'v1' ],
[ 'relative-pointer', 'v1' ], [ 'relative-pointer', 'unstable', 'v1' ],
[ 'tablet', 'v2' ], [ 'tablet', 'unstable', 'v2' ],
[ 'text-cursor-position', 'internal' ], [ 'text-cursor-position', 'internal' ],
[ 'text-input', 'v1' ], [ 'text-input', 'unstable', 'v1' ],
[ 'viewporter', 'stable' ], [ 'viewporter', 'stable' ],
[ 'weston-debug', 'internal' ], [ 'weston-debug', 'internal' ],
[ 'weston-desktop-shell', 'internal' ], [ 'weston-desktop-shell', 'internal' ],
@ -36,8 +36,8 @@ generated_protocols = [
[ 'weston-test', 'internal' ], [ 'weston-test', 'internal' ],
[ 'weston-touch-calibration', 'internal' ], [ 'weston-touch-calibration', 'internal' ],
[ 'weston-direct-display', 'internal' ], [ 'weston-direct-display', 'internal' ],
[ 'xdg-output', 'v1' ], [ 'xdg-output', 'unstable', 'v1' ],
[ 'xdg-shell', 'v6' ], [ 'xdg-shell', 'unstable', 'v6' ],
[ 'xdg-shell', 'stable' ], [ 'xdg-shell', 'stable' ],
] ]
@ -49,8 +49,8 @@ foreach proto: generated_protocols
elif proto[1] == 'stable' elif proto[1] == 'stable'
base_file = proto_name base_file = proto_name
xml_path = '@0@/stable/@1@/@1@.xml'.format(dir_wp_base, base_file) xml_path = '@0@/stable/@1@/@1@.xml'.format(dir_wp_base, base_file)
else elif proto[1] == 'unstable'
base_file = '@0@-unstable-@1@'.format(proto_name, proto[1]) base_file = '@0@-unstable-@1@'.format(proto_name, proto[2])
xml_path = '@0@/unstable/@1@/@2@.xml'.format(dir_wp_base, proto_name, base_file) xml_path = '@0@/unstable/@1@/@2@.xml'.format(dir_wp_base, proto_name, base_file)
endif endif

Loading…
Cancel
Save