Bug 79960 – Update JavaScriptCore files to use fully-qualified WTF include path

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Eric Seidel (no email)]

Update JavaScriptCore files to use fully-qualified WTF include path

[Eric Seidel (no email)]

Created attachment 129557 [details]
Patch

[Eric Seidel (no email)]

Oops.  I guess I can't land this w/o making wtf install its headers in the expected place first. :(

[Eric Seidel (no email)]

Created attachment 130207 [details]
If this passes Mac/Win EWS it can be landed.

[Eric Seidel (no email)]

I've updated the patch to make Mac and Win builds install the wtf headers in such a way so that full-path wtf includes can be used, such as #include <wtf/text/Foo.h>

[Eric Seidel (no email)]

I've emailed Mark Rowe for comment on my approach with the Win build.  The Mac build adjustments just re-use a build phase from WTF.xcodeproj (which I believe he wrote).

In either case, if Win-EWS passes, we should be able to land this and let the AppleWin folks iterate from here, w/o blocking the rest of the ports from moving WTF.

[Eric Seidel (no email)]

GREEN!  Hit me with your best reviewzor.

[Eric Seidel (no email)]

The next patch after this one will deploy fully-qualified paths for wtf includes everywhere. :)

[Build Bot]

Comment on attachment 130207 [details]
If this passes Mac/Win EWS it can be landed.

Attachment 130207 [details] did not pass mac-ews (mac):
Output: http://queues.webkit.org/results/11836001

[Eric Seidel (no email)]

Created attachment 130233 [details]
Should work on all platforms now

[Adam Barth]

Comment on attachment 130233 [details]
Should work on all platforms now

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

Looks reasonable.  My understanding is that you've discussed the general approach with Mark Rowe and he's happy with it.  We can always fine-tune later if necessary.

> Source/JavaScriptCore/ChangeLog:18
> +         5. Makes build-webkit build the WTF XCode project by default.

This one seems like it could be separate since it's a Tool-only change.

[Eric Seidel (no email)]

The Mac approach has been discussed (and approved) with mrowe in great detail.  The Windows has been addressed in email but not fully negotiated, but since it builds I think it's safe to move forward as is and tweak as necessary after landing.  Mark has previously mentioned that he will likely need to do some production tweaks to at least Mac, if not Win after this all goes down.

The end result of this change is that Mac and Win now build "more like" other ports in that they have multi-level WTF includes, instead of always flattening.  Once I fix the WTF header includes I believe we can remove the ForwardingHeaders for WTF headers.  The removal of forwarding headers is largely orthogonal to the actual moving of the WTF files out of JavaScriptCore, but this patch moves us closer to both.

[Mark Rowe (bdash)]

Comment on attachment 130233 [details]
Should work on all platforms now

The sorting of #include's needs to be fixed at some point after this change.

[Eric Seidel (no email)]

OK, can do.  There are a bunch more changing in my next patch, but I'm happy to make a sorting pass.

[Eric Seidel (no email)]

Comment on attachment 130233 [details]
Should work on all platforms now

Thanks everyone!  I'll post block the next patch on this one so it's easy to follow the bug trail.

[Eric Seidel (no email)]

I've uploaded a patch which makes all public WTF headers use fully-qualified include paths on bug 80363.  I've blocked it on the master bug instead of this one.

[WebKit Review Bot]

Comment on attachment 130233 [details]
Should work on all platforms now

Clearing flags on attachment: 130233

Committed r109837: <http://trac.webkit.org/changeset/109837>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.