diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 14:20:26 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 14:20:26 +0000 |
| commit | 44fd8e6abe01c557072f6c22476c4b32a782350c (patch) | |
| tree | f3fb8c9fe65115ac8dd721b9359ea6f9a781bf40 | |
| parent | 24d9ade602bf18d1bed5e3d573093e8ae43ff412 (diff) | |
| download | chromium_src-44fd8e6abe01c557072f6c22476c4b32a782350c.zip chromium_src-44fd8e6abe01c557072f6c22476c4b32a782350c.tar.gz chromium_src-44fd8e6abe01c557072f6c22476c4b32a782350c.tar.bz2 | |
DevTools: specify dependency of 'devtools.html' from 'webkit.gyp'.
BUG=29695
TEST=none
Review URL: http://codereview.chromium.org/467045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34055 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | webkit/build/generate_devtools_html.py | 12 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/webkit/build/generate_devtools_html.py b/webkit/build/generate_devtools_html.py index 82f9490..59aeee3 100755 --- a/webkit/build/generate_devtools_html.py +++ b/webkit/build/generate_devtools_html.py @@ -19,18 +19,22 @@ def GenerateIncludeTag(resource_path): def main(argv): if len(argv) < 4: - print 'usage: %s inspector_html devtools_html css_and_js_files_list' % argv[0] + print('usage: %s ignored inspector_html devtools_html' + ' css_and_js_files_list' % argv[0]) return 1 - inspector_html_name = argv[1] - devtools_html_name = argv[2] + # 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] inspector_html = open(inspector_html_name, 'r') devtools_html = open(devtools_html_name, 'w') for line in inspector_html: if '</head>' in line: devtools_html.write('\n <!-- The following lines are added to include DevTools resources -->\n') - for resource in argv[3:]: + for resource in argv[4:]: devtools_html.write(GenerateIncludeTag(resource)) devtools_html.write(' <!-- End of auto-added files list -->\n') devtools_html.write(line) diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index eaf5fff..6add1ba 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -512,6 +512,8 @@ 'action_name': 'devtools_html', 'inputs': [ 'build/generate_devtools_html.py', + # See issue 29695: webkit.gyp is a source file for devtools.html. + 'webkit.gyp', '../third_party/WebKit/WebCore/inspector/front-end/inspector.html', ], 'outputs': [ |