Changeset 87784 in webkit
- Timestamp:
- Jun 1, 2011 1:07:14 AM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r87781 r87784 1 2011-06-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r87781. 4 http://trac.webkit.org/changeset/87781 5 https://bugs.webkit.org/show_bug.cgi?id=61842 6 7 breaks chromium linux release (Requested by mnaganov on 8 #webkit). 9 10 * WebKit.gyp: 11 * scripts/generate_devtools_zip.py: 12 1 13 2011-05-31 Mikhail Naganov <mnaganov@chromium.org> 2 14 -
trunk/Source/WebKit/chromium/WebKit.gyp
r87781 r87784 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 ],836 830 'inputs': [ 837 831 '<@(_script_name)', … … 841 835 '<@(webinspector_files)', 842 836 '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js', 843 '<@(_workers_files)',844 837 '<@(webinspector_image_files)', 845 838 '<@(devtools_image_files)', … … 857 850 'action': ['python', '<@(_script_name)', '<@(_inspector_html)', 858 851 '--devtools-files', '<@(devtools_files)', 859 '--workers-files', '<@(_workers_files)',860 852 '--search-path', '<@(_search_path)', 861 853 '--image-search-path', '<@(_image_search_path)', -
trunk/Source/WebKit/chromium/scripts/generate_devtools_zip.py
r87781 r87784 48 48 49 49 class ParsedArgs: 50 def __init__(self, inspector_html, devtools_files, workers_files,51 search_dirs,image_search_dirs, output_filename):50 def __init__(self, inspector_html, devtools_files, search_dirs, 51 image_search_dirs, output_filename): 52 52 self.inspector_html = inspector_html 53 53 self.devtools_files = devtools_files 54 self.workers_files = workers_files55 54 self.search_dirs = search_dirs 56 55 self.image_search_dirs = image_search_dirs … … 62 61 63 62 devtools_files_position = argv.index('--devtools-files') 64 workers_files_position = argv.index('--workers-files')65 63 search_path_position = argv.index('--search-path') 66 64 image_search_path_position = argv.index('--image-search-path') 67 65 output_position = argv.index('--output') 68 66 69 devtools_files = argv[devtools_files_position + 1:workers_files_position] 70 workers_files = argv[workers_files_position + 1:search_path_position] 67 devtools_files = argv[devtools_files_position + 1:search_path_position] 71 68 search_dirs = argv[search_path_position + 1:image_search_path_position] 72 69 image_search_dirs = argv[image_search_path_position + 1:output_position] 73 70 74 return ParsedArgs(inspector_html, devtools_files, workers_files,75 search_dirs,image_search_dirs, argv[output_position + 1])71 return ParsedArgs(inspector_html, devtools_files, search_dirs, 72 image_search_dirs, argv[output_position + 1]) 76 73 77 74 … … 102 99 zip.write(full_path, os.path.basename(full_path)) 103 100 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 = dirname108 break109 110 for input_file_name in set(parsed_args.workers_files):111 # We assume that workers-related files reside in the 'front-end'112 # directory113 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 122 101 for dirname in parsed_args.image_search_dirs: 123 102 for filename in os.listdir(dirname):
Note: See TracChangeset
for help on using the changeset viewer.