Bug 182274 - [CMake] Make WTF headers copies
Summary: [CMake] Make WTF headers copies
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Don Olmstead
URL:
Keywords: InRadar
Depends on:
Blocks: 180064
  Show dependency treegraph
 
Reported: 2018-01-29 18:34 PST by Don Olmstead
Modified: 2018-02-02 07:02 PST (History)
8 users (show)

See Also:


Attachments
Patch (13.33 KB, patch)
2018-01-29 19:28 PST, Don Olmstead
no flags Details | Formatted Diff | Diff
Patch (14.26 KB, patch)
2018-01-29 19:57 PST, Don Olmstead
no flags Details | Formatted Diff | Diff
Archive of layout-test-results from ews122 for ios-simulator-wk2 (2.14 MB, application/zip)
2018-01-29 21:25 PST, EWS Watchlist
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Don Olmstead 2018-01-29 18:34:55 PST
WTF headers should be copied during the build to match the behavior of Apple ports.
Comment 1 Don Olmstead 2018-01-29 19:28:07 PST
Created attachment 332620 [details]
Patch

Trying the bots
Comment 2 EWS Watchlist 2018-01-29 19:30:20 PST
Attachment 332620 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/CMakeLists.txt:236:  Alphabetical sorting problem. "UniStdExtras.h" should be before "UniqueRef.h".  [list/order] [5]
Total errors found: 1 in 9 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Don Olmstead 2018-01-29 19:57:56 PST
Created attachment 332623 [details]
Patch

Hopefully make GTK and WPE happy
Comment 4 Don Olmstead 2018-01-29 20:50:13 PST
Comment on attachment 332623 [details]
Patch

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

So this adds all header files explicitly to the forwarding headers and copies all of them across all CMake ports.

> Source/WTF/wtf/CMakeLists.txt:246
> +    WindowsExtras.h

All files within the root of Source/WTF/wtf are added into this WTF_HEADERS value.

There is another bug, https://bugs.webkit.org/show_bug.cgi?id=182275,  where some of these should really be moved into platform specific directories and included explicitly.

> Source/WebDriver/CMakeLists.txt:6
> +    "${FORWARDING_HEADERS_DIR}"

In here and in gtest the FORWARDING_HEADERS_DIR is added explicitly.

I'm not happy about this but currently WTF has both #include <> and #include "" within its headers. Adding the FORWARDING_HEADERS_DIR within the WTF_INCLUDE_DIRECTORIES would possibly result in some ambiguous includes. So I'm trying to avoid it. Not sure if there's another way in CMake to add a dependent include path that only affects dependent projects.

The real fix is to just flatten WTF but this is really a first step towards that.
Comment 5 EWS Watchlist 2018-01-29 21:25:08 PST
Comment on attachment 332623 [details]
Patch

Attachment 332623 [details] did not pass ios-sim-ews (ios-simulator-wk2):
Output: http://webkit-queues.webkit.org/results/6256939

New failing tests:
imported/w3c/web-platform-tests/service-workers/service-worker/navigation-redirect.https.html
Comment 6 EWS Watchlist 2018-01-29 21:25:09 PST
Created attachment 332628 [details]
Archive of layout-test-results from ews122 for ios-simulator-wk2

The attached test failures were seen while running run-webkit-tests on the ios-sim-ews.
Bot: ews122  Port: ios-simulator-wk2  Platform: Mac OS X 10.12.6
Comment 7 Don Olmstead 2018-01-30 12:02:19 PST
Comment on attachment 332623 [details]
Patch

Clearing flags on attachment: 332623

Committed r227845: <https://trac.webkit.org/changeset/227845>
Comment 8 Don Olmstead 2018-01-30 12:02:21 PST
All reviewed patches have been landed.  Closing bug.
Comment 9 Radar WebKit Bug Importer 2018-01-30 12:04:24 PST
<rdar://problem/37037670>
Comment 10 Csaba Osztrogonác 2018-01-30 14:37:20 PST
(In reply to Don Olmstead from comment #7)
> Comment on attachment 332623 [details]
> Patch
> 
> Clearing flags on attachment: 332623
> 
> Committed r227845: <https://trac.webkit.org/changeset/227845>

FYI, it broke JSCOnly builds. See build.webkit.org for details.
Comment 11 Don Olmstead 2018-01-30 15:13:29 PST
Committed r227861: <https://trac.webkit.org/changeset/227861>
Comment 12 Konstantin Tokarev 2018-02-02 05:47:42 PST
Comment on attachment 332623 [details]
Patch

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

> Source/WTF/wtf/CMakeLists.txt:-363
> -endif ()

This breaks build of non-Mac ports on macOS
Comment 13 Konstantin Tokarev 2018-02-02 07:02:07 PST
Committed r228007: <https://trac.webkit.org/changeset/228007>