Changeset 85071 in webkit

Timestamp:

Apr 27, 2011 11:58:07 AM (13 years ago)

Author:

tony@chromium.org

Message:

2011-04-27 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

[chromium] add a build target to make a zip file with the inspector debug files
​https://bugs.webkit.org/show_bug.cgi?id=56656

• WebKit.gyp: Add target
• scripts/concatenate_css_files.py: Pass in a string of html rather

than a filename

• scripts/concatenate_js_files.py: Same as above
• scripts/generate_devtools_html.py: Refactor main into a helper function
• scripts/generate_devtools_zip.py: Added.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• scripts/concatenate_css_files.py (modified) (3 diffs)
• scripts/concatenate_js_files.py (modified) (3 diffs)
• scripts/generate_devtools_html.py (modified) (3 diffs)
• scripts/generate_devtools_zip.py (added)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-27  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [chromium] add a build target to make a zip file with the inspector debug files
+        https://bugs.webkit.org/show_bug.cgi?id=56656
+
+        * WebKit.gyp: Add target
+        * scripts/concatenate_css_files.py: Pass in a string of html rather
+            than a filename
+        * scripts/concatenate_js_files.py: Same as above
+        * scripts/generate_devtools_html.py: Refactor main into a helper function
+        * scripts/generate_devtools_zip.py: Added.
+
 2011-04-27  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -812 +812 @@
         },
         {
+            'target_name': 'generate_devtools_zip',
+            'type': 'none',
+            'dependencies': [
+                '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
+            ],
+            'actions': [{
+                'action_name': 'generate_devtools_zip',
+                'script_name': 'scripts/generate_devtools_zip.py',
+                'inspector_html': '../../WebCore/inspector/front-end/inspector.html',
+                'inputs': [
+                    '<@(_script_name)',
+                    'scripts/generate_devtools_html.py',
+                    '<@(_inspector_html)',
+                    '<@(devtools_files)',
+                    '<@(webinspector_files)',
+                    '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+                    '<@(webinspector_image_files)',
+                    '<@(devtools_image_files)',
+                ],
+                'search_path': [
+                    '../../WebCore/inspector/front-end',
+                    'src/js',
+                    '<(SHARED_INTERMEDIATE_DIR)/webcore',
+                ],
+                'image_search_path': [
+                    '../../WebCore/inspector/front-end/Images',
+                    'src/js/Images',
+                ],
+                'outputs': ['<(PRODUCT_DIR)/devtools_frontend.zip'],
+                'action': ['python', '<@(_script_name)', '<@(_inspector_html)',
+                                     '--devtools-files', '<@(devtools_files)',
+                                     '--search-path', '<@(_search_path)',
+                                     '--image-search-path', '<@(_image_search_path)',
+                                     '--output', '<@(_outputs)'],
+            }],
+        },
+        {
             'target_name': 'webkit_unit_tests',
             'type': 'executable',

trunk/Source/WebKit/chromium/scripts/concatenate_css_files.py

@@ -33 +33 @@
 # using <link> tags in a given 'order.html' file.
 
+from __future__ import with_statement
+
 from HTMLParser import HTMLParser
 from cStringIO import StringIO
@@ -41 +43 @@
 class OrderedCSSFilesExtractor(HTMLParser):
 
-    def __init__(self, order_html_name):
+    def __init__(self, order_html):
         HTMLParser.__init__(self)
         self.ordered_css_files = []
-        order_html = open(order_html_name, 'r')
-        self.feed(order_html.read())
+        self.feed(order_html)
 
     def handle_starttag(self, tag, attrs):
@@ -83 +84 @@
     output_file_name = argv.pop()
     input_order_file_name = argv[1]
-    extractor = OrderedCSSFilesExtractor(input_order_file_name)
+    with open(input_order_file_name, 'r') as order_html:
+        extractor = OrderedCSSFilesExtractor(order_html.read())
     # Unconditionally append devTools.css. It will contain concatenated files.
     extractor.ordered_css_files.append('devTools.css')

trunk/Source/WebKit/chromium/scripts/concatenate_js_files.py

@@ -33 +33 @@
 # using <script> tags in a given 'order.html' file.
 
+from __future__ import with_statement
+
 from HTMLParser import HTMLParser
 from cStringIO import StringIO
@@ -43 +45 @@
 class OrderedJSFilesExtractor(HTMLParser):
 
-    def __init__(self, order_html_name):
+    def __init__(self, order_html):
         HTMLParser.__init__(self)
         self.ordered_js_files = []
-        order_html = open(order_html_name, 'r')
-        self.feed(order_html.read())
+        self.feed(order_html)
 
     def handle_starttag(self, tag, attrs):
@@ -84 +85 @@
     output_file_name = argv.pop()
     input_order_file_name = argv[1]
-    extractor = OrderedJSFilesExtractor(input_order_file_name)
+    with open(input_order_file_name, 'r') as order_html:
+        extractor = OrderedJSFilesExtractor(order_html.read())
     extractor.ordered_js_files.append('DevTools.js')
     extractor.ordered_js_files.append('Tests.js')

trunk/Source/WebKit/chromium/scripts/generate_devtools_html.py

@@ -34 +34 @@
 
 
-def GenerateIncludeTag(resource_path):
+def generate_include_tag(resource_path):
     (dir_name, file_name) = os.path.split(resource_path)
     if (file_name.endswith('.js')):
@@ -42 +42 @@
     else:
         assert resource_path
+
+
+def write_devtools_html(inspector_file, devtools_file, debug, debug_files):
+    for line in inspector_file:
+        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 debug_files:
+                    devtools_file.write(generate_include_tag(resource))
+            else:
+                devtools_file.write(generate_include_tag("devTools.css"))
+                devtools_file.write(generate_include_tag("DevTools.js"))
+        devtools_file.write(line)
 
 
@@ -60 +76 @@
     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[4:]:
-                    devtools_html.write(GenerateIncludeTag(resource))
-            else:
-                devtools_html.write(GenerateIncludeTag("devTools.css"))
-                devtools_html.write(GenerateIncludeTag("DevTools.js"))
-        devtools_html.write(line)
+    write_devtools_html(inspector_html, devtools_html, debug, argv[4:])
 
     devtools_html.close()