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

Side by Side Diff: chrome/chrome.gyp

Issue 6685061: Compile the devtools grd file into a .pak file so we (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and fix win Created 9 years, 9 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 | tools/grit/grit/grd_reader.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 'chrome_build': '_google_chrome', 415 'chrome_build': '_google_chrome',
416 'branded_env': 'CHROMIUM_BUILD=google_chrome', 416 'branded_env': 'CHROMIUM_BUILD=google_chrome',
417 }, { # else: branding!="Chrome" 417 }, { # else: branding!="Chrome"
418 'chrome_build': '_chromium', 418 'chrome_build': '_chromium',
419 'branded_env': 'CHROMIUM_BUILD=chromium', 419 'branded_env': 'CHROMIUM_BUILD=chromium',
420 }], 420 }],
421 ], 421 ],
422 }, 422 },
423 'inputs': [ 423 'inputs': [
424 '<@(chrome_extra_resources_inputs)', 424 '<@(chrome_extra_resources_inputs)',
425 '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd',
425 ], 426 ],
426 'outputs': [ 427 'outputs': [
427 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', 428 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
428 '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak', 429 '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak',
429 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.cc', 430 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.cc',
430 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.h', 431 '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT)_map.h',
431 # TODO(bradnelson): move to something like this instead 432 # TODO(bradnelson): move to something like this instead
432 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resour ces_grds))', 433 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resour ces_grds))',
433 # This currently cannot work because gyp only evaluates the 434 # This currently cannot work because gyp only evaluates the
434 # outputs once (rather than per case where the rule applies). 435 # outputs once (rather than per case where the rule applies).
435 # This means you end up with all the outputs from all the grd 436 # This means you end up with all the outputs from all the grd
436 # files, which angers scons and confuses vstudio. 437 # files, which angers scons and confuses vstudio.
437 # One alternative would be to turn this into several actions, 438 # One alternative would be to turn this into several actions,
438 # but that would be rather verbose. 439 # but that would be rather verbose.
439 ], 440 ],
440 'action': ['<@(grit_cmd)', '-i', 441 'action': ['<@(grit_cmd)', '-i',
441 '<(RULE_INPUT_PATH)', 442 '<(RULE_INPUT_PATH)',
442 'build', '-o', '<(grit_out_dir)', 443 'build', '-o', '<(grit_out_dir)',
443 '-D', '<(chrome_build)', 444 '-D', '<(chrome_build)',
445 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
444 '-E', '<(branded_env)', 446 '-E', '<(branded_env)',
445 '<@(grit_defines)', 447 '<@(grit_defines)',
446 ], 448 ],
447 'message': 'Generating resources from <(RULE_INPUT_PATH)', 449 'message': 'Generating resources from <(RULE_INPUT_PATH)',
448 }, 450 },
449 ], 451 ],
450 'sources': [ 452 'sources': [
451 '<@(chrome_extra_resources_grds)', 453 '<@(chrome_extra_resources_grds)',
452 '<@(chrome_extra_resources_inputs)', 454 '<@(chrome_extra_resources_inputs)',
455 '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd',
456 ],
457 'dependencies': [
458 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtoo ls_grd',
453 ], 459 ],
454 'direct_dependent_settings': { 460 'direct_dependent_settings': {
455 'include_dirs': [ 461 'include_dirs': [
456 '<(grit_out_dir)', 462 '<(grit_out_dir)',
457 ], 463 ],
458 }, 464 },
459 'conditions': [ 465 'conditions': [
460 ['OS=="win"', { 466 ['OS=="win"', {
461 'dependencies': ['../build/win/system.gyp:cygwin'], 467 'dependencies': ['../build/win/system.gyp:cygwin'],
462 }], 468 }],
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 }], # targets 1695 }], # targets
1690 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1696 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1691 ], # 'conditions' 1697 ], # 'conditions'
1692 } 1698 }
1693 1699
1694 # Local Variables: 1700 # Local Variables:
1695 # tab-width:2 1701 # tab-width:2
1696 # indent-tabs-mode:nil 1702 # indent-tabs-mode:nil
1697 # End: 1703 # End:
1698 # vim: set expandtab tabstop=2 shiftwidth=2: 1704 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | tools/grit/grit/grd_reader.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698