2011-03-21 Tony Chang <tony@chromium.org>

        Reviewed by Pavel Feldman.

        [chromium] remove devtools_html's dependency on WebKit.gypi
        https://bugs.webkit.org/show_bug.cgi?id=56661

        We want to depend on the values in the gypi file, not the gypi file
        itself.  Actually, if someone edits a gypi file, s/he should re-run
        gyp to pick up the new dependencies.

        It turns out that this doesn't matter much for this target anymore
        since we pull the .js dependencies from the inspector html file.

        * WebKit.gyp: cleanup dependencies
        * scripts/generate_devtools_html.py: remove unused param

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@81614 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index bc44ab8..cf04bd2 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2011-03-21  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [chromium] remove devtools_html's dependency on WebKit.gypi
+        https://bugs.webkit.org/show_bug.cgi?id=56661
+
+        We want to depend on the values in the gypi file, not the gypi file
+        itself.  Actually, if someone edits a gypi file, s/he should re-run
+        gyp to pick up the new dependencies.
+
+        It turns out that this doesn't matter much for this target anymore
+        since we pull the .js dependencies from the inspector html file.
+
+        * WebKit.gyp: cleanup dependencies
+        * scripts/generate_devtools_html.py: remove unused param
+
 2011-03-21  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r81377.

diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index de96243..4538f31 100644 (file)
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -727,14 +727,15 @@
             'sources': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
             'actions': [{
                 'action_name': 'devtools_html',
+                'script_name': 'scripts/generate_devtools_html.py',
+                'input_page': '../../WebCore/inspector/front-end/inspector.html',
                 'inputs': [
-                    'scripts/generate_devtools_html.py',
-                    # See issue 29695: WebKit.gypi is a source file for devtools.html.
-                    'WebKit.gypi',
-                    '../../WebCore/inspector/front-end/inspector.html',
+                    '<@(_script_name)',
+                    '<@(_input_page)',
+                    '<@(devtools_files)',
                 ],
                 'outputs': ['<(PRODUCT_DIR)/resources/inspector/devtools.html'],
-                'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(debug_devtools)', '<@(devtools_files)'],
+                'action': ['python', '<@(_script_name)', '<@(_input_page)', '<@(_outputs)', '<@(debug_devtools)', '<@(devtools_files)'],
             }],
         },
         {

diff --git a/Source/WebKit/chromium/scripts/generate_devtools_html.py b/Source/WebKit/chromium/scripts/generate_devtools_html.py
index b9b5fff..b8eab09 100644 (file)
--- a/Source/WebKit/chromium/scripts/generate_devtools_html.py
+++ b/Source/WebKit/chromium/scripts/generate_devtools_html.py
@@ -45,17 +45,17 @@ def GenerateIncludeTag(resource_path):
 
 def main(argv):
 
-    if len(argv) < 5:
-        print('usage: %s ignored inspector_html devtools_html debug'
+    if len(argv) < 4:
+        print('usage: %s 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_name = argv[1]
+    devtools_html_name = argv[2]
+    debug = argv[3] != '0'
     inspector_html = open(inspector_html_name, 'r')
     devtools_html = open(devtools_html_name, 'w')
 
@@ -66,7 +66,7 @@ def main(argv):
             continue
         if '</head>' in line:
             if debug:
-                for resource in argv[5:]:
+                for resource in argv[4:]:
                     devtools_html.write(GenerateIncludeTag(resource))
             else:
                 devtools_html.write(GenerateIncludeTag("devTools.css"))