Bug 125569

Summary: [GTK][CMake] Integrate GResource for inspector files (and others?)
Product: WebKit Reporter: Gustavo Noronha (kov) <gustavo>
Component: WebKitGTKAssignee: Martin Robinson <mrobinson>
Status: RESOLVED FIXED    
Severity: Normal CC: cdumez, cgarcia, commit-queue, gyuyoung.kim, mrobinson, rakuco, zan
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 115966    
Attachments:
Description Flags
Patch none

Gustavo Noronha (kov)
Reported 2013-12-11 06:09:07 PST
SSIA
Attachments
Patch (11.61 KB, patch)
2013-12-22 09:17 PST, Martin Robinson 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Martin Robinson
Comment 1 2013-12-22 09:17:41 PST
Created attachment 219875 [details] Patch
WebKit Commit Bot
Comment 2 2013-12-22 09:19:05 PST
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
Comment 3 2013-12-22 09:19:13 PST
Attachment 219875 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebInspectorUI/ChangeLog', u'Source/WebInspectorUI/GNUmakefile.am', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/GNUmakefile.am', u'Source/WebKit2/PlatformGTK.cmake', u'Source/WebKit2/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml', u'Tools/ChangeLog', u'Tools/gtk/generate-inspector-gresource-manifest.py', '--commit-queue']" exit_code: 1 ERROR: Source/WebKit2/PlatformGTK.cmake:363: Alphabetical sorting problem. "fake-installed-webextension-headers" should be before "soup-forwarding-headers". [list/order] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:460: The item "unix/PluginMainUnix.cpp" should be added only once to the list. [list/duplicate] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:466: Alphabetical sorting problem. "PluginProcess/PluginControllerProxy.messages.in" should be before "Shared/Plugins/NPObjectMessageReceiver.messages.in". [list/order] [5] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style.
Martin Robinson
Comment 4 2013-12-22 09:30:27 PST
(In reply to comment #3) > If any of these errors are false positives, please file a bug against check-webkit-style. These style errors were not introduced by this patch. I'll fix them in another patch.
Gustavo Noronha (kov)
Comment 5 2013-12-22 12:47:09 PST
Comment on attachment 219875 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219875&action=review > Source/WebInspectorUI/GNUmakefile.am:11 > + $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py $@ Nice =) maybe you should depend on the script as well. > Source/WebKit2/GNUmakefile.am:27 > $(AM_V_at)glib-compile-resources --generate --sourcedir=$(WebKit2)/UIProcess/InspectorServer/front-end \ > - --target=${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml > - > -BUILT_SOURCES += \ > - DerivedSources/WebInspectorUI/WebKit2GResourceBundle.xml > + --target=${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c $(WebKit2)/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml Makes so much more sense. Why did I add that many echo calls instead of shipping this file I know not.
Martin Robinson
Comment 6 2013-12-22 22:05:20 PST
Committed r160985: <http://trac.webkit.org/changeset/160985>
Martin Robinson
Comment 7 2013-12-22 22:05:30 PST
Comment on attachment 219875 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219875&action=review >> Source/WebInspectorUI/GNUmakefile.am:11 >> + $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py $@ > > Nice =) maybe you should depend on the script as well. Nice catch! Thanks for the review.
Note You need to log in before you can comment on or make changes to this bug.