<!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>[184556] releases/WebKitGTK/webkit-2.4</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/184556">184556</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-19 00:24:49 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
https://bugs.webkit.org/show_bug.cgi?id=138134
Patch by Milan Crha <mcrha@redhat.com> on 2015-04-17
Reviewed by Carlos Garcia Campos.
.:
* GNUmakefile.am: Command line with expanded resources exceeds 32KB, which
is a limit on Windows. It's better to expand wildcards inside the
python script.
Source/WebInspectorUI:
* GNUmakefile.am: Command line with expanded resources exceeds 32KB, which
is a limit on Windows. It's better to expand wildcards inside the
python script.
Source/WebKit2:
* PlatformGTK.cmake: Command line with expanded resources exceeds 32KB, which
is a limit on Windows. It's better to expand wildcards inside the
python script.
Tools:
* gtk/generate-inspector-gresource-manifest.py:
(get_filenames): Command line with expanded resources exceeds 32KB, which
is a limit on Windows. It's better to expand wildcards inside the
python script.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24ChangeLog">releases/WebKitGTK/webkit-2.4/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24GNUmakefileam">releases/WebKitGTK/webkit-2.4/GNUmakefile.am</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebInspectorUIChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebInspectorUIGNUmakefileam">releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsChangeLog">releases/WebKitGTK/webkit-2.4/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkgenerateinspectorgresourcemanifestpy">releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-17 Milan Crha <mcrha@redhat.com>
+
+ [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
+ https://bugs.webkit.org/show_bug.cgi?id=138134
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: Command line with expanded resources exceeds 32KB, which
+ is a limit on Windows. It's better to expand wildcards inside the
+ python script.
+
</ins><span class="cx"> 2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
</span><span class="cx">
</span><span class="cx"> [W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24GNUmakefileam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/GNUmakefile.am (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/GNUmakefile.am 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/GNUmakefile.am 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -124,7 +124,6 @@
</span><span class="cx"> MAINTAINERCLEANFILES :=
</span><span class="cx"> pkgconfig_DATA :=
</span><span class="cx"> gdom_symbol_files :=
</span><del>-inspector_files :=
</del><span class="cx">
</span><span class="cx"> if ENABLE_INTROSPECTION
</span><span class="cx"> gir_DATA :=
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-17 Milan Crha <mcrha@redhat.com>
+
+ [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
+ https://bugs.webkit.org/show_bug.cgi?id=138134
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: Command line with expanded resources exceeds 32KB, which
+ is a limit on Windows. It's better to expand wildcards inside the
+ python script.
+
</ins><span class="cx"> 2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
</span><span class="cx">
</span><span class="cx"> [W32] Buildsystem may use wrong Python interpreter
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebInspectorUIGNUmakefileam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -1,4 +1,14 @@
</span><del>-inspector_files += \
</del><ins>+inspector_files = \
+ "$(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js" \
+ "$(WebInspectorUI)/UserInterface/*.html" \
+ "$(WebInspectorUI)/UserInterface/*.js" \
+ "$(WebInspectorUI)/UserInterface/*.css" \
+ "$(WebInspectorUI)/UserInterface/Images/gtk/*.png" \
+ "$(WebInspectorUI)/UserInterface/Images/gtk/*.svg" \
+ "$(WebInspectorUI)/UserInterface/External/CodeMirror/*.js" \
+ "$(WebInspectorUI)/UserInterface/External/CodeMirror/*.css"
+
+inspector_files_dependencies = \
</ins><span class="cx"> $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
</span><span class="cx"> $(shell ls $(WebInspectorUI)/UserInterface/*.html) \
</span><span class="cx"> $(shell ls $(WebInspectorUI)/UserInterface/*.js) \
</span><span class="lines">@@ -9,7 +19,7 @@
</span><span class="cx"> $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*.css)
</span><span class="cx">
</span><span class="cx"> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
</span><del>- $(inspector_files) \
</del><ins>+ $(inspector_files_dependencies) \
</ins><span class="cx"> $(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
</span><span class="cx"> $(AM_V_GEN)
</span><span class="cx"> $(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
</span><span class="lines">@@ -27,11 +37,4 @@
</span><span class="cx"> DerivedSources/WebInspectorUI/GResourceBundle.c
</span><span class="cx">
</span><span class="cx"> EXTRA_DIST += \
</span><del>- $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
- $(shell ls $(WebInspectorUI)/UserInterface/*.html) \
- $(shell ls $(WebInspectorUI)/UserInterface/*.js) \
- $(shell ls $(WebInspectorUI)/UserInterface/*.css) \
- $(shell ls $(WebInspectorUI)/UserInterface/Images/gtk/*.png) \
- $(shell ls $(WebInspectorUI)/UserInterface/Images/gtk/*.svg) \
- $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*.js) \
- $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*.css)
</del><ins>+ $(inspector_files_dependencies)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-17 Milan Crha <mcrha@redhat.com>
+
+ [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
+ https://bugs.webkit.org/show_bug.cgi?id=138134
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake: Command line with expanded resources exceeds 32KB, which
+ is a limit on Windows. It's better to expand wildcards inside the
+ python script.
+
</ins><span class="cx"> 2015-05-18 Alexander Tsoy <alexander@tsoy.me>
</span><span class="cx">
</span><span class="cx"> [GTK] fails to build with --disable-accelerated-compositing
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
</span><span class="cx"> )
</span><span class="cx">
</span><del>-file(GLOB InspectorFiles
</del><ins>+set(InspectorFiles
</ins><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.css
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*
</span><span class="lines">@@ -379,6 +379,10 @@
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.js
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+file(GLOB InspectorFilesDependencies
+ ${InspectorFiles}
+)
+
</ins><span class="cx"> # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
</span><span class="cx"> list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
</span><span class="cx"> "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
</span><span class="lines">@@ -481,7 +485,7 @@
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</span><del>- DEPENDS ${InspectorFiles}
</del><ins>+ DEPENDS ${InspectorFilesDependencies}
</ins><span class="cx"> ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
</span><span class="cx"> COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
</span><span class="cx"> VERBATIM
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-17 Milan Crha <mcrha@redhat.com>
+
+ [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
+ https://bugs.webkit.org/show_bug.cgi?id=138134
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/generate-inspector-gresource-manifest.py:
+ (get_filenames): Command line with expanded resources exceeds 32KB, which
+ is a limit on Windows. It's better to expand wildcards inside the
+ python script.
+
</ins><span class="cx"> 2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>
</span><span class="cx">
</span><span class="cx"> [W32] Buildsystem may use wrong Python interpreter
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkgenerateinspectorgresourcemanifestpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py (184555 => 184556)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py 2015-05-19 07:22:36 UTC (rev 184555)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py 2015-05-19 07:24:49 UTC (rev 184556)
</span><span class="lines">@@ -16,6 +16,7 @@
</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><ins>+import glob
</ins><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><span class="lines">@@ -26,10 +27,17 @@
</span><span class="cx"> def get_filenames(args):
</span><span class="cx"> filenames = []
</span><span class="cx">
</span><del>- 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):])
</del><ins>+ for pattern in args:
+ paths = glob.glob(pattern)
+ for filename in paths:
+ base_dir_index = filename.rfind(BASE_DIR)
+ if base_dir_index != -1:
+ name = filename[base_dir_index + len(BASE_DIR):]
+ # The result should use forward slashes, thus make sure any os-specific
+ # separator, added by the glob.glob() call, is properly replaced
+ if os.sep != '/':
+ name = name.replace(os.sep, '/')
+ filenames.append(name)
</ins><span class="cx"> return filenames
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>