| Summary: | Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf | ||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> | ||||||||||||||||||||||||||||||||||
| Component: | New Bugs | Assignee: | Eric Seidel (no email) <eric> | ||||||||||||||||||||||||||||||||||
| Status: | RESOLVED FIXED | ||||||||||||||||||||||||||||||||||||
| Severity: | Normal | CC: | dglazkov, gyuyoung.kim, jberlin, menard, ossy, rakuco, vestbo, webkit.review.bot, zoltan | ||||||||||||||||||||||||||||||||||
| Priority: | P2 | ||||||||||||||||||||||||||||||||||||
| Version: | 528+ (Nightly build) | ||||||||||||||||||||||||||||||||||||
| Hardware: | Unspecified | ||||||||||||||||||||||||||||||||||||
| OS: | Unspecified | ||||||||||||||||||||||||||||||||||||
| Bug Depends on: | 80680, 81281 | ||||||||||||||||||||||||||||||||||||
| Bug Blocks: | 75673 | ||||||||||||||||||||||||||||||||||||
| Attachments: |
|
||||||||||||||||||||||||||||||||||||
|
Description
Eric Seidel (no email)
2012-03-12 17:29:30 PDT
Created attachment 131469 [details]
Patch
The goal of this patch is to test and see how badly I break the variou EWSes. Once I get Platform.h moved and successfully building, I will try moving a .h and .cpp pair. Once I get all the builds successfully linking with that, then I will announce on webkit-dev and do the final move. Qt's current setup is very nice, and will make the final full move very easy. It's not clear to me how I can do a partial move (just one header) with Qt's current VPATH setup. I suspect I may have to use something like: ../../WTF/wtf/Platform.h in their file list. :) Created attachment 131472 [details]
Blind stab at making Qt/EFL build
It's actually more likely that I'll have to fix header include paths for Gtk/Qt/EFL/Chromium to include Source/WTF in WebCore, WebKit, etc. Comment on attachment 131472 [details] Blind stab at making Qt/EFL build Attachment 131472 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11949159 Comment on attachment 131472 [details] Blind stab at making Qt/EFL build Attachment 131472 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11947258 Comment on attachment 131472 [details] Blind stab at making Qt/EFL build Attachment 131472 [details] did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11942298 Comment on attachment 131472 [details] Blind stab at making Qt/EFL build Attachment 131472 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/11947363 The cr-linux ews bubble will be fixed once bug 81281 lands. I'll look at what's needed to fix qt, win, efl shortly. Created attachment 132695 [details]
Should fix chromium
I'm not going to try and fix Win until bug 80680 lands, as it would involve changing WTF/WTF.vcproj to install into JavaScriptCore/private, which seems wrong... Created attachment 132700 [details]
might fix Qt
If someone from the EFL port could help me understand how to fix EFL before landing, that would be nice. Created attachment 132714 [details]
Should fix EFL and CMake in general
Comment on attachment 132714 [details]
Should fix EFL and CMake in general
Thanks! (removing review flag for now).
Comment on attachment 132714 [details] Should fix EFL and CMake in general Attachment 132714 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/11991117 Odd. Somehow we broke qt-wk2 in all this. Or Qt's dependency tracking could just be broken. :) Thus meaning the previous "pass" was likely bogus: ===== BUILD FAILED ====== The build failed with exit code 2. This may have been because you - added an #include to a source/header - added a Q_OBJECT macro to a class - added a new resource to a qrc file as dependencies are not automatically re-computed for local developer builds. You may try computing dependencies manually by running 'make qmake' in: /storage/WebKit-qt-wk2-ews/WebKitBuild/Release or passing --makeargs="qmake" to build-webkit. Comment on attachment 132714 [details] Should fix EFL and CMake in general Attachment 132714 [details] did not pass mac-ews (mac): Output: http://queues.webkit.org/results/11989489 Comment on attachment 132714 [details] Should fix EFL and CMake in general Attachment 132714 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11986595 Created attachment 132742 [details]
fix Mac
Comment on attachment 132742 [details] fix Mac Attachment 132742 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/11999085 Comment on attachment 132742 [details] fix Mac Attachment 132742 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12002072 Comment on attachment 132742 [details] fix Mac Attachment 132742 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11994115 Created attachment 132763 [details]
attempt to fix Qt
I'm not even sure that my changes from "Platform.h" to <wtf/Platform.h> are even correct for Qt, since maybe it includes Platform.h in its API? Also, it's not clear to me which .pri/.pro file I would need to edit to add Source/WTF to the header include path for QtWebKit. Ossy? Comment on attachment 132763 [details] attempt to fix Qt Attachment 132763 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12002103 Created attachment 132771 [details]
attempt to fix qt-wk2
Comment on attachment 132771 [details] attempt to fix qt-wk2 Attachment 132771 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/11995134 Comment on attachment 132771 [details] attempt to fix qt-wk2 Attachment 132771 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12000135 Created attachment 132775 [details]
Another attempt to fix qt-wk2
I'm going to check the Qt WK2 build today. I think I'm pretty close. :) The only build I haven't attempted yet is Win. Theoretically EFL works after Raphael's patch update. If you find qt* doesn't work, feel encouraged to upload an updated patch! Comment on attachment 132775 [details] Another attempt to fix qt-wk2 Attachment 132775 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12002153 Comment on attachment 132775 [details] Another attempt to fix qt-wk2 Attachment 132775 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12007138 Created attachment 132779 [details]
FixEfl
Comment on attachment 132779 [details] FixEfl Attachment 132779 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12000165 Comment on attachment 132779 [details] FixEfl Attachment 132779 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12000173 Created attachment 132789 [details]
Fix Qt build based on attachment-132779
It isn't the best fix, but it works at least. :)
Tor Arne, could you review/optimize the Qt part of this patch. Comment on attachment 132789 [details] Fix Qt build based on attachment-132779 Attachment 132789 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12005198 Comment on attachment 132789 [details] Fix Qt build based on attachment-132779 Attachment 132789 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/11995225 Comment on attachment 132789 [details] Fix Qt build based on attachment-132779 Attachment 132789 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12007232 Comment on attachment 132779 [details]
FixEfl
Clearing r? flag from the patch.
Sweet! thank you both for your help! Created attachment 132854 [details]
Attempt to fix Win-EWS
Comment on attachment 132854 [details] Attempt to fix Win-EWS Attachment 132854 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12022003 win-ews hates me. :p Just gonna wait for bug 80680 to land, or for someone with windows-fu to fix the patch. Created attachment 132910 [details]
Attempt to fix win-ews again
Comment on attachment 132910 [details] Attempt to fix win-ews again Attachment 132910 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12043019 Created attachment 132912 [details]
Attempt to fix win-ews again
Comment on attachment 132912 [details] Attempt to fix win-ews again Attachment 132912 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12070030 Created attachment 132922 [details]
another attempt to fix win-ews
Created attachment 132934 [details]
Patch
A soon as the EWSes roll green, this is ready for landing. (They should all be green now.) Will send an announcement email to webkit-dev about the move. Comment on attachment 132934 [details]
Patch
All green!! They said it couldn't be done.
Comment on attachment 132934 [details] Patch Rejecting attachment 132934 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: geLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/DumpRenderTree/efl/CMakeLists.txt patching file Tools/DumpRenderTree/qt/DumpRenderTree.pro patching file Tools/QtTestBrowser/QtTestBrowser.pro patching file Tools/Scripts/build-webkit patching file CMakeLists.txt patching file ChangeLog Hunk #1 succeeded at 1 with fuzz 3. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Adam Barth']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12072181 Committed r111504: <http://trac.webkit.org/changeset/111504> This broke the Windows build, which I fixed in http://trac.webkit.org/changeset/111550 |