Bug 44812 – [chromium] Move more common settings to webcore_prerequisites

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Marc-Antoine Ruel]

Move more common settings to webcore_prerequisites

Original code review at http://codereview.chromium.org/3223009

[Marc-Antoine Ruel]

Created attachment 65805 [details]
webcore.gyp patch

[Marc-Antoine Ruel]

Created attachment 65808 [details]
webcore.gyp patch

Fixes ordering on mac

[Marc-Antoine Ruel]

Created attachment 65810 [details]
webcore.gyp patch

rebased on HEAD

[Dimitri Glazkov (Google)]

Comment on attachment 65810 [details]
webcore.gyp patch

rs=me.

[WebKit Commit Bot]

Comment on attachment 65810 [details]
webcore.gyp patch

Rejecting patch 65810 from commit-queue.

Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Dimitri Glazkov', u'--force']" exit_code: 1
Last 500 characters of output:
d at 1 with fuzz 3.
patching file WebCore/WebCore.gyp/WebCore.gyp
Hunk #2 succeeded at 846 (offset 2 lines).
Hunk #3 succeeded at 859 with fuzz 1 (offset 2 lines).
Hunk #4 succeeded at 954 with fuzz 2 (offset 6 lines).
Hunk #5 FAILED at 1082.
Hunk #6 succeeded at 1143 (offset 24 lines).
Hunk #7 succeeded at 1162 (offset 24 lines).
Hunk #8 FAILED at 1277.
Hunk #9 succeeded at 1299 with fuzz 1 (offset 33 lines).
2 out of 9 hunks FAILED -- saving rejects to file WebCore/WebCore.gyp/WebCore.gyp.rej

Full output: http://queues.webkit.org/results/3874049

[Mark Larson (Google)]

I'm pretty sure this failed becuase it depends on bug 44796, which hasn't even been reviewed yet. 

Can someone r+ that and get it into the queue?

[Marc-Antoine Ruel]

Sorry, this patch still has issues on Chromium on Mac, trying to fix it. I don't know how to change the page to remove its review flag, will post another patch once I've figured out how to fix includes paths for .mm files.

[Marc-Antoine Ruel]

Created attachment 65852 [details]
webcore.gyp patch

This is patchset 7 of http://codereview.chromium.org/3223009. Tested to work on Mac.

[Kent Tamura]

Comment on attachment 65852 [details]
webcore.gyp patch

Please make the patch against the latest WebKit source.

[Kent Tamura]

Comment on attachment 65852 [details]
webcore.gyp patch

Oh, I'm sorry.  This depends on another patch.

[Kent Tamura]

Comment on attachment 65852 [details]
webcore.gyp patch

> diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
> index bfcce4f..2da30fe 100644
> --- a/WebCore/ChangeLog
> +++ b/WebCore/ChangeLog
> @@ -2,6 +2,14 @@
>  
>          Reviewed by NOBODY (OOPS!).
>  
> +        Move more common settings to webcore_prerequisites
> +
> +        * WebCore.gyp/WebCore.gyp:
> +
> [phone]  Marc-Antoine Ruel  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
>          Rename webcore to 'webcore_remaining'.
>          Create a meta-target webcore that inherits from every webcore_XXX targets. (Currently 1)
>          Move direct_dependent_settings and export_dependent_settings from webcore_remaining to webcore

Add the bug URL to the ChangeLog entry please.

[Kent Tamura]

Landed: http://trac.webkit.org/changeset/66364