I keep all my changes to WebKit in git branches, but when merging I often get conmflicts in the marshal.list file. It would be nice it this file was autogenerated from source code.
Created attachment 21901 [details] Auto generate webkitmarshal.list This is the same approach used in telepathy related projects and in other sw, so it should be portable everywhere. I also renamed webkit-marshal to webkitmarshal.
Does the sed work with BSD sed? The shell foo is working with dash and zsh? If that is the case I'm willing to say r=me.
I didn't test on BSD as I only have access to linux machines but it should work because we never got any bug reports about that for telepathy-related projects or for avahi-gobject. Nevertheless I would like if someone could test it before committing. Note also that the code in my patch should just use POSIX syntax for portability reasons.
Comment on attachment 21901 [details] Auto generate webkitmarshal.list Okay. The change is reasonable, the sed is a bit hard to follow but looks sane. In case it is broken for BSD sed we can look into a solution. Either detecting GNU sed, or changing the sed.
Comment on attachment 21901 [details] Auto generate webkitmarshal.list Committed in r35455.
Created attachment 22607 [details] Remove marshaller file The now obsolete marshaller file wasn't removed. This patch does just that.
Comment on attachment 22607 [details] Remove marshaller file Looks good to me. This won't show up in the commit queue because it's marked as Fixed. Perhaps this was already commited? If not, please re-open the bug so it will show up in the queue.
(In reply to comment #7) > (From update of attachment 22607 [details] [edit]) > Looks good to me. This won't show up in the commit queue because it's marked > as Fixed. Perhaps this was already commited? If not, please re-open the bug > so it will show up in the queue. > landed in r35525