Bug 126216 – [GTK] [CMake] Clean up generated sources directories

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Martin Robinson]

We generate sources into inconsistent directories with forwarding headers into several places. We should clean up these directories so that we have:

DerivedSources/InjectedBundle/
DerivedSources/JavaScriptCore/
DerivedSources/MiniBrowser/
DerivedSources/WebCore/
DerivedSources/webkit
DerivedSources/WebKit2/
DerivedSources/webkit2gtk/
DerivedSources/webkitdom/

DerivedSources/ForwardingHeaders/JavaScriptCore
DerivedSources/ForwardingHeaders/WebCore
DerivedSources/ForwardingHeaders/WebKit2
DerivedSources/ForwardingHeaders/webkit2gtk
DerivedSources/ForwardingHeaders/webkit2gtk-webextension

Forwarding header directories can be shared by all targets that need forwarding headers.

[Martin Robinson]

Created attachment 219976 [details]
Patch

[WebKit Commit Bot]

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

[WebKit Commit Bot]

Attachment 219976 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WebCore/ChangeLog', u'Source/WebCore/PlatformGTK.cmake', u'Source/WebKit/ChangeLog', u'Source/WebKit/PlatformGTK.cmake', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/PlatformGTK.cmake', u'Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt', u'Source/cmake/OptionsGTK.cmake', u'Tools/ChangeLog', u'Tools/DumpRenderTree/PlatformGTK.cmake', u'Tools/GtkLauncher/CMakeLists.txt', u'Tools/MiniBrowser/gtk/CMakeLists.txt', u'Tools/TestWebKitAPI/CMakeLists.txt', u'Tools/TestWebKitAPI/PlatformEfl.cmake', u'Tools/TestWebKitAPI/PlatformGTK.cmake', u'Tools/WebKitTestRunner/CMakeLists.txt', u'Tools/WebKitTestRunner/PlatformEfl.cmake', u'Tools/WebKitTestRunner/PlatformGTK.cmake', u'Tools/gtk/generate-gtkdoc', '--commit-queue']" exit_code: 1
ERROR: Source/WebKit2/PlatformGTK.cmake:448:  The item "unix/PluginMainUnix.cpp" should be added only once to the list.  [list/duplicate] [5]
ERROR: Source/WebKit2/PlatformGTK.cmake:454:  Alphabetical sorting problem. "PluginProcess/PluginControllerProxy.messages.in" should be before "Shared/Plugins/NPObjectMessageReceiver.messages.in".  [list/order] [5]
Total errors found: 2 in 18 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Martin Robinson]

(In reply to comment #3)
> Attachment 219976 [details] did not pass style-queue:
> 
> Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WebCore/ChangeLog', u'Source/WebCore/PlatformGTK.cmake', u'Source/WebKit/ChangeLog', u'Source/WebKit/PlatformGTK.cmake', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/PlatformGTK.cmake', u'Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt', u'Source/cmake/OptionsGTK.cmake', u'Tools/ChangeLog', u'Tools/DumpRenderTree/PlatformGTK.cmake', u'Tools/GtkLauncher/CMakeLists.txt', u'Tools/MiniBrowser/gtk/CMakeLists.txt', u'Tools/TestWebKitAPI/CMakeLists.txt', u'Tools/TestWebKitAPI/PlatformEfl.cmake', u'Tools/TestWebKitAPI/PlatformGTK.cmake', u'Tools/WebKitTestRunner/CMakeLists.txt', u'Tools/WebKitTestRunner/PlatformEfl.cmake', u'Tools/WebKitTestRunner/PlatformGTK.cmake', u'Tools/gtk/generate-gtkdoc', '--commit-queue']" exit_code: 1
> ERROR: Source/WebKit2/PlatformGTK.cmake:448:  The item "unix/PluginMainUnix.cpp" should be added only once to the list.  [list/duplicate] [5]
> ERROR: Source/WebKit2/PlatformGTK.cmake:454:  Alphabetical sorting problem. "PluginProcess/PluginControllerProxy.messages.in" should be before "Shared/Plugins/NPObjectMessageReceiver.messages.in".  [list/order] [5]
> Total errors found: 2 in 18 files
> 

These are false positives. I'll clean them up in another patch.
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

[Martin Robinson]

Comment on attachment 219976 [details]
Patch

Clearing flags on attachment: 219976

Committed r161068: <http://trac.webkit.org/changeset/161068>

[Martin Robinson]

All reviewed patches have been landed.  Closing bug.