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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 223023: Place Chrome Frame intermediate files in a more sanely named directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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')
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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)', 8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
9 9
10 # Keep the archive builder happy. 10 # Keep the archive builder happy.
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 '<(INTERMEDIATE_DIR)', 251 '<(INTERMEDIATE_DIR)',
252 ], 252 ],
253 'conditions': [ 253 'conditions': [
254 ['OS=="win"', { 254 ['OS=="win"', {
255 'msvs_settings': { 255 'msvs_settings': {
256 'VCLinkerTool': { 256 'VCLinkerTool': {
257 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], 257 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
258 }, 258 },
259 }, 259 },
260 'sources': [ 260 'sources': [
261 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/chrome_frame_resources.rc', 261 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc',
262 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/chrome_frame_strings.rc', 262 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc',
263 ], 263 ],
264 'dependencies': [ 264 'dependencies': [
265 # TODO(slightlyoff): Get automation targets working on OS X 265 # TODO(slightlyoff): Get automation targets working on OS X
266 '../chrome/chrome.gyp:automation', 266 '../chrome/chrome.gyp:automation',
267 '../chrome/installer/installer.gyp:installer_util', 267 '../chrome/installer/installer.gyp:installer_util',
268 '../google_update/google_update.gyp:google_update', 268 '../google_update/google_update.gyp:google_update',
269 ] 269 ]
270 }], 270 }],
271 ], 271 ],
272 }, 272 },
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 '<(INTERMEDIATE_DIR)', 330 '<(INTERMEDIATE_DIR)',
331 ], 331 ],
332 'conditions': [ 332 'conditions': [
333 ['OS=="win"', { 333 ['OS=="win"', {
334 'msvs_settings': { 334 'msvs_settings': {
335 'VCLinkerTool': { 335 'VCLinkerTool': {
336 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], 336 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
337 }, 337 },
338 }, 338 },
339 'sources': [ 339 'sources': [
340 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/chrome_frame_resources.rc', 340 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc',
341 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/chrome_frame_strings.rc', 341 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc',
342 ], 342 ],
343 'dependencies': [ 343 'dependencies': [
344 '../chrome/chrome.gyp:automation', 344 '../chrome/chrome.gyp:automation',
345 '../chrome/installer/installer.gyp:installer_util', 345 '../chrome/installer/installer.gyp:installer_util',
346 '../google_update/google_update.gyp:google_update', 346 '../google_update/google_update.gyp:google_update',
347 ] 347 ]
348 }], 348 }],
349 ], 349 ],
350 }, 350 },
351 { 351 {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 'target_name': 'chrome_frame_strings', 536 'target_name': 'chrome_frame_strings',
537 'type': 'none', 537 'type': 'none',
538 'rules': [ 538 'rules': [
539 { 539 {
540 'rule_name': 'grit', 540 'rule_name': 'grit',
541 'extension': 'grd', 541 'extension': 'grd',
542 'inputs': [ 542 'inputs': [
543 '../tools/grit/grit.py', 543 '../tools/grit/grit.py',
544 ], 544 ],
545 'variables': { 545 'variables': {
546 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab', 546 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
547 }, 547 },
548 'outputs': [ 548 'outputs': [
549 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/grit/<(RULE_INPUT_ROOT).h', 549 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/grit/<(RULE_INPUT_ROOT).h',
550 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/<(RULE_INPUT_ROOT).pak', 550 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/<(RULE_INPUT_ROOT).pak',
551 ], 551 ],
552 'action': ['python', '<@(_inputs)', '-i', 552 'action': ['python', '<@(_inputs)', '-i',
553 '<(RULE_INPUT_PATH)', 553 '<(RULE_INPUT_PATH)',
554 'build', '-o', '<(grit_out_dir)' 554 'build', '-o', '<(grit_out_dir)'
555 ], 555 ],
556 'message': 'Generating resources from <(RULE_INPUT_PATH)', 556 'message': 'Generating resources from <(RULE_INPUT_PATH)',
557 }, 557 },
558 ], 558 ],
559 'sources': [ 559 'sources': [
560 # Localizable resources. 560 # Localizable resources.
561 'resources/chrome_frame_strings.grd', 561 'resources/chrome_frame_strings.grd',
562 'resources/chrome_frame_resources.grd', 562 'resources/chrome_frame_resources.grd',
563 ], 563 ],
564 'direct_dependent_settings': { 564 'direct_dependent_settings': {
565 'include_dirs': [ 565 'include_dirs': [
566 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab', 566 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
567 ], 567 ],
568 }, 568 },
569 'conditions': [ 569 'conditions': [
570 ['OS=="win"', { 570 ['OS=="win"', {
571 'dependencies': ['../build/win/system.gyp:cygwin'], 571 'dependencies': ['../build/win/system.gyp:cygwin'],
572 }], 572 }],
573 ], 573 ],
574 }, 574 },
575 { 575 {
576 'target_name': 'npchrome_tab', 576 'target_name': 'npchrome_tab',
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 ], 658 ],
659 'conditions': [ 659 'conditions': [
660 ['OS=="win"', { 660 ['OS=="win"', {
661 # NOTE(slightlyoff): 661 # NOTE(slightlyoff):
662 # this is a fix for the include dirs length limit on the resource 662 # this is a fix for the include dirs length limit on the resource
663 # compiler, tickled by the xul_include_dirs variable 663 # compiler, tickled by the xul_include_dirs variable
664 'resource_include_dirs': [ 664 'resource_include_dirs': [
665 '<(INTERMEDIATE_DIR)' 665 '<(INTERMEDIATE_DIR)'
666 ], 666 ],
667 'sources': [ 667 'sources': [
668 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/chrome_frame_resources.rc', 668 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc',
669 '<(SHARED_INTERMEDIATE_DIR)/ie_alt_tab/chrome_frame_strings.rc', 669 '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc',
670 ], 670 ],
671 'dependencies': [ 671 'dependencies': [
672 '../breakpad/breakpad.gyp:breakpad_handler', 672 '../breakpad/breakpad.gyp:breakpad_handler',
673 '../chrome/chrome.gyp:automation', 673 '../chrome/chrome.gyp:automation',
674 # Make the archive build happy. 674 # Make the archive build happy.
675 '../chrome/chrome.gyp:syncapi', 675 '../chrome/chrome.gyp:syncapi',
676 # Installer 676 # Installer
677 '../chrome/installer/installer.gyp:installer_util', 677 '../chrome/installer/installer.gyp:installer_util',
678 '../google_update/google_update.gyp:google_update', 678 '../google_update/google_update.gyp:google_update',
679 ], 679 ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 ], 716 ],
717 'process_outputs_as_sources': 1, 717 'process_outputs_as_sources': 1,
718 'message': 'Generating version information in <(_outputs)' 718 'message': 'Generating version information in <(_outputs)'
719 }, 719 },
720 ], 720 ],
721 }, 721 },
722 ], 722 ],
723 } 723 }
724 724
725 # vim: shiftwidth=2:et:ai:tabstop=2 725 # vim: shiftwidth=2:et:ai:tabstop=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