Bug 80911 - Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
: Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
Status: RESOLVED FIXED
Product: WebKit
Classification: Unclassified
Component: New Bugs
: 528+ (Nightly build)
: Unspecified Unspecified
: P2 Normal
Assigned To: Eric Seidel
:
Depends on: 80680 81281
Blocks: 75673
  Show dependency treegraph
 
Reported: 2012-03-12 17:29 PDT by Eric Seidel
Modified: 2012-03-21 09:26 PDT (History)
9 users (show)

See Also:


Attachments
Patch (76.08 KB, patch)
2012-03-12 17:32 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Blind stab at making Qt/EFL build (76.99 KB, patch)
2012-03-12 17:45 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Should fix chromium (73.02 KB, patch)
2012-03-19 16:02 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
might fix Qt (74.15 KB, patch)
2012-03-19 16:11 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Should fix EFL and CMake in general (75.67 KB, patch)
2012-03-19 16:40 PDT, Raphael Kubo da Costa (:rakuco)
no flags Details | Formatted Diff | Diff
fix Mac (79.28 KB, patch)
2012-03-19 18:51 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
attempt to fix Qt (82.20 KB, patch)
2012-03-19 22:45 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
attempt to fix qt-wk2 (83.91 KB, patch)
2012-03-19 23:49 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Another attempt to fix qt-wk2 (84.43 KB, patch)
2012-03-20 00:43 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
FixEfl (85.69 KB, patch)
2012-03-20 01:49 PDT, Ryuan Choi
no flags Details | Formatted Diff | Diff
Fix Qt build based on attachment-132779 (86.20 KB, patch)
2012-03-20 03:41 PDT, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff
Attempt to fix Win-EWS (89.94 KB, patch)
2012-03-20 11:03 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Attempt to fix win-ews again (88.89 KB, patch)
2012-03-20 15:09 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Attempt to fix win-ews again (89.72 KB, patch)
2012-03-20 15:39 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
another attempt to fix win-ews (91.60 KB, patch)
2012-03-20 16:18 PDT, Eric Seidel
no flags Details | Formatted Diff | Diff
Patch (95.95 KB, patch)
2012-03-20 17:07 PDT, Eric Seidel
abarth: review+
webkit.review.bot: commit‑queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel 2012-03-12 17:29:30 PDT
Move wtf/Platform.h from JavaScriptCore to Source/WTF/wtf
Comment 1 Eric Seidel 2012-03-12 17:32:14 PDT
Created attachment 131469 [details]
Patch
Comment 2 Eric Seidel 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.
Comment 3 Eric Seidel 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. :)
Comment 4 Eric Seidel 2012-03-12 17:45:06 PDT
Created attachment 131472 [details]
Blind stab at making Qt/EFL build
Comment 5 Eric Seidel 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.
Comment 6 WebKit Review Bot 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
Comment 7 Early Warning System Bot 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
Comment 8 Gyuyoung Kim 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
Comment 9 Build Bot 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
Comment 10 Eric Seidel 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.
Comment 11 Eric Seidel 2012-03-19 16:02:33 PDT
Created attachment 132695 [details]
Should fix chromium
Comment 12 Eric Seidel 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...
Comment 13 Eric Seidel 2012-03-19 16:11:27 PDT
Created attachment 132700 [details]
might fix Qt
Comment 14 Eric Seidel 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.
Comment 15 Raphael Kubo da Costa (:rakuco) 2012-03-19 16:40:57 PDT
Created attachment 132714 [details]
Should fix EFL and CMake in general
Comment 16 Eric Seidel 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).
Comment 17 Early Warning System Bot 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
Comment 18 Eric Seidel 2012-03-19 17:54:53 PDT
Odd.  Somehow we broke qt-wk2 in all this.
Comment 19 Eric Seidel 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.
Comment 20 Build Bot 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
Comment 21 Early Warning System Bot 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
Comment 22 Eric Seidel 2012-03-19 18:51:17 PDT
Created attachment 132742 [details]
fix Mac
Comment 23 Build Bot 2012-03-19 22:29:21 PDT
Comment on attachment 132742 [details]
fix Mac

Attachment 132742 [details] did not pass win-ews (win):
Output: http://queues.webkit.org/results/11999085
Comment 24 Early Warning System Bot 2012-03-19 22:33:44 PDT
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 25 Early Warning System Bot 2012-03-19 22:36:56 PDT
Comment on attachment 132742 [details]
fix Mac

Attachment 132742 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/11994115
Comment 26 Eric Seidel 2012-03-19 22:45:23 PDT
Created attachment 132763 [details]
attempt to fix Qt
Comment 27 Eric Seidel 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?
Comment 28 Early Warning System Bot 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
Comment 29 Eric Seidel 2012-03-19 23:49:37 PDT
Created attachment 132771 [details]
attempt to fix qt-wk2
Comment 30 Build Bot 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
Comment 31 Early Warning System Bot 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
Comment 32 Eric Seidel 2012-03-20 00:43:12 PDT
Created attachment 132775 [details]
Another attempt to fix qt-wk2
Comment 33 Csaba Osztrogonác 2012-03-20 00:44:57 PDT
I'm going to check the Qt WK2 build today.
Comment 34 Eric Seidel 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!
Comment 35 Build Bot 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
Comment 36 Early Warning System Bot 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
Comment 37 Ryuan Choi 2012-03-20 01:49:55 PDT
Created attachment 132779 [details]
FixEfl
Comment 38 Build Bot 2012-03-20 02:14:33 PDT
Comment on attachment 132779 [details]
FixEfl

Attachment 132779 [details] did not pass win-ews (win):
Output: http://queues.webkit.org/results/12000165
Comment 39 Early Warning System Bot 2012-03-20 02:24:16 PDT
Comment on attachment 132779 [details]
FixEfl

Attachment 132779 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/12000173
Comment 40 Csaba Osztrogonác 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. :)
Comment 41 Csaba Osztrogonác 2012-03-20 03:42:43 PDT
Tor Arne, could you review/optimize the Qt part of this patch.
Comment 42 Build Bot 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
Comment 43 Build Bot 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
Comment 44 Build Bot 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
Comment 45 Raphael Kubo da Costa (:rakuco) 2012-03-20 06:15:39 PDT
Comment on attachment 132779 [details]
FixEfl

Clearing r? flag from the patch.
Comment 46 Eric Seidel 2012-03-20 10:13:14 PDT
Sweet!  thank you both for your help!
Comment 47 Eric Seidel 2012-03-20 11:03:23 PDT
Created attachment 132854 [details]
Attempt to fix Win-EWS
Comment 48 Build Bot 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
Comment 49 Eric Seidel 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.
Comment 50 Eric Seidel 2012-03-20 15:09:42 PDT
Created attachment 132910 [details]
Attempt to fix win-ews again
Comment 51 Build Bot 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
Comment 52 Eric Seidel 2012-03-20 15:39:37 PDT
Created attachment 132912 [details]
Attempt to fix win-ews again
Comment 53 Build Bot 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
Comment 54 Eric Seidel 2012-03-20 16:18:22 PDT
Created attachment 132922 [details]
another attempt to fix win-ews
Comment 55 Eric Seidel 2012-03-20 17:07:36 PDT
Created attachment 132934 [details]
Patch
Comment 56 Eric Seidel 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.
Comment 57 Adam Barth 2012-03-20 22:44:01 PDT
Comment on attachment 132934 [details]
Patch

All green!!  They said it couldn't be done.
Comment 58 WebKit Review Bot 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
Comment 59 Eric Seidel 2012-03-20 22:50:42 PDT
Committed r111504: <http://trac.webkit.org/changeset/111504>
Comment 60 Jessie Berlin 2012-03-21 09:26:50 PDT
This broke the Windows build, which I fixed in http://trac.webkit.org/changeset/111550