Bug 132956

Summary: [WK2] Change the remaining framework includes from WebKit2 to WebKit
Product: WebKit Reporter: Martin Hodovan <mhodovan.u-szeged>
Component: New BugsAssignee: Csaba Osztrogonác <ossy>
Status: RESOLVED FIXED    
Severity: Normal CC: andersca, berto, bunhere, cdumez, cgarcia, cmarcelo, commit-queue, gns, gyuyoung.kim, luiz, mitz, mrobinson, noam, ossy, sergio, zeno
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on: 132960    
Bug Blocks:    
Attachments:
Description Flags
Proposed patch
none
Patch none

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.