On Mon, 22 Feb 2016 16:02:23 -0800 Bryce Harrington <br...@osg.samsung.com> wrote:
> On Mon, Feb 22, 2016 at 03:34:45PM +0200, Pekka Paalanen wrote: > > From: Pekka Paalanen <pekka.paala...@collabora.co.uk> > > > > Fix the protostability function to handle stable protocol files > > correctly. Stable protocol XML file names do not have 'stable' in their > > name, nor do we want to write that in the prerequisite lists in the > > Makefile. > > > > Function 'protoname' does not need fixing, because for stable protocol > > prerequisites, the sed pattern will not match, and it passes stem > > through as is, which is correct. > > > > Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> > > --- > > Makefile.am | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Makefile.am b/Makefile.am > > index e365396..505d40a 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -1423,7 +1423,7 @@ doc: $(DOXYGEN_INDICES) > > .SECONDEXPANSION: > > > > define protostability > > -$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/') > > +$(if $(findstring unstable,$1),unstable,stable) > > endef > > So, we were looking for "unstable" or "stable" as distinct words in the > filename, to determine whether to look under /unstable/ or /stable/. > But by policy stable protocols don't have the word "stable" in them, so > simplify the check to just look for 'unstable' anywhere in the protocol > filename and consider anything else to be a stable protocol. > > Could we test for '-unstable-' just to avoid any false positives if we > have some weird protocol (nouns table? pun stab levity?) that happens to > match? OTOH I suppose if someone comes up with a protocol that matches > that, maybe they deserve what they get. ;-) > > Reviewed-by: Bryce Harrington <br...@osg.samsung.com> Pushed: 3f2062c..35552aa master -> master Thanks, pq
pgp8d5DIQhcUL.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
