Bug 106737 - Make ninja the default build system for build-webkit --chromium on mac
Summary: Make ninja the default build system for build-webkit --chromium on mac
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nico Weber
URL:
Keywords:
Depends on: 104434 105597 107387 107470
Blocks:
  Show dependency treegraph
 
Reported: 2013-01-12 23:50 PST by Nico Weber
Modified: 2013-01-21 14:05 PST (History)
2 users (show)

See Also:


Attachments
Patch (1.04 KB, patch)
2013-01-13 10:36 PST, Nico Weber
no flags Details | Formatted Diff | Diff
Patch for landing (28 bytes, patch)
2013-01-21 13:15 PST, Nico Weber
no flags Details | Formatted Diff | Diff
Patch for landing (1.05 KB, patch)
2013-01-21 13:27 PST, Nico Weber
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Nico Weber 2013-01-12 23:50:52 PST
Like bug 104434, but for chromium/mac.
Comment 1 Nico Weber 2013-01-12 23:53:50 PST
As it turns out, my attempt to make nrwt find the right binary automatically in http://trac.webkit.org/changeset/138294 wasn't quite right: it looks in Source/WebKit/chromium/xcodebuild/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree (good) and Source/WebKit/chromium/out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree (bad, should look in out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree instead).

Since NRWT is so lasagna-code-y, it's not obvious how to fix that. I'll look at it some.
Comment 2 Nico Weber 2013-01-12 23:57:55 PST
Hey, I think my patch in bug 105597 probably addresses that. I should land it.
Comment 3 Nico Weber 2013-01-13 10:08:59 PST
Looks like this works now, at least with a standalone webkit build.
Comment 4 Nico Weber 2013-01-13 10:22:08 PST
With a standalone build, layout_tests/port/chromium.py's _static_build_path looks in these places:

/Users/thakis/src/WebKit/Source/WebKit/chromium/xcodebuild/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree
/Users/thakis/src/WebKit/Source/WebKit/chromium/out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree
/Users/thakis/src/WebKit/xcodebuild/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree
/Users/thakis/src/WebKit/out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree

This includes the two right locations, so things work.

In a webkit-in-chromium build, it looks in

/Users/thakis/src/chrome/src/xcodebuild/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree
/Users/thakis/src/chrome/src/out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree
/Users/thakis/src/chrome/src/third_party/WebKit/xcodebuild/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree
/Users/thakis/src/chrome/src/third_party/WebKit/out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree

This is _almost_ right, but it doesn't look in third_party/WebKit/Source/WebKit/chromium/xcodebuild. However, that's already the case in trunk and nobody's complaining, so I guess nobody is doing webkit-in-chromium builds _and_ builds with xcodebuild and build-webkit.
Comment 5 Nico Weber 2013-01-13 10:35:07 PST
Filed bug 106745 for the problem in comment 4.
Comment 6 Nico Weber 2013-01-13 10:36:59 PST
Created attachment 182487 [details]
Patch
Comment 7 Nico Weber 2013-01-13 10:37:39 PST
I think this should work, but let's wait with landing this until next weekend, to see if there are any problems with the ninja transition on linux.
Comment 8 Eric Seidel (no email) 2013-01-14 13:44:53 PST
Comment on attachment 182487 [details]
Patch

I wish to buy this product and or service.  I might have written this as ! win however.
Comment 9 WebKit Review Bot 2013-01-19 14:45:50 PST
Comment on attachment 182487 [details]
Patch

Clearing flags on attachment: 182487

Committed r140260: <http://trac.webkit.org/changeset/140260>
Comment 10 WebKit Review Bot 2013-01-19 14:45:54 PST
All reviewed patches have been landed.  Closing bug.
Comment 11 WebKit Review Bot 2013-01-19 17:26:51 PST
Re-opened since this is blocked by bug 107387
Comment 12 Nico Weber 2013-01-19 20:52:16 PST
This is blocked on https://code.google.com/p/chromium/issues/detail?id=171146
Comment 13 Nico Weber 2013-01-21 13:09:42 PST
The hyphen stuff should now work. Let's try this again.
Comment 14 WebKit Review Bot 2013-01-21 13:13:00 PST
Comment on attachment 182487 [details]
Patch

Rejecting attachment 182487 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue

/mnt/git/webkit-commit-queue/Tools/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive).

Full output: http://queues.webkit.org/results/16039187
Comment 15 Nico Weber 2013-01-21 13:15:53 PST
Created attachment 183825 [details]
Patch for landing
Comment 16 Nico Weber 2013-01-21 13:18:16 PST
Comment on attachment 183825 [details]
Patch for landing

I fail at webkit-patch
Comment 17 Nico Weber 2013-01-21 13:27:53 PST
Created attachment 183827 [details]
Patch for landing
Comment 18 WebKit Review Bot 2013-01-21 14:05:46 PST
Comment on attachment 183827 [details]
Patch for landing

Clearing flags on attachment: 183827

Committed r140360: <http://trac.webkit.org/changeset/140360>
Comment 19 WebKit Review Bot 2013-01-21 14:05:51 PST
All reviewed patches have been landed.  Closing bug.