| Summary: | Move WebCore to Source | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Adam Barth <abarth> | ||||
| Component: | New Bugs | Assignee: | Adam Barth <abarth> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | abarth, buildbot, dglazkov, eric, gustavo, webkit-ews, webkit.review.bot, xan.lopez | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Other | ||||||
| OS: | OS X 10.5 | ||||||
| Bug Depends on: | |||||||
| Bug Blocks: | 51606 | ||||||
| Attachments: |
|
||||||
|
Description
Adam Barth
2011-01-07 02:12:35 PST
Created attachment 78217 [details]
Patch
Comment on attachment 78217 [details]
Patch
This patch should contain everything except the actual move.
Attachment 78217 [details] did not build on chromium: Build output: http://queues.webkit.org/results/7365028 Attachment 78217 [details] did not build on gtk: Build output: http://queues.webkit.org/results/7429008 The failures are, of course, expected. Attachment 78217 [details] did not build on qt: Build output: http://queues.webkit.org/results/7409020 Comment on attachment 78217 [details]
Patch
We're goign to end up wanting to remove a bunch of these "Source" additions once everything is moved.
Attachment 78217 [details] did not build on win: Build output: http://queues.webkit.org/results/7365029 > We're goign to end up wanting to remove a bunch of these "Source" additions once everything is moved.
Yeah. I removed a bunch from JavaScriptCore in this patch. I can try to move everything in one patch, but that seemed harder.
This patch also requires this change downstream in Chromium to keep the upstream build compiling:
Index: glue/webkit_glue.gypi
===================================================================
--- glue/webkit_glue.gypi (revision 70448)
+++ glue/webkit_glue.gypi (working copy)
@@ -117,7 +117,7 @@
'action_name': 'webkit_version',
'inputs': [
'../build/webkit_version.py',
- '<(webkit_src_dir)/WebCore/Configurations/Version.xcconfig',
+ '<(webkit_src_dir)/Source/WebCore/Configurations/Version.xcconfig',
],
'outputs': [
'<(INTERMEDIATE_DIR)/webkit_version.h',
Committed r75313: <http://trac.webkit.org/changeset/75313> http://trac.webkit.org/changeset/75313 might have broken Chromium Mac Release (In reply to comment #12) > http://trac.webkit.org/changeset/75313 might have broken Chromium Mac Release This was an expected consequence of a circular dependency on the location of WebCore in the Chromium build system. Hopefully should be resolved now. |