Title: [173953] releases/WebKitGTK/webkit-2.4
- Revision
- 173953
- Author
- [email protected]
- Date
- 2014-09-25 06:10:55 -0700 (Thu, 25 Sep 2014)
Log Message
Merge r173751 - [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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/GNUmakefile.am (173952 => 173953)
--- releases/WebKitGTK/webkit-2.4/GNUmakefile.am 2014-09-25 11:26:42 UTC (rev 173952)
+++ releases/WebKitGTK/webkit-2.4/GNUmakefile.am 2014-09-25 13:10:55 UTC (rev 173953)
@@ -124,6 +124,7 @@
MAINTAINERCLEANFILES :=
pkgconfig_DATA :=
gdom_symbol_files :=
+inspector_files :=
if ENABLE_INTROSPECTION
gir_DATA :=
Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am (173952 => 173953)
--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am 2014-09-25 11:26:42 UTC (rev 173952)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am 2014-09-25 13:10:55 UTC (rev 173953)
@@ -1,15 +1,19 @@
-${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
- $(WebInspectorUI)/UserInterface/*.html \
- $(WebInspectorUI)/UserInterface/*.js \
- $(WebInspectorUI)/UserInterface/*.css \
- $(WebInspectorUI)/UserInterface/Images/*.png \
- $(WebInspectorUI)/UserInterface/Images/*.svg \
- $(WebInspectorUI)/UserInterface/External/CodeMirror/* \
+inspector_files += \
$(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/*.png) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Images/*.svg) \
+ $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*.js) \
+ $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*.css)
+
+${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
+ $(inspector_files) \
$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
$(AM_V_GEN)
$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
- $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py $@
+ $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.c: DerivedSources/WebInspectorUI/GResourceBundle.xml
$(AM_V_GEN)
@@ -22,12 +26,4 @@
webcore_built_sources += \
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/*.png) \
- $(shell ls $(WebInspectorUI)/UserInterface/Images/*.svg) \
- $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*)
-
+EXTRA_DIST += $(inspector_files)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (173952 => 173953)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-09-25 11:26:42 UTC (rev 173952)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-09-25 13:10:55 UTC (rev 173953)
@@ -1,3 +1,13 @@
+2014-09-19 Carlos Garcia Campos <[email protected]>
+
+ [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.
+
2014-08-25 Carlos Garcia Campos <[email protected]>
[GTK] Older versions of WebKit should use the plugins cache in read only mode
Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (173952 => 173953)
--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-09-25 11:26:42 UTC (rev 173952)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-09-25 13:10:55 UTC (rev 173953)
@@ -1,3 +1,18 @@
+2014-09-19 Carlos Garcia Campos <[email protected]>
+
+ [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.
+
2014-07-30 Carlos Garcia Campos <[email protected]>
[GTK] GLib tests fail with recent GTK+ due to runtime warning about deprecated properties
Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py (173952 => 173953)
--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py 2014-09-25 11:26:42 UTC (rev 173952)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py 2014-09-25 13:10:55 UTC (rev 173953)
@@ -15,33 +15,53 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-import common
-import glob
+import argparse
import os
import sys
-resources_path = common.top_level_path() + "/Source/WebInspectorUI/"
-inspector_files = \
- glob.glob(resources_path + 'UserInterface/*.html') + \
- glob.glob(resources_path + 'UserInterface/*.js') + \
- glob.glob(resources_path + 'UserInterface/*.css') + \
- 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')
+COMPRESSIBLE_EXTENSIONS = ['.html', '.js', '.css', '.svg']
+BASE_DIR = 'WebInspectorUI/'
-gresources_file_content = \
+
+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):])
+ return filenames
+
+
+def is_compressible(filename):
+ return os.path.splitext(filename)[1] in COMPRESSIBLE_EXTENSIONS
+
+
+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')
+ parser.add_argument('filenames', metavar='FILES', nargs='+',
+ help='the list of files to include')
+
+ args = parser.parse_args(sys.argv[1:])
+
+ args.output.write(\
"""<?xml version=1.0 encoding=UTF-8?>
<gresources>
<gresource prefix="/org/webkitgtk/inspector">
-"""
+""")
-for file in inspector_files:
- gresources_file_content += " <file>" + file.replace(resources_path, '') + "</file>\n"
+ for filename in get_filenames(args.filenames):
+ line = ' <file'
+ if is_compressible(filename):
+ line += ' compressed="true"'
+ line += '>%s</file>\n' % filename
-gresources_file_content += \
+ args.output.write(line)
+
+ args.output.write(\
""" </gresource>
</gresources>
-"""
+""")
-open(sys.argv[1], 'w').write(gresources_file_content)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
