[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tkent at chromium.org
tkent at chromium.org
Wed Dec 22 11:09:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 708258c47659a86b3b9938769e7142bd1efd63d3
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 14 07:03:33 2010 +0000
[Chromium] Upstreaming inspector_resources target
https://bugs.webkit.org/show_bug.cgi?id=41669
Reviewed by David Levin.
'inspector_resource' is currently in src/webkit/webkit.gyp of
Chromium tree. We move it to WebKit tree because:
- DumpRenderTree in WebKit tree needs it, and
- It's hard to refer to WebKit.gypi and WebCore.gypi from
webkit_support in both cases of Chromium-tree build and
WebKit-tree build.
* WebKit.gyp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63285 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7e14d0b..c03c02b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-14 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by David Levin.
+
+ [Chromium] Upstreaming inspector_resources target
+ https://bugs.webkit.org/show_bug.cgi?id=41669
+
+ 'inspector_resource' is currently in src/webkit/webkit.gyp of
+ Chromium tree. We move it to WebKit tree because:
+ - DumpRenderTree in WebKit tree needs it, and
+ - It's hard to refer to WebKit.gypi and WebCore.gypi from
+ webkit_support in both cases of Chromium-tree build and
+ WebKit-tree build.
+
+ * WebKit.gyp:
+
2010-07-13 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 8143049..dd3ccfc 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -30,8 +30,10 @@
{
'includes': [
- 'features.gypi',
+ '../../WebCore/WebCore.gypi',
'../../WebKitTools/DumpRenderTree/DumpRenderTree.gypi',
+ 'WebKit.gypi',
+ 'features.gypi',
],
'variables': {
'webkit_target_type': 'static_library',
@@ -42,12 +44,42 @@
# Webkit is being built outside of the full chromium project.
# e.g. via build-webkit --chromium
'chromium_src_dir': '../../WebKit/chromium',
+
+ # List of DevTools source files, ordered by dependencies. It is used both
+ # for copying them to resource dir, and for generating 'devtools.html' file.
+ 'devtools_files': [
+ '<@(devtools_css_files)',
+ 'v8/tools/codemap.js',
+ 'v8/tools/consarray.js',
+ 'v8/tools/csvparser.js',
+ 'v8/tools/logreader.js',
+ 'v8/tools/profile.js',
+ 'v8/tools/profile_view.js',
+ 'v8/tools/splaytree.js',
+ '<@(devtools_js_files)',
+ ],
},{
# WebKit is checked out in src/chromium/third_party/WebKit
'chromium_src_dir': '../../../..',
+
+ 'devtools_files': [
+ '<@(devtools_css_files)',
+ '../../../../v8/tools/codemap.js',
+ '../../../../v8/tools/consarray.js',
+ '../../../../v8/tools/csvparser.js',
+ '../../../../v8/tools/logreader.js',
+ '../../../../v8/tools/profile.js',
+ '../../../../v8/tools/profile_view.js',
+ '../../../../v8/tools/splaytree.js',
+ '<@(devtools_js_files)',
+ ],
}],
],
'ahem_path': '../../WebKitTools/DumpRenderTree/qt/fonts/AHEM____.TTF',
+
+ # If debug_devtools is set to 1, JavaScript files for DevTools are
+ # stored as is. Otherwise, a concatenated file is stored.
+ 'debug_devtools%': 0,
},
'targets': [
{
@@ -541,6 +573,79 @@
}],
],
},
+
+ {
+ 'target_name': 'inspector_resources',
+ 'type': 'none',
+ 'dependencies': ['devtools_html'],
+ 'conditions': [
+ ['debug_devtools==0', {
+ 'dependencies': ['concatenated_devtools_js'],
+ }],
+ ],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)/resources/inspector',
+ 'files': [
+ '<@(devtools_files)',
+ '<@(webinspector_files)',
+ ],
+ 'conditions': [
+ ['debug_devtools==0', {
+ 'files/': [['exclude', '\\.js$']],
+ }],
+ ],
+ },
+ {
+ 'destination': '<(PRODUCT_DIR)/resources/inspector/Images',
+ 'files': [
+ '<@(webinspector_image_files)',
+ '<@(devtools_image_files)',
+ ],
+ },
+ ],
+ },
+ {
+ 'target_name': 'devtools_html',
+ 'type': 'none',
+ 'sources': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
+ 'actions': [{
+ 'action_name': 'devtools_html',
+ 'inputs': [
+ '<(chromium_src_dir)/webkit/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)'],
+ }],
+ },
+ {
+ 'target_name': 'concatenated_devtools_js',
+ 'type': 'none',
+ 'dependencies': ['devtools_html'],
+ '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',
+ 'inputs': [
+ '<@(_script_name)',
+ '<@(_input_page)',
+ '<@(webinspector_files)',
+ '<@(devtools_files)',
+ ],
+ 'search_path': [
+ '../../WebCore/inspector/front-end',
+ 'src/js',
+ 'v8/tools',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
+ 'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_search_path)', '<@(_outputs)'],
+ }],
+ },
+
{
'target_name': 'webkit_unit_tests',
'conditions': [
@@ -609,6 +714,7 @@
'mac_bundle': 1,
'dependencies': [
'ImageDiff',
+ 'inspector_resources',
'webkit',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list