Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Issue 8889039: build DRT, webkit_unit_tests from individual gyp files. (Closed)

Created:
9 years ago by Dirk Pranke
Modified:
8 years, 11 months ago
Reviewers:
tony
CC:
chromium-reviews, darin-cc_chromium.org, pam+watch_chromium.org, ananta
Visibility:
Public.

Description

build DRT, webkit_unit_tests from individual gyp files. This change toggles the build_webkit_exes_from_webkit_gyp file to 0, so that we try to build DumpRenderTree and webkit_unit_tests from their corresponding .gyp files (WebKitUnitTests.gyp and Tools.gyp) rather than the old WebKit.gyp file. This breaks the circular dependencies between the executables which depend on webkit_support, which depends on WebKit.gyp. We now only use the 'webkit' target itself in WebKit.gyp. R=tony@chromium.org BUG=105826 TEST=waterfall stays green Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=118366

Patch Set 1 #

Patch Set 2 : fix target dependency in chrome_tests.gypi #

Patch Set 3 : pull the entire Tools/ directory in DEPS so that we get Tools.gyp #

Patch Set 4 : revamp, clean up #

Total comments: 5

Patch Set 5 : 'all' target should pull in All.gyp in WebKit' #

Patch Set 6 : fix sorting, also merge to HEAD #

Total comments: 1

Patch Set 7 : add comment in conditional #

Unified diffs Side-by-side diffs Delta from patch set Stats (+28 lines, -14 lines) Patch
M build/all.gyp View 1 2 3 4 5 4 chunks +4 lines, -4 lines 0 comments Download
M build/common.gypi View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_tests.gypi View 1 2 3 4 5 6 3 chunks +3 lines, -3 lines 0 comments Download
M webkit/tools/test_shell/test_shell.gypi View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M webkit/webkit.gyp View 1 2 3 4 5 6 1 chunk +19 lines, -5 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
Dirk Pranke
please take a look?
8 years, 11 months ago (2012-01-19 00:12:15 UTC) #1
tony
http://codereview.chromium.org/8889039/diff/5001/build/all.gyp File build/all.gyp (left): http://codereview.chromium.org/8889039/diff/5001/build/all.gyp#oldcode51 build/all.gyp:51: '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*', Should we pull in all the targets in ...
8 years, 11 months ago (2012-01-19 00:21:46 UTC) #2
Dirk Pranke
http://codereview.chromium.org/8889039/diff/5001/build/all.gyp File build/all.gyp (left): http://codereview.chromium.org/8889039/diff/5001/build/all.gyp#oldcode51 build/all.gyp:51: '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:*', On 2012/01/19 00:21:46, tony wrote: > Should we ...
8 years, 11 months ago (2012-01-19 03:16:04 UTC) #3
Dirk Pranke
please take another look?
8 years, 11 months ago (2012-01-19 03:39:40 UTC) #4
tony
LGTM http://codereview.chromium.org/8889039/diff/5001/webkit/tools/test_shell/test_shell.gypi File webkit/tools/test_shell/test_shell.gypi (right): http://codereview.chromium.org/8889039/diff/5001/webkit/tools/test_shell/test_shell.gypi#newcode209 webkit/tools/test_shell/test_shell.gypi:209: 'pull_in_copy_TestNetscapePlugIn', On 2012/01/19 03:16:04, Dirk Pranke wrote: > ...
8 years, 11 months ago (2012-01-19 18:22:05 UTC) #5
Dirk Pranke
8 years, 11 months ago (2012-01-19 19:41:32 UTC) #6
On 2012/01/19 18:22:05, tony wrote:
> LGTM
> 
>
http://codereview.chromium.org/8889039/diff/5001/webkit/tools/test_shell/test...
> File webkit/tools/test_shell/test_shell.gypi (right):
> 
>
http://codereview.chromium.org/8889039/diff/5001/webkit/tools/test_shell/test...
> webkit/tools/test_shell/test_shell.gypi:209:
'pull_in_copy_TestNetscapePlugIn',
> On 2012/01/19 03:16:04, Dirk Pranke wrote:
> > On 2012/01/19 00:21:46, tony wrote:
> > > It's a bit unfortunate that this is defined in a different file.  Maybe it
> > > should be defined in test_shell.gypi instead?
> > 
> > I'm not sure I see much advantage to putting it here rather than in
> webkit.gyp;
> > the target is referenced from other files as well (see chrome_tests.gypi).
If
> it
> > was only used/needed by test_shell I would agree, but for now it seems
better
> to
> > keep it next to the other pull_in_* targets. 
> 
> chrome_tests.gypi is different, it explicitly names webkit.gyp.  If we wanted
to
> build test_shell in an upstream only checkout, this wouldn't work because we
> don't include webkit.gyp in an upstream checkout (only webkit_support.gyp).
> 

Good points. I will fix this when I yank the conditional.

> Anyway, this is fine for now, just a bit unfortunate.  We can refactor later
if
> we need to.
> 
> http://codereview.chromium.org/8889039/diff/6007/webkit/webkit.gyp
> File webkit/webkit.gyp (right):
> 
> http://codereview.chromium.org/8889039/diff/6007/webkit/webkit.gyp#newcode41
> webkit/webkit.gyp:41: }, {
> Nit: Please add a comment here that this is
> build_webkit_exes_from_webkit_gyp==0.

Will do.

Powered by Google App Engine
This is Rietveld 408576698