Bug 29722 – Chromium Port - DEPS file & webkit.gyp

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Yaar Schnitman]

1. DEPS file describing the chromium port's dependencies has been created in WebKit/Chromium.
2. WebKit.gyp, currently a thin wrapper around webcore and in the future the target of the webkit api, has been created in WebKit/Chromium.
3. JavaScriptCore.gyp & WebCore.gyp been made to recognize they are built locally, and look for dependencies and resources under webkit/chromium rather than src.

Next steps:
* make "update-webkit --chromium" fetch the dependencies in DEPS by using gclient and execute the gyp system.
* make "build-webkit --chromium" build the product of gyp.

[Yaar Schnitman]

Created attachment 40089 [details]
patch

[David Levin]

Comment on attachment 40089 [details]
patch

Just a few minor nits to address or respond to.


> diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
> [phone]  Yaar Schnitman  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        https://bugs.webkit.org/show_bug.cgi?id=29722
> +
> +        * chromium/DEPS: Describes the chromium port's dependencies and
> +          is used by gclient to fetch them.
> +        * chromium/webkit.gyp: Currently a thin wrapper around webcore but in
typo: "in" it?
> +          soon will build the webkit api.

What do you mean by thin wrapper about webcore?  Do you mean that it only builds webcore?


> diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS

> +
> +vars = {
> +  'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
> +  'chromium_deps_svn': 'http://src.chromium.org/svn/trunk/deps/third_party',
> +
> +  # 

Is this suppose to be a comment?


As discussed I have concerns about the repeated revision numbers here but it sounds like this is on your clean up list real soon now.

> diff --git a/WebKit/chromium/webkit.gyp b/WebKit/chromium/webkit.gyp
> +{
> +  'targets': [
> +    {
> +      # This target is a thin wrapper around webcore, but it will
Consider "This target only build webcore right now, but it will"

[Yaar Schnitman]

Created attachment 40149 [details]
updated patch

Thanks for the feedback. I incorporated it in. I also updated some revision numbers in DEPS to catch up with lkgr chromium.

[WebKit Commit Bot]

Comment on attachment 40149 [details]
updated patch

Rejecting patch 40149 from commit-queue.

Patch https://bugs.webkit.org/attachment.cgi?id=40149 from bug 29722 failed to download and apply.

[Yaar Schnitman]

Comment on attachment 40149 [details]
updated patch

Trying to apply patch again (I suspect it was rejected due to flakiness).

[WebKit Commit Bot]

Comment on attachment 40149 [details]
updated patch

Rejecting patch 40149 from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.

[Yaar Schnitman]

Comment on attachment 40149 [details]
updated patch

Oops, I guess I have to do ? rather than +.

[WebKit Commit Bot]

Comment on attachment 40149 [details]
updated patch

Rejecting patch 40149 from commit-queue.

Patch https://bugs.webkit.org/attachment.cgi?id=40149 from bug 29722 failed to download and apply.

[Yaar Schnitman]

Created attachment 40248 [details]
Fixed build rejection problems

Previous patch was already r+, cq+, but in the meantime patch got rotten. This is patch just solves the merge problems.

[Dimitri Glazkov (Google)]

Comment on attachment 40248 [details]
Fixed build rejection problems

adding back to cq, carrying over levin's r+.

[Eric Seidel (no email)]

patching file WebCore/WebCore.gyp/WebCore.gyp
Hunk #1 FAILED at 35.
Hunk #2 succeeded at 419 (offset 4 lines).
1 out of 2 hunks FAILED -- saving rejects to file WebCore/WebCore.gyp/WebCore.gyp.rej

was the original rejection.

[WebKit Commit Bot]

Comment on attachment 40248 [details]
Fixed build rejection problems

Clearing flags on attachment: 40248

Committed r48827: <http://trac.webkit.org/changeset/48827>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.