Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: webkit/webkit.gyp

Issue 243109: Merge 28102 - DevTools: fix 'devtools.html' generation on Linux.... (Closed) Base URL: svn://chrome-svn/chrome/branches/221/src/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/webkit.gyp:r3734-4217,4606-5108,5177-5263
Merged /trunk/src/webkit/webkit.gyp:r28102
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../third_party/WebKit/WebKit/chromium/features.gypi', 7 '../third_party/WebKit/WebKit/chromium/features.gypi',
8 '../third_party/WebKit/WebCore/WebCore.gypi', 8 '../third_party/WebKit/WebCore/WebCore.gypi',
9 ], 9 ],
10 'variables': { 10 'variables': {
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 '<@(webinspector_image_files)', 742 '<@(webinspector_image_files)',
743 743
744 ], 744 ],
745 }, 745 },
746 ], 746 ],
747 }, 747 },
748 { 748 {
749 'target_name': 'devtools_html', 749 'target_name': 'devtools_html',
750 'type': 'none', 750 'type': 'none',
751 'msvs_guid': '9BE5D4D5-E800-44F9-B6C0-27DF15A9D817', 751 'msvs_guid': '9BE5D4D5-E800-44F9-B6C0-27DF15A9D817',
752 'sources': [
753 '<(PRODUCT_DIR)/resources/inspector/devtools.html',
754 ],
752 'actions': [ 755 'actions': [
753 { 756 {
754 'action_name': 'devtools_html', 757 'action_name': 'devtools_html',
755 'inputs': [ 758 'inputs': [
756 'build/generate_devtools_html.py', 759 'build/generate_devtools_html.py',
757 '../third_party/WebKit/WebCore/inspector/front-end/inspector.html', 760 '../third_party/WebKit/WebCore/inspector/front-end/inspector.html',
758 ], 761 ],
759 'outputs': [ 762 'outputs': [
760 '<(PRODUCT_DIR)/resources/inspector/devtools.html', 763 '<(PRODUCT_DIR)/resources/inspector/devtools.html',
761 ], 764 ],
762 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(devtools_files )'], 765 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<@(devtools_files )'],
763 }, 766 },
764 ], 767 ],
765 } 768 }
766 ], # targets 769 ], # targets
767 } 770 }
768 771
769 # Local Variables: 772 # Local Variables:
770 # tab-width:2 773 # tab-width:2
771 # indent-tabs-mode:nil 774 # indent-tabs-mode:nil
772 # End: 775 # End:
773 # vim: set expandtab tabstop=2 shiftwidth=2: 776 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698