Bug 132956 - [WK2] Change the remaining framework includes from WebKit2 to WebKit
Summary: [WK2] Change the remaining framework includes from WebKit2 to WebKit
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Csaba Osztrogonác
URL:
Keywords:
Depends on: 132960
Blocks:
  Show dependency tree / graph
 
Reported: 2014-05-15 08:14 PDT by Martin Hodovan
Modified: 2014-05-16 01:54 PDT (History)
16 users (show)

See Also:

Attachments
Proposed patch (165.14 KB, patch)
2014-05-15 08:20 PDT, Martin Hodovan 		no flags Details | Formatted Diff | Diff
Patch (165.94 KB, patch)
2014-05-16 01:35 PDT, Csaba Osztrogonác 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Hodovan 2014-05-15 08:14:49 PDT 
[WK2] Change the remaining framework includes from WebKit2 to WebKit
Previous modifications:

Rename WebKit2.framework to WebKit.framework
https://trac.webkit.org/changeset/168541

[WK2] Make generate-forwarding-headers.pl work after WebKit2.framework -> WebKit.framework rename
https://trac.webkit.org/changeset/168525
Comment 1 Martin Hodovan 2014-05-15 08:20:42 PDT 
Created attachment 231516 [details]
Proposed patch
Comment 2 WebKit Commit Bot 2014-05-15 08:23:28 PDT 
Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API
Comment 3 Csaba Osztrogonác 2014-05-15 08:46:55 PDT 
It seems GTK's cmake system is buggy:

... Source/WebKit2/Scripts/generate-forwarding-headers.pl ...

[snip]

In file included from ../../Tools/TestWebKitAPI/gtk/main.cpp:26:0:
../../Tools/TestWebKitAPI/config.h:68:30: fatal error: WebKit/WebKit2_C.h: No such file or directory

 In file included from ../../Tools/TestWebKitAPI/TestsController.cpp:26:0:
../../Tools/TestWebKitAPI/config.h:68:30: fatal error: WebKit/WebKit2_C.h: No such file or directory
 
 In file included from ../../Tools/TestWebKitAPI/Tests/JavaScriptCore/VMInspector.cpp:26:0:
../../Tools/TestWebKitAPI/config.h:68:30: fatal error: WebKit/WebKit2_C.h: No such file or directory
 
[snip]
 
[Creating forwarding header for WebKit/UIProcess/API/C/WebKit2_C.h]

-----

generate-forwarding-headers.pl must run before everything else.
This dependency should be fixed, because it can cause flakey
build failures. Could you file a new bug report for it?
Comment 4 Csaba Osztrogonác 2014-05-16 01:35:16 PDT 
Created attachment 231562 [details]
Patch

patch for landing, I think GTK EWS will be happy now, because it generated the necessary forwarding headers due to the previous patch.
Comment 5 Csaba Osztrogonác 2014-05-16 01:53:59 PDT 
Comment on attachment 231516 [details]
Proposed patch

Clearing flags on attachment: 231516

Committed r168961: <http://trac.webkit.org/changeset/168961>
Comment 6 Csaba Osztrogonác 2014-05-16 01:54:09 PDT 
All reviewed patches have been landed.  Closing bug.