Changeset 87781 in webkit
- Timestamp:
- Jun 1, 2011 12:46:13 AM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r87772 r87781 1 2011-05-31 Mikhail Naganov <mnaganov@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector [Chromium]: Put worker scripts into devtools_frontend.zip. 6 https://bugs.webkit.org/show_bug.cgi?id=61803 7 8 * WebKit.gyp: 9 * scripts/generate_devtools_zip.py: 10 1 11 2011-05-31 Kinuko Yasuda <kinuko@chromium.org> 2 12 -
trunk/Source/WebKit/chromium/WebKit.gyp
r87454 r87781 828 828 'script_name': 'scripts/generate_devtools_zip.py', 829 829 'inspector_html': '../../WebCore/inspector/front-end/inspector.html', 830 'workers_files': [ 831 '../../WebCore/inspector/front-end/HeapSnapshotWorker.js', 832 '../../WebCore/inspector/front-end/JavaScriptFormatter.js', 833 '../../WebCore/inspector/front-end/ScriptFormatterWorker.js', 834 '<@(webinspector_uglifyjs_files)' 835 ], 830 836 'inputs': [ 831 837 '<@(_script_name)', … … 835 841 '<@(webinspector_files)', 836 842 '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js', 843 '<@(_workers_files)', 837 844 '<@(webinspector_image_files)', 838 845 '<@(devtools_image_files)', … … 850 857 'action': ['python', '<@(_script_name)', '<@(_inspector_html)', 851 858 '--devtools-files', '<@(devtools_files)', 859 '--workers-files', '<@(_workers_files)', 852 860 '--search-path', '<@(_search_path)', 853 861 '--image-search-path', '<@(_image_search_path)', -
trunk/Source/WebKit/chromium/scripts/generate_devtools_zip.py
r85071 r87781 48 48 49 49 class ParsedArgs: 50 def __init__(self, inspector_html, devtools_files, search_dirs,51 image_search_dirs, output_filename):50 def __init__(self, inspector_html, devtools_files, workers_files, 51 search_dirs, image_search_dirs, output_filename): 52 52 self.inspector_html = inspector_html 53 53 self.devtools_files = devtools_files 54 self.workers_files = workers_files 54 55 self.search_dirs = search_dirs 55 56 self.image_search_dirs = image_search_dirs … … 61 62 62 63 devtools_files_position = argv.index('--devtools-files') 64 workers_files_position = argv.index('--workers-files') 63 65 search_path_position = argv.index('--search-path') 64 66 image_search_path_position = argv.index('--image-search-path') 65 67 output_position = argv.index('--output') 66 68 67 devtools_files = argv[devtools_files_position + 1:search_path_position] 69 devtools_files = argv[devtools_files_position + 1:workers_files_position] 70 workers_files = argv[workers_files_position + 1:search_path_position] 68 71 search_dirs = argv[search_path_position + 1:image_search_path_position] 69 72 image_search_dirs = argv[image_search_path_position + 1:output_position] 70 73 71 return ParsedArgs(inspector_html, devtools_files, search_dirs,72 image_search_dirs, argv[output_position + 1])74 return ParsedArgs(inspector_html, devtools_files, workers_files, 75 search_dirs, image_search_dirs, argv[output_position + 1]) 73 76 74 77 … … 99 102 zip.write(full_path, os.path.basename(full_path)) 100 103 104 front_end_path = 'front-end' 105 for dirname in parsed_args.search_dirs: 106 if dirname.find(front_end_path): 107 front_end_path = dirname 108 break 109 110 for input_file_name in set(parsed_args.workers_files): 111 # We assume that workers-related files reside in the 'front-end' 112 # directory 113 relpath = os.path.relpath(os.path.dirname(input_file_name), 114 front_end_path) 115 if relpath == '.': 116 relpath = '' 117 else: 118 relpath += '/' 119 zip.write(input_file_name, 120 relpath + os.path.basename(input_file_name)) 121 101 122 for dirname in parsed_args.image_search_dirs: 102 123 for filename in os.listdir(dirname):
Note: See TracChangeset
for help on using the changeset viewer.