- Revision
- 184556
- Author
- carlo...@webkit.org
- Date
- 2015-05-19 00:24:49 -0700 (Tue, 19 May 2015)
Log Message
[GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
https://bugs.webkit.org/show_bug.cgi?id=138134
Patch by Milan Crha <mc...@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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (184555 => 184556)
--- 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)
@@ -1,3 +1,14 @@
+2015-04-17 Milan Crha <mc...@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.
+
2015-04-15 Руслан Ижбулатов <lrn1...@gmail.com>
[W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
Modified: releases/WebKitGTK/webkit-2.4/GNUmakefile.am (184555 => 184556)
--- 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)
@@ -124,7 +124,6 @@
MAINTAINERCLEANFILES :=
pkgconfig_DATA :=
gdom_symbol_files :=
-inspector_files :=
if ENABLE_INTROSPECTION
gir_DATA :=
Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog (184555 => 184556)
--- 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)
@@ -1,3 +1,14 @@
+2015-04-17 Milan Crha <mc...@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.
+
2015-04-15 Руслан Ижбулатов <lrn1...@gmail.com>
[W32] Buildsystem may use wrong Python interpreter
Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am (184555 => 184556)
--- 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)
@@ -1,4 +1,14 @@
-inspector_files += \
+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 = \
$(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
$(shell ls $(WebInspectorUI)/UserInterface/*.html) \
$(shell ls $(WebInspectorUI)/UserInterface/*.js) \
@@ -9,7 +19,7 @@
$(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*.css)
${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
- $(inspector_files) \
+ $(inspector_files_dependencies) \
$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
$(AM_V_GEN)
$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
@@ -27,11 +37,4 @@
DerivedSources/WebInspectorUI/GResourceBundle.c
EXTRA_DIST += \
- $(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)
+ $(inspector_files_dependencies)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (184555 => 184556)
--- 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)
@@ -1,3 +1,14 @@
+2015-04-17 Milan Crha <mc...@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.
+
2015-05-18 Alexander Tsoy <alexan...@tsoy.me>
[GTK] fails to build with --disable-accelerated-compositing
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (184555 => 184556)
--- 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)
@@ -369,7 +369,7 @@
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
)
-file(GLOB InspectorFiles
+set(InspectorFiles
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.css
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*
@@ -379,6 +379,10 @@
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.js
)
+file(GLOB InspectorFilesDependencies
+ ${InspectorFiles}
+)
+
# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
"${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
@@ -481,7 +485,7 @@
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
- DEPENDS ${InspectorFiles}
+ DEPENDS ${InspectorFilesDependencies}
${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
VERBATIM
Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (184555 => 184556)
--- 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)
@@ -1,3 +1,15 @@
+2015-04-17 Milan Crha <mc...@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.
+
2015-04-15 Руслан Ижбулатов <lrn1...@gmail.com>
[W32] Buildsystem may use wrong Python interpreter
Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py (184555 => 184556)
--- 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)
@@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import argparse
+import glob
import os
import sys
@@ -26,10 +27,17 @@
def get_filenames(args):
filenames = []
- 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):])
+ 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)
return filenames
