<!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>[173751] 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/173751">173751</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-19 02:21:16 -0700 (Fri, 19 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] generate-inspector-gresource-manifest.py should receive the list of files from the makefile
https://bugs.webkit.org/show_bug.cgi?id=136943
Reviewed by Philippe Normand.
Source/WebKit2:
* PlatformGTK.cmake: Fix the inspector file list and pass it to
the generate-inspector-gresource-manifest.py script.
Tools:
Update the script to receive the list of files from the command
line instead of scanning the given directories.
* gtk/generate-inspector-gresource-manifest.py:
(get_filenames): Convert filenames to use relative paths.
(find_all_files_in_directory): Deleted.
(find_all_files_in_directory.select_file): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173750 => 173751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-19 06:58:54 UTC (rev 173750)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-19 09:21:16 UTC (rev 173751)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] generate-inspector-gresource-manifest.py should receive the list of files from the makefile
+ https://bugs.webkit.org/show_bug.cgi?id=136943
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Fix the inspector file list and pass it to
+ the generate-inspector-gresource-manifest.py script.
+
</ins><span class="cx"> 2014-09-18 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Dot not allow to create delete-on-destroy GMainLoopSources
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (173750 => 173751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-09-19 06:58:54 UTC (rev 173750)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-09-19 09:21:16 UTC (rev 173751)
</span><span class="lines">@@ -372,12 +372,13 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> file(GLOB InspectorFiles
</span><del>- ${CMAKE_SOURCE_DIR}/Source/Localizations/en.lproj/localizedStrings.js
</del><ins>+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
</ins><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.js
</span><del>- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*
</del><ins>+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.css
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.js
</ins><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Protocol/*.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.css
</span><span class="lines">@@ -496,7 +497,7 @@
</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 --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}
</del><ins>+ COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles}
</ins><span class="cx"> VERBATIM
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173750 => 173751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-19 06:58:54 UTC (rev 173750)
+++ trunk/Tools/ChangeLog 2014-09-19 09:21:16 UTC (rev 173751)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] generate-inspector-gresource-manifest.py should receive the list of files from the makefile
+ https://bugs.webkit.org/show_bug.cgi?id=136943
+
+ Reviewed by Philippe Normand.
+
+ Update the script to receive the list of files from the command
+ line instead of scanning the given directories.
+
+ * gtk/generate-inspector-gresource-manifest.py:
+ (get_filenames): Convert filenames to use relative paths.
+ (find_all_files_in_directory): Deleted.
+ (find_all_files_in_directory.select_file): Deleted.
+
</ins><span class="cx"> 2014-09-18 Tanay C <tanay.c@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Minibrowser : Support Zoom on Control key + scroll
</span></span></pre></div>
<a id="trunkToolsgtkgenerateinspectorgresourcemanifestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/generate-inspector-gresource-manifest.py (173750 => 173751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-09-19 06:58:54 UTC (rev 173750)
+++ trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-09-19 09:21:16 UTC (rev 173751)
</span><span class="lines">@@ -16,30 +16,23 @@
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><span class="cx"> import argparse
</span><del>-import glob
</del><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-ALLOWED_EXTENSIONS = ['.html', '.js', '.css', '.png', '.svg']
</del><span class="cx"> COMPRESSIBLE_EXTENSIONS = ['.html', '.js', '.css', '.svg']
</span><ins>+BASE_DIR = 'WebInspectorUI/'
</ins><span class="cx">
</span><span class="cx">
</span><del>-def find_all_files_in_directory(directory):
- directory = os.path.abspath(directory) + os.path.sep
- to_return = []
</del><ins>+def get_filenames(args):
+ filenames = []
</ins><span class="cx">
</span><del>- def select_file(name):
- return os.path.splitext(name)[1] in ALLOWED_EXTENSIONS
</del><ins>+ for filename in args:
+ base_dir_index = filename.rfind(BASE_DIR)
+ if base_dir_index != -1:
+ filenames.append(filename[base_dir_index + len(BASE_DIR):])
+ return filenames
</ins><span class="cx">
</span><del>- 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, ''))
</del><span class="cx">
</span><del>- return to_return
-
-
</del><span class="cx"> def is_compressible(filename):
</span><span class="cx"> return os.path.splitext(filename)[1] in COMPRESSIBLE_EXTENSIONS
</span><span class="cx">
</span><span class="lines">@@ -48,25 +41,26 @@
</span><span class="cx"> parser = argparse.ArgumentParser(description='Generate a GResources file for the inspector.')
</span><span class="cx"> parser.add_argument('--output', nargs='?', type=argparse.FileType('w'), default=sys.stdout,
</span><span class="cx"> help='the output file')
</span><ins>+ parser.add_argument('filenames', metavar='FILES', nargs='+',
+ help='the list of files to include')
</ins><span class="cx">
</span><del>- arguments, extra_args = parser.parse_known_args(sys.argv)
</del><ins>+ args = parser.parse_args(sys.argv[1:])
</ins><span class="cx">
</span><del>- arguments.output.write(\
</del><ins>+ args.output.write(\
</ins><span class="cx"> """<?xml version=1.0 encoding=UTF-8?>
</span><span class="cx"> <gresources>
</span><span class="cx"> <gresource prefix="/org/webkitgtk/inspector">
</span><span class="cx"> """)
</span><span class="cx">
</span><del>- for directory in extra_args[1:]:
- for filename in find_all_files_in_directory(directory):
- line = ' <file'
- if is_compressible(filename):
- line += ' compressed="true"'
- line += '>%s</file>\n' % filename
</del><ins>+ for filename in get_filenames(args.filenames):
+ line = ' <file'
+ if is_compressible(filename):
+ line += ' compressed="true"'
+ line += '>%s</file>\n' % filename
</ins><span class="cx">
</span><del>- arguments.output.write(line)
</del><ins>+ args.output.write(line)
</ins><span class="cx">
</span><del>- arguments.output.write(\
</del><ins>+ args.output.write(\
</ins><span class="cx"> """ </gresource>
</span><span class="cx"> </gresources>
</span><span class="cx"> """)
</span></span></pre>
</div>
</div>
</body>
</html>