Bug 19742

Summary:

[GTK] Auto generate webkitmarshal.list

Product:

WebKit

Reporter:

Marco Barisione <marco.barisione>

Component:

WebKitGTK

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Enhancement

Priority:

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Attachments:

Description	Flags
Auto generate webkitmarshal.list	none
Remove marshaller file	eric: review+

Marco Barisione

Reported 2008-06-24 05:55:00 PDT

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.

Attachments
Auto generate webkitmarshal.list (4.21 KB, patch) 2008-06-24 06:02 PDT, Marco Barisione	no flags	Details Formatted Diff Diff
Remove marshaller file (959 bytes, patch) 2008-08-01 12:33 PDT, Christian Dywan	eric: review+	Details Formatted Diff Diff
View All Add attachment proposed patch, testcase, etc.

Marco Barisione

Comment 1 2008-06-24 06:02:53 PDT

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.

Holger Freyther

Comment 2 2008-06-24 08:53:07 PDT

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.

Marco Barisione

Comment 3 2008-06-24 09:04:30 PDT

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.

Holger Freyther

Comment 4 2008-07-17 09:31:47 PDT

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.

Christian Dywan

Comment 5 2008-07-30 11:18:48 PDT

Comment on attachment 21901 [details] Auto generate webkitmarshal.list Committed in r35455.

Christian Dywan

Comment 6 2008-08-01 12:33:27 PDT

Created attachment 22607 [details] Remove marshaller file The now obsolete marshaller file wasn't removed. This patch does just that.

Eric Seidel (no email)

Comment 7 2008-08-02 00:48:24 PDT

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.

Jan Alonzo

Comment 8 2008-08-02 02:40:26 PDT

(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

Note You need to log in before you can comment on or make changes to this bug.