[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 15:54:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b4be7497e72087af6eb71832c7e55a636b998ce5
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 16:44:21 2010 +0000
2010-11-16 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Chrome DevTools: concatenate CSS files, do not link
missing JS files in release mode.
https://bugs.webkit.org/show_bug.cgi?id=49586
* Build/concatenate_css_files.py: Added.
* Build/concatenate_js_files.py: Added.
* Build/generate_devtools_html.py: Added.
* WebKit.gyp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72103 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/Build/concatenate_css_files.py b/WebKit/chromium/Build/concatenate_css_files.py
new file mode 100644
index 0000000..0aa5ef3
--- /dev/null
+++ b/WebKit/chromium/Build/concatenate_css_files.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2010 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# This script concatenates in place CSS files in the order specified
+# using <link> tags in a given 'order.html' file.
+
+from HTMLParser import HTMLParser
+from cStringIO import StringIO
+import os.path
+import sys
+
+
+class OrderedCSSFilesExtractor(HTMLParser):
+
+ def __init__(self, order_html_name):
+ HTMLParser.__init__(self)
+ self.ordered_css_files = []
+ order_html = open(order_html_name, 'r')
+ self.feed(order_html.read())
+
+ def handle_starttag(self, tag, attrs):
+ if tag == 'link':
+ attrs_dict = dict(attrs)
+ if ('type' in attrs_dict and attrs_dict['type'] == 'text/css' and
+ 'href' in attrs_dict):
+ self.ordered_css_files.append(attrs_dict['href'])
+
+
+class PathExpander:
+
+ def __init__(self, paths):
+ self.paths = paths
+
+ def expand(self, filename):
+ last_path = None
+ expanded_name = None
+ for path in self.paths:
+ fname = "%s/%s" % (path, filename)
+ if (os.access(fname, os.F_OK)):
+ if (last_path != None):
+ raise Exception('Ambiguous file %s: found in %s and %s' %
+ (filename, last_path, path))
+ expanded_name = fname
+ last_path = path
+ return expanded_name
+
+
+def main(argv):
+
+ if len(argv) < 3:
+ print('usage: %s order.html input_source_dir_1 input_source_dir_2 ... '
+ 'output_file' % argv[0])
+ return 1
+
+ output_file_name = argv.pop()
+ input_order_file_name = argv[1]
+ extractor = OrderedCSSFilesExtractor(input_order_file_name)
+ # Unconditionally append devTools.css. It will contain concatenated files.
+ extractor.ordered_css_files.append('devTools.css')
+
+ expander = PathExpander(argv[2:])
+ output = StringIO()
+
+ for input_file_name in extractor.ordered_css_files:
+ full_path = expander.expand(input_file_name)
+ if (full_path is None):
+ raise Exception('File %s referenced in %s not found on any source paths, '
+ 'check source tree for consistency' %
+ (input_file_name, input_order_file_name))
+ output.write('/* %s */\n\n' % input_file_name)
+ input_file = open(full_path, 'r')
+ output.write(input_file.read())
+ output.write('\n')
+ input_file.close()
+
+ output_file = open(output_file_name, 'w')
+ output_file.write(output.getvalue())
+ output_file.close()
+ output.close()
+
+ # Touch output file directory to make sure that Xcode will copy
+ # modified resource files.
+ if sys.platform == 'darwin':
+ output_dir_name = os.path.dirname(output_file_name)
+ os.utime(output_dir_name, None)
+
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/WebKit/chromium/Build/concatenate_js_files.py b/WebKit/chromium/Build/concatenate_js_files.py
new file mode 100644
index 0000000..1393f48
--- /dev/null
+++ b/WebKit/chromium/Build/concatenate_js_files.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2010 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# This script concatenates in place JS files in the order specified
+# using <script> tags in a given 'order.html' file.
+
+from HTMLParser import HTMLParser
+from cStringIO import StringIO
+import os.path
+import sys
+
+
+class OrderedJSFilesExtractor(HTMLParser):
+
+ def __init__(self, order_html_name):
+ HTMLParser.__init__(self)
+ self.ordered_js_files = []
+ order_html = open(order_html_name, 'r')
+ self.feed(order_html.read())
+
+ def handle_starttag(self, tag, attrs):
+ if tag == 'script':
+ attrs_dict = dict(attrs)
+ if ('type' in attrs_dict and attrs_dict['type'] == 'text/javascript' and 'src' in attrs_dict):
+ self.ordered_js_files.append(attrs_dict['src'])
+
+
+class PathExpander:
+
+ def __init__(self, paths):
+ self.paths = paths
+
+ def expand(self, filename):
+ last_path = None
+ expanded_name = None
+ for path in self.paths:
+ fname = "%s/%s" % (path, filename)
+ if (os.access(fname, os.F_OK)):
+ if (last_path != None):
+ raise Exception('Ambiguous file %s: found in %s and %s' %
+ (filename, last_path, path))
+ expanded_name = fname
+ last_path = path
+ return expanded_name
+
+
+def main(argv):
+
+ if len(argv) < 3:
+ print('usage: %s order.html input_source_dir_1 input_source_dir_2 ... '
+ 'output_file' % argv[0])
+ return 1
+
+ output_file_name = argv.pop()
+ input_order_file_name = argv[1]
+ extractor = OrderedJSFilesExtractor(input_order_file_name)
+ extractor.ordered_js_files.append('DevTools.js')
+ extractor.ordered_js_files.append('Tests.js')
+
+ expander = PathExpander(argv[2:])
+ output = StringIO()
+
+ for input_file_name in extractor.ordered_js_files:
+ full_path = expander.expand(input_file_name)
+ if (full_path is None):
+ raise Exception('File %s referenced in %s not found on any source paths, '
+ 'check source tree for consistency' %
+ (input_file_name, input_order_file_name))
+ output.write('/* %s */\n\n' % input_file_name)
+ input_file = open(full_path, 'r')
+ output.write(input_file.read())
+ output.write('\n')
+ input_file.close()
+
+ output_file = open(output_file_name, 'w')
+ output_file.write(output.getvalue())
+ output_file.close()
+ output.close()
+
+ # Touch output file directory to make sure that Xcode will copy
+ # modified resource files.
+ if sys.platform == 'darwin':
+ output_dir_name = os.path.dirname(output_file_name)
+ os.utime(output_dir_name, None)
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/WebKit/chromium/Build/generate_devtools_html.py b/WebKit/chromium/Build/generate_devtools_html.py
new file mode 100644
index 0000000..b9b5fff
--- /dev/null
+++ b/WebKit/chromium/Build/generate_devtools_html.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2010 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+import os.path
+import sys
+
+
+def GenerateIncludeTag(resource_path):
+ (dir_name, file_name) = os.path.split(resource_path)
+ if (file_name.endswith('.js')):
+ return ' <script type="text/javascript" src="%s"></script>\n' % file_name
+ elif (file_name.endswith('.css')):
+ return ' <link rel="stylesheet" type="text/css" href="%s">\n' % file_name
+ else:
+ assert resource_path
+
+
+def main(argv):
+
+ if len(argv) < 5:
+ print('usage: %s ignored inspector_html devtools_html debug'
+ ' css_and_js_files_list' % argv[0])
+ return 1
+
+ # The first argument is ignored. We put 'webkit.gyp' in the inputs list
+ # for this script, so every time the list of script gets changed, our html
+ # file is rebuilt.
+ inspector_html_name = argv[2]
+ devtools_html_name = argv[3]
+ debug = argv[4] != '0'
+ inspector_html = open(inspector_html_name, 'r')
+ devtools_html = open(devtools_html_name, 'w')
+
+ for line in inspector_html:
+ if not debug and '<script ' in line:
+ continue
+ if not debug and '<link ' in line:
+ continue
+ if '</head>' in line:
+ if debug:
+ for resource in argv[5:]:
+ devtools_html.write(GenerateIncludeTag(resource))
+ else:
+ devtools_html.write(GenerateIncludeTag("devTools.css"))
+ devtools_html.write(GenerateIncludeTag("DevTools.js"))
+ devtools_html.write(line)
+
+ devtools_html.close()
+ inspector_html.close()
+
+ # Touch output file directory to make sure that Xcode will copy
+ # modified resource files.
+ if sys.platform == 'darwin':
+ output_dir_name = os.path.dirname(devtools_html_name)
+ os.utime(output_dir_name, None)
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a1ec5c6..172d47b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-16 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Chrome DevTools: concatenate CSS files, do not link
+ missing JS files in release mode.
+ https://bugs.webkit.org/show_bug.cgi?id=49586
+
+ * Build/concatenate_css_files.py: Added.
+ * Build/concatenate_js_files.py: Added.
+ * Build/generate_devtools_html.py: Added.
+ * WebKit.gyp:
+
2010-11-15 Nat Duca <nduca at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 4dcc61a..48a39d4 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -671,7 +671,8 @@
],
'conditions': [
['debug_devtools==0', {
- 'dependencies': ['concatenated_devtools_js'],
+ 'dependencies': ['concatenated_devtools_js',
+ 'concatenated_devtools_css'],
}],
],
'copies': [
@@ -684,7 +685,7 @@
],
'conditions': [
['debug_devtools==0', {
- 'files/': [['exclude', '\\.js$']],
+ 'files/': [['exclude', '\\.(js|css|html)$']],
}],
],
},
@@ -704,13 +705,13 @@
'actions': [{
'action_name': 'devtools_html',
'inputs': [
- '<(chromium_src_dir)/webkit/build/generate_devtools_html.py',
+ 'Build/generate_devtools_html.py',
# See issue 29695: WebKit.gypi is a source file for devtools.html.
'WebKit.gypi',
'../../WebCore/inspector/front-end/inspector.html',
],
'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
- 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(devtools_files)'],
+ 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(debug_devtools)', '<@(devtools_files)'],
}],
},
{
@@ -723,26 +724,50 @@
'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
'actions': [{
'action_name': 'concatenate_devtools_js',
- 'script_name': '<(chromium_src_dir)/webkit/build/concatenate_js_files.py',
- 'input_page': '<(PRODUCT_DIR)/resources/inspector/devtools.html',
+ 'script_name': 'Build/concatenate_js_files.py',
+ 'input_page': '../../WebCore/inspector/front-end/inspector.html',
'inputs': [
'<@(_script_name)',
'<@(_input_page)',
'<@(webinspector_files)',
'<@(devtools_files)',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js'
],
'search_path': [
'../../WebCore/inspector/front-end',
'src/js',
'<(SHARED_INTERMEDIATE_DIR)/webcore',
- '<(chromium_src_dir)/v8/tools',
],
'outputs': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
}],
},
{
+ 'target_name': 'concatenated_devtools_css',
+ 'type': 'none',
+ 'dependencies': [
+ 'devtools_html'
+ ],
+ 'sources': ['<(PRODUCT_DIR)/resources/inspector/devTools.css'],
+ 'actions': [{
+ 'action_name': 'concatenate_devtools_css',
+ 'script_name': 'Build/concatenate_css_files.py',
+ 'input_page': '../../WebCore/inspector/front-end/inspector.html',
+ 'inputs': [
+ '<@(_script_name)',
+ '<@(_input_page)',
+ '<@(webinspector_files)',
+ '<@(devtools_files)'
+ ],
+ 'search_path': [
+ '../../WebCore/inspector/front-end',
+ 'src/js',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devTools.css'],
+ 'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
+ }],
+ },
+ {
'target_name': 'webkit_unit_tests',
'type': 'executable',
'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list