<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166648] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166648">166648</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-02 08:38:40 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/165704">r165704</a>): [GTK] Inspector resources not correctly generated
https://bugs.webkit.org/show_bug.cgi?id=130343
Patch by Martin Robinson <mrobinson@igalia.com> on 2014-04-02
Reviewed by Gustavo Noronha Silva.
.:
* CMakeLists.txt: Add a variable which points to the directory to store WebInspectorUI
derived sources.
* Source/cmake/WebKitFS.cmake: Generate WebInspectorUI derived sources directories.
Source/JavaScriptCore:
* CMakeLists.txt: We generate the inspector JavaScript file into a directory like the one
in which it should be distributed. This allows us to more easily package it for GTK+.
Source/WebCore:
* CMakeLists.txt: Generate the web inspector JS file into the new WebInspectorUI derived sources
directory.
Source/WebKit2:
* PlatformGTK.cmake: Pass all appropriate directories to the
GResources XML generation script.
Tools:
* gtk/generate-inspector-gresource-manifest.py: Instead of hard-coding the file list, accept a list
of directories on the command line and look for all appropriate files in those directories for the
GResource archive. Also make archive paths relative to those directories.
(find_all_files_in_directory): This helper looks for all the appropriate files in a given directory.
(find_all_files_in_directory.select_file): Whether or not to add the file to the archive.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFScmake">trunk/Source/cmake/WebKitFS.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkgenerateinspectorgresourcemanifestpy">trunk/Tools/gtk/generate-inspector-gresource-manifest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/CMakeLists.txt 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
</span><span class="cx"> set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
</span><span class="cx"> set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
</span><ins>+set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/ChangeLog 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-02 Martin Robinson <mrobinson@igalia.com>
+
+ REGRESSION(r165704): [GTK] Inspector resources not correctly generated
+ https://bugs.webkit.org/show_bug.cgi?id=130343
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Add a variable which points to the directory to store WebInspectorUI
+ derived sources.
+ * Source/cmake/WebKitFS.cmake: Generate WebInspectorUI derived sources directories.
+
</ins><span class="cx"> 2014-04-01 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Drop port check from FindEGL.cmake.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -842,10 +842,17 @@
</span><span class="cx">
</span><span class="cx"> # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendCommands.js
</del><ins>+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
</ins><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
</span><del>- DEPENDS ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_type JavaScript --write_always && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector
</del><ins>+ DEPENDS ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py
+ ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type JavaScript --write_always && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> # JSCBuiltins
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-02 Martin Robinson <mrobinson@igalia.com>
+
+ REGRESSION(r165704): [GTK] Inspector resources not correctly generated
+ https://bugs.webkit.org/show_bug.cgi?id=130343
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: We generate the inspector JavaScript file into a directory like the one
+ in which it should be distributed. This allows us to more easily package it for GTK+.
+
</ins><span class="cx"> 2014-04-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove HeapProfiler from the Web Inspector protocol.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -3031,10 +3031,19 @@
</span><span class="cx">
</span><span class="cx"> # All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendCommands.js
</del><ins>+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.h
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.h
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.h
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
</ins><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
</span><del>- DEPENDS ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
- COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_type Web --write_always
</del><ins>+ DEPENDS ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py
+ ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
+ COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type Web --write_always
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/WebCore/ChangeLog 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-02 Martin Robinson <mrobinson@igalia.com>
+
+ REGRESSION(r165704): [GTK] Inspector resources not correctly generated
+ https://bugs.webkit.org/show_bug.cgi?id=130343
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Generate the web inspector JS file into the new WebInspectorUI derived sources
+ directory.
+
</ins><span class="cx"> 2014-04-02 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after r166642.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-02 Martin Robinson <mrobinson@igalia.com>
+
+ REGRESSION(r165704): [GTK] Inspector resources not correctly generated
+ https://bugs.webkit.org/show_bug.cgi?id=130343
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Pass all appropriate directories to the
+ GResources XML generation script.
+
</ins><span class="cx"> 2014-04-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move NEWS file to a new location
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> set(WebKit2_USE_PREFIX_HEADER ON)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_SOURCES
</span><del>- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
</del><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
</span><ins>+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
</ins><span class="cx">
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
</span><span class="lines">@@ -378,8 +378,8 @@
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.png
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.svg
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendCommands.js
- ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendCommands.js
</del><ins>+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
</span><span class="lines">@@ -486,15 +486,14 @@
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</span><span class="cx"> DEPENDS ${InspectorFiles}
</span><span class="cx"> ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
</span><del>- COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</del><ins>+ COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}
</ins><span class="cx"> VERBATIM
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
</span><span class="cx"> DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</span><del>- ${InspectorFiles}
- COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</del><ins>+ COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI --sourcedir=${DERIVED_SOURCES_WEBINSPECTORUI_DIR} --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</ins><span class="cx"> VERBATIM
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFScmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFS.cmake (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFS.cmake 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Source/cmake/WebKitFS.cmake 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -1,6 +1,10 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
</span><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
</span><span class="cx">
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/Protocol)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
+
</ins><span class="cx"> if (ENABLE_WEBCORE)
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Tools/ChangeLog 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-02 Martin Robinson <mrobinson@igalia.com>
+
+ REGRESSION(r165704): [GTK] Inspector resources not correctly generated
+ https://bugs.webkit.org/show_bug.cgi?id=130343
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/generate-inspector-gresource-manifest.py: Instead of hard-coding the file list, accept a list
+ of directories on the command line and look for all appropriate files in those directories for the
+ GResource archive. Also make archive paths relative to those directories.
+ (find_all_files_in_directory): This helper looks for all the appropriate files in a given directory.
+ (find_all_files_in_directory.select_file): Whether or not to add the file to the archive.
+
</ins><span class="cx"> 2014-04-02 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [webkitpy] Avoid multiple "Preparing rollout for bug" log messages
</span></span></pre></div>
<a id="trunkToolsgtkgenerateinspectorgresourcemanifestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/generate-inspector-gresource-manifest.py (166647 => 166648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-04-02 15:29:20 UTC (rev 166647)
+++ trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-04-02 15:38:40 UTC (rev 166648)
</span><span class="lines">@@ -15,38 +15,48 @@
</span><span class="cx"> # License along with this library; if not, write to the Free Software
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><del>-import common
</del><ins>+import argparse
</ins><span class="cx"> import glob
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-resources_path = common.top_level_path() + "/Source/WebInspectorUI/"
-inspector_files = \
- glob.glob(resources_path + 'UserInterface/*.html') + \
- glob.glob(resources_path + 'UserInterface/Base/*.js') + \
- glob.glob(resources_path + 'UserInterface/Controllers/*.css') + \
- glob.glob(resources_path + 'UserInterface/Controllers/*.js') + \
- glob.glob(resources_path + 'UserInterface/Models/*.js') + \
- glob.glob(resources_path + 'UserInterface/Protocol/*.js') + \
- glob.glob(resources_path + 'UserInterface/Views/*.css') + \
- glob.glob(resources_path + 'UserInterface/Views/*.js') + \
- glob.glob(resources_path + 'UserInterface/Images/*.png') + \
- glob.glob(resources_path + 'UserInterface/Images/*.svg') + \
- glob.glob(resources_path + 'UserInterface/External/CodeMirror/*') + \
- glob.glob(resources_path + 'Localizations/en.lproj/localizedStrings.js')
</del><ins>+ALLOWED_EXTENSIONS = ['.html', '.js', '.css', '.png', '.svg']
</ins><span class="cx">
</span><del>-gresources_file_content = \
-"""<?xml version=1.0 encoding=UTF-8?>
-<gresources>
- <gresource prefix="/org/webkitgtk/inspector">
-"""
</del><span class="cx">
</span><del>-for file in inspector_files:
- gresources_file_content += " <file>" + file.replace(resources_path, '') + "</file>\n"
</del><ins>+def find_all_files_in_directory(directory):
+ directory = os.path.abspath(directory) + os.path.sep
+ to_return = []
</ins><span class="cx">
</span><del>-gresources_file_content += \
-""" </gresource>
</del><ins>+ def select_file(name):
+ return os.path.splitext(name)[1] in ALLOWED_EXTENSIONS
+
+ for root, dirs, files in os.walk(directory):
+ files = filter(select_file, files)
+ for file_name in files:
+ file_name = os.path.abspath(os.path.join(root, file_name))
+ to_return.append(file_name.replace(directory, ''))
+
+ return to_return
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser(description='Generate a GResources file for the inspector.')
+ parser.add_argument('--output', nargs='?', type=argparse.FileType('w'), default=sys.stdout,
+ help='the output file')
+
+ arguments, extra_args = parser.parse_known_args(sys.argv)
+
+ arguments.output.write(\
+ """<?xml version=1.0 encoding=UTF-8?>
+ <gresources>
+ <gresource prefix="/org/webkitgtk/inspector">
+""")
+
+ for directory in extra_args[1:]:
+ for file in find_all_files_in_directory(directory):
+ arguments.output.write(" <file>%s</file>\n" % file)
+
+ arguments.output.write(\
+ """ </gresource>
</ins><span class="cx"> </gresources>
</span><del>-"""
</del><ins>+""")
</ins><span class="cx">
</span><del>-open(sys.argv[1], 'w').write(gresources_file_content)
</del></span></pre>
</div>
</div>
</body>
</html>