RESOLVED FIXED 80911
Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
https://bugs.webkit.org/show_bug.cgi?id=80911
Summary Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
Eric Seidel (no email)
Reported 2012-03-12 17:29:30 PDT
Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
Attachments
Patch (76.08 KB, patch)
2012-03-12 17:32 PDT, Eric Seidel (no email)
no flags
Blind stab at making Qt/EFL build (76.99 KB, patch)
2012-03-12 17:45 PDT, Eric Seidel (no email)
no flags
Should fix chromium (73.02 KB, patch)
2012-03-19 16:02 PDT, Eric Seidel (no email)
no flags
might fix Qt (74.15 KB, patch)
2012-03-19 16:11 PDT, Eric Seidel (no email)
no flags
Should fix EFL and CMake in general (75.67 KB, patch)
2012-03-19 16:40 PDT, Raphael Kubo da Costa (:rakuco)
no flags
fix Mac (79.28 KB, patch)
2012-03-19 18:51 PDT, Eric Seidel (no email)
no flags
attempt to fix Qt (82.20 KB, patch)
2012-03-19 22:45 PDT, Eric Seidel (no email)
no flags
attempt to fix qt-wk2 (83.91 KB, patch)
2012-03-19 23:49 PDT, Eric Seidel (no email)
no flags
Another attempt to fix qt-wk2 (84.43 KB, patch)
2012-03-20 00:43 PDT, Eric Seidel (no email)
no flags
FixEfl (85.69 KB, patch)
2012-03-20 01:49 PDT, Ryuan Choi
no flags
Fix Qt build based on attachment-132779 (86.20 KB, patch)
2012-03-20 03:41 PDT, Csaba Osztrogonác
no flags
Attempt to fix Win-EWS (89.94 KB, patch)
2012-03-20 11:03 PDT, Eric Seidel (no email)
no flags
Attempt to fix win-ews again (88.89 KB, patch)
2012-03-20 15:09 PDT, Eric Seidel (no email)
no flags
Attempt to fix win-ews again (89.72 KB, patch)
2012-03-20 15:39 PDT, Eric Seidel (no email)
no flags
another attempt to fix win-ews (91.60 KB, patch)
2012-03-20 16:18 PDT, Eric Seidel (no email)
no flags
Patch (95.95 KB, patch)
2012-03-20 17:07 PDT, Eric Seidel (no email)
abarth: review+
webkit.review.bot: commit-queue-
Eric Seidel (no email)
Comment 1 2012-03-12 17:32:14 PDT
Eric Seidel (no email)
Comment 2 2012-03-12 17:33:31 PDT
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.
Eric Seidel (no email)
Comment 3 2012-03-12 17:35:22 PDT
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. :)
Eric Seidel (no email)
Comment 4 2012-03-12 17:45:06 PDT
Created attachment 131472 [details] Blind stab at making Qt/EFL build
Eric Seidel (no email)
Comment 5 2012-03-12 17:45:59 PDT
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.
WebKit Review Bot
Comment 6 2012-03-12 18:57:36 PDT
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
Early Warning System Bot
Comment 7 2012-03-12 19:12:20 PDT
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
Gyuyoung Kim
Comment 8 2012-03-12 20:53:59 PDT
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
Build Bot
Comment 9 2012-03-12 23:55:58 PDT
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
Eric Seidel (no email)
Comment 10 2012-03-15 17:35:45 PDT
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.
Eric Seidel (no email)
Comment 11 2012-03-19 16:02:33 PDT
Created attachment 132695 [details] Should fix chromium
Eric Seidel (no email)
Comment 12 2012-03-19 16:08:00 PDT
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...
Eric Seidel (no email)
Comment 13 2012-03-19 16:11:27 PDT
Created attachment 132700 [details] might fix Qt
Eric Seidel (no email)
Comment 14 2012-03-19 16:26:10 PDT
If someone from the EFL port could help me understand how to fix EFL before landing, that would be nice.
Raphael Kubo da Costa (:rakuco)
Comment 15 2012-03-19 16:40:57 PDT
Created attachment 132714 [details] Should fix EFL and CMake in general
Eric Seidel (no email)
Comment 16 2012-03-19 16:45:25 PDT
Comment on attachment 132714 [details] Should fix EFL and CMake in general Thanks! (removing review flag for now).
Early Warning System Bot
Comment 17 2012-03-19 17:45:25 PDT
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
Eric Seidel (no email)
Comment 18 2012-03-19 17:54:53 PDT
Odd. Somehow we broke qt-wk2 in all this.
Eric Seidel (no email)
Comment 19 2012-03-19 17:56:36 PDT
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.
Build Bot
Comment 20 2012-03-19 18:10:42 PDT
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
Early Warning System Bot
Comment 21 2012-03-19 18:26:00 PDT
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
Eric Seidel (no email)
Comment 22 2012-03-19 18:51:17 PDT
Build Bot
Comment 23 2012-03-19 22:29:21 PDT
Early Warning System Bot
Comment 24 2012-03-19 22:33:44 PDT
Early Warning System Bot
Comment 25 2012-03-19 22:36:56 PDT
Eric Seidel (no email)
Comment 26 2012-03-19 22:45:23 PDT
Created attachment 132763 [details] attempt to fix Qt
Eric Seidel (no email)
Comment 27 2012-03-19 22:47:56 PDT
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?
Early Warning System Bot
Comment 28 2012-03-19 23:16:06 PDT
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
Eric Seidel (no email)
Comment 29 2012-03-19 23:49:37 PDT
Created attachment 132771 [details] attempt to fix qt-wk2
Build Bot
Comment 30 2012-03-20 00:21:32 PDT
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
Early Warning System Bot
Comment 31 2012-03-20 00:37:30 PDT
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
Eric Seidel (no email)
Comment 32 2012-03-20 00:43:12 PDT
Created attachment 132775 [details] Another attempt to fix qt-wk2
Csaba Osztrogonác
Comment 33 2012-03-20 00:44:57 PDT
I'm going to check the Qt WK2 build today.
Eric Seidel (no email)
Comment 34 2012-03-20 00:51:23 PDT
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!
Build Bot
Comment 35 2012-03-20 01:01:48 PDT
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
Early Warning System Bot
Comment 36 2012-03-20 01:15:29 PDT
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
Ryuan Choi
Comment 37 2012-03-20 01:49:55 PDT
Build Bot
Comment 38 2012-03-20 02:14:33 PDT
Early Warning System Bot
Comment 39 2012-03-20 02:24:16 PDT
Csaba Osztrogonác
Comment 40 2012-03-20 03:41:00 PDT
Created attachment 132789 [details] Fix Qt build based on attachment-132779 It isn't the best fix, but it works at least. :)
Csaba Osztrogonác
Comment 41 2012-03-20 03:42:43 PDT
Tor Arne, could you review/optimize the Qt part of this patch.
Build Bot
Comment 42 2012-03-20 04:00:11 PDT
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
Build Bot
Comment 43 2012-03-20 05:06:15 PDT
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
Build Bot
Comment 44 2012-03-20 06:01:08 PDT
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
Raphael Kubo da Costa (:rakuco)
Comment 45 2012-03-20 06:15:39 PDT
Comment on attachment 132779 [details] FixEfl Clearing r? flag from the patch.
Eric Seidel (no email)
Comment 46 2012-03-20 10:13:14 PDT
Sweet! thank you both for your help!
Eric Seidel (no email)
Comment 47 2012-03-20 11:03:23 PDT
Created attachment 132854 [details] Attempt to fix Win-EWS
Build Bot
Comment 48 2012-03-20 11:27:10 PDT
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
Eric Seidel (no email)
Comment 49 2012-03-20 11:41:19 PDT
win-ews hates me. :p Just gonna wait for bug 80680 to land, or for someone with windows-fu to fix the patch.
Eric Seidel (no email)
Comment 50 2012-03-20 15:09:42 PDT
Created attachment 132910 [details] Attempt to fix win-ews again
Build Bot
Comment 51 2012-03-20 15:33:13 PDT
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
Eric Seidel (no email)
Comment 52 2012-03-20 15:39:37 PDT
Created attachment 132912 [details] Attempt to fix win-ews again
Build Bot
Comment 53 2012-03-20 16:09:12 PDT
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
Eric Seidel (no email)
Comment 54 2012-03-20 16:18:22 PDT
Created attachment 132922 [details] another attempt to fix win-ews
Eric Seidel (no email)
Comment 55 2012-03-20 17:07:36 PDT
Eric Seidel (no email)
Comment 56 2012-03-20 17:08:25 PDT
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.
Adam Barth
Comment 57 2012-03-20 22:44:01 PDT
Comment on attachment 132934 [details] Patch All green!! They said it couldn't be done.
WebKit Review Bot
Comment 58 2012-03-20 22:48:55 PDT
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
Eric Seidel (no email)
Comment 59 2012-03-20 22:50:42 PDT
Jessie Berlin
Comment 60 2012-03-21 09:26:50 PDT
This broke the Windows build, which I fixed in http://trac.webkit.org/changeset/111550
Note You need to log in before you can comment on or make changes to this bug.