Bug 76163 - Make the new WTF module build on Qt
Summary: Make the new WTF module build on Qt
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Simon Hausmann
URL:
Keywords:
Depends on: 76179
Blocks: 75673
  Show dependency treegraph
 
Reported: 2012-01-12 03:17 PST by Simon Hausmann
Modified: 2012-02-28 07:23 PST (History)
7 users (show)

See Also:


Attachments
Patch (21.33 KB, patch)
2012-01-12 06:55 PST, Simon Hausmann
no flags Details | Formatted Diff | Diff
Patch (21.33 KB, patch)
2012-01-12 07:04 PST, Simon Hausmann
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Simon Hausmann 2012-01-12 03:17:01 PST
Make the new WTF module build on Qt

Having Source/WTF build with Qt will make it easier to move sources around. For Qt source
references should be removed from Source/JavaScriptCore/wtf/wtf.pro and added to Source/WTF/WTF.pro
Comment 1 Simon Hausmann 2012-01-12 06:55:46 PST
Created attachment 122232 [details]
Patch
Comment 2 Simon Hausmann 2012-01-12 06:57:47 PST
With this patch it should be possible to move files from the old WTF location to the new one without changing the Qt build system, due to the use of VPATH in WTF.pro.

Files can be moved individually or in one big move, but each time qmake needs to be re-run on the bot for this to work :/. Either by touching the .pro/.pri file in the change or maybe through something else in the build system?
Comment 3 Tor Arne Vestbø 2012-01-12 07:02:29 PST
Comment on attachment 122232 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=122232&action=review

nice. i think the move will be in one go, so a single force-clean should be fine

> Source/WTF/WTF.pri:3
> +# and for targets that depend in some way on NEWWTF.

WTF, not NEWWTF
Comment 4 Simon Hausmann 2012-01-12 07:04:24 PST
(In reply to comment #3)
> (From update of attachment 122232 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=122232&action=review
> 
> nice. i think the move will be in one go, so a single force-clean should be fine

Ok. good.
 
> > Source/WTF/WTF.pri:3
> > +# and for targets that depend in some way on NEWWTF.
> 
> WTF, not NEWWTF

Oops, fixing.
Comment 5 Simon Hausmann 2012-01-12 07:04:51 PST
Created attachment 122235 [details]
Patch
Comment 6 Simon Hausmann 2012-01-12 07:22:25 PST
Committed r104825: <http://trac.webkit.org/changeset/104825>
Comment 7 Adam Barth 2012-01-12 12:28:58 PST
Comment on attachment 122235 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=122235&action=review

> Source/WTF/WTF.pro:13
> +VPATH += $$PWD/../JavaScriptCore/wtf

I like this approach.  @Eric: Can we do something similar for GTK?  They've got the same sort of variable-controlling-the-base-directory feature in their build system.
Comment 8 Eric Seidel (no email) 2012-01-12 12:43:17 PST
We talked about doing this for all the ports.  If it's easy to do for others, we definitely should.  It makes the final move trivial.