| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'chrome_exe_target': 0, | 8 'chrome_exe_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 # listed here. | 38 # listed here. |
| 39 'mac_bundle_resources!': [ | 39 'mac_bundle_resources!': [ |
| 40 'app/app-Info.plist', | 40 'app/app-Info.plist', |
| 41 ], | 41 ], |
| 42 'xcode_settings': { | 42 'xcode_settings': { |
| 43 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', | 43 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', |
| 44 'INFOPLIST_FILE': 'app/app-Info.plist', | 44 'INFOPLIST_FILE': 'app/app-Info.plist', |
| 45 }, | 45 }, |
| 46 'conditions': [ | 46 'conditions': [ |
| 47 ['OS=="win"', { | 47 ['OS=="win"', { |
| 48 'sources': [ | |
| 49 'app/chrome_exe.rc', | |
| 50 'app/chrome_exe_version.rc.version', | |
| 51 ], | |
| 52 'include_dirs': [ | |
| 53 '<(SHARED_INTERMEDIATE_DIR)/chrome', | |
| 54 ], | |
| 55 # TODO(scottbyer): This is a temporary workaround. The right fix | 48 # TODO(scottbyer): This is a temporary workaround. The right fix |
| 56 # is to change the output file to be in $(IntDir) for this project | 49 # is to change the output file to be in $(IntDir) for this project |
| 57 # and the .dll project and use the hardlink script to link it back | 50 # and the .dll project and use the hardlink script to link it back |
| 58 # to $(OutDir). | 51 # to $(OutDir). |
| 59 'configurations': { | 52 'configurations': { |
| 60 'Debug_Base': { | 53 'Debug_Base': { |
| 61 'msvs_settings': { | 54 'msvs_settings': { |
| 62 'VCLinkerTool': { | 55 'VCLinkerTool': { |
| 63 'LinkIncremental': '1', | 56 'LinkIncremental': '1', |
| 64 }, | 57 }, |
| (...skipping 11 matching lines...) Expand all Loading... |
| 76 ], | 69 ], |
| 77 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. | 70 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. |
| 78 'SubSystem': '2', | 71 'SubSystem': '2', |
| 79 }, | 72 }, |
| 80 'VCManifestTool': { | 73 'VCManifestTool': { |
| 81 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manif
est', | 74 'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manif
est', |
| 82 }, | 75 }, |
| 83 }, | 76 }, |
| 84 'actions': [ | 77 'actions': [ |
| 85 { | 78 { |
| 86 'action_name': 'version', | |
| 87 'variables': { | |
| 88 'template_input_path': 'app/chrome_exe_version.rc.version', | |
| 89 }, | |
| 90 'conditions': [ | |
| 91 [ 'branding == "Chrome"', { | |
| 92 'variables': { | |
| 93 'branding_path': 'app/theme/google_chrome/BRANDING', | |
| 94 }, | |
| 95 }, { # else branding!="Chrome" | |
| 96 'variables': { | |
| 97 'branding_path': 'app/theme/chromium/BRANDING', | |
| 98 }, | |
| 99 }], | |
| 100 ], | |
| 101 'inputs': [ | |
| 102 '<(template_input_path)', | |
| 103 '<(version_path)', | |
| 104 '<(branding_path)', | |
| 105 ], | |
| 106 'outputs': [ | |
| 107 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_exe_version.rc', | |
| 108 ], | |
| 109 'action': [ | |
| 110 'python', | |
| 111 '<(version_py_path)', | |
| 112 '-f', '<(version_path)', | |
| 113 '-f', '<(branding_path)', | |
| 114 '<(template_input_path)', | |
| 115 '<@(_outputs)', | |
| 116 ], | |
| 117 'process_outputs_as_sources': 1, | |
| 118 'message': 'Generating version information in <(_outputs)' | |
| 119 }, | |
| 120 { | |
| 121 'action_name': 'first_run', | 79 'action_name': 'first_run', |
| 122 'inputs': [ | 80 'inputs': [ |
| 123 'app/FirstRun', | 81 'app/FirstRun', |
| 124 ], | 82 ], |
| 125 'outputs': [ | 83 'outputs': [ |
| 126 '<(PRODUCT_DIR)/First Run', | 84 '<(PRODUCT_DIR)/First Run', |
| 127 ], | 85 ], |
| 128 'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'], | 86 'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'], |
| 129 'message': 'Copy first run complete sentinel file', | 87 'message': 'Copy first run complete sentinel file', |
| 130 }, | 88 }, |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 }], | 416 }], |
| 459 ['OS=="mac" or OS=="win"', { | 417 ['OS=="mac" or OS=="win"', { |
| 460 'dependencies': [ | 418 'dependencies': [ |
| 461 # On Windows and Mac, make sure we've built chrome_dll, which | 419 # On Windows and Mac, make sure we've built chrome_dll, which |
| 462 # contains all of the library code with Chromium functionality. | 420 # contains all of the library code with Chromium functionality. |
| 463 'chrome_dll', | 421 'chrome_dll', |
| 464 ], | 422 ], |
| 465 }], | 423 }], |
| 466 ['OS=="win"', { | 424 ['OS=="win"', { |
| 467 'dependencies': [ | 425 'dependencies': [ |
| 426 'chrome_version_resources', |
| 468 'installer_util', | 427 'installer_util', |
| 469 'installer_util_strings', | 428 'installer_util_strings', |
| 470 '../base/base.gyp:base', | 429 '../base/base.gyp:base', |
| 471 '../breakpad/breakpad.gyp:breakpad_handler', | 430 '../breakpad/breakpad.gyp:breakpad_handler', |
| 472 '../breakpad/breakpad.gyp:breakpad_sender', | 431 '../breakpad/breakpad.gyp:breakpad_sender', |
| 473 '../sandbox/sandbox.gyp:sandbox', | 432 '../sandbox/sandbox.gyp:sandbox', |
| 474 'app/locales/locales.gyp:*', | 433 'app/locales/locales.gyp:*', |
| 475 'app/policy/cloud_policy_codegen.gyp:policy', | 434 'app/policy/cloud_policy_codegen.gyp:policy', |
| 476 ], | 435 ], |
| 436 'sources': [ |
| 437 'app/chrome_exe.rc', |
| 438 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', |
| 439 ], |
| 477 'msvs_settings': { | 440 'msvs_settings': { |
| 478 'VCLinkerTool': { | 441 'VCLinkerTool': { |
| 479 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 442 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 480 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', | 443 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', |
| 481 }, | 444 }, |
| 482 }, | 445 }, |
| 483 }], | 446 }], |
| 484 ], | 447 ], |
| 485 }, | 448 }, |
| 486 ], | 449 ], |
| 487 'conditions': [ | 450 'conditions': [ |
| 488 ['OS=="win"', { | 451 ['OS=="win"', { |
| 489 'targets': [ | 452 'targets': [ |
| 490 { | 453 { |
| 491 'target_name': 'chrome_nacl_win64', | 454 'target_name': 'chrome_nacl_win64', |
| 492 'type': 'executable', | 455 'type': 'executable', |
| 493 'product_name': 'nacl64', | 456 'product_name': 'nacl64', |
| 494 'variables': { | 457 'variables': { |
| 495 'chrome_exe_target': 1, | 458 'chrome_exe_target': 1, |
| 496 }, | 459 }, |
| 497 'dependencies': [ | 460 'dependencies': [ |
| 498 # On Windows make sure we've built Win64 version of chrome_dll, | 461 # On Windows make sure we've built Win64 version of chrome_dll, |
| 499 # which contains all of the library code with Chromium | 462 # which contains all of the library code with Chromium |
| 500 # functionality. | 463 # functionality. |
| 464 'chrome_version_resources', |
| 501 'chrome_dll_nacl_win64', | 465 'chrome_dll_nacl_win64', |
| 502 'common_constants_win64', | 466 'common_constants_win64', |
| 503 'installer_util_nacl_win64', | 467 'installer_util_nacl_win64', |
| 504 'app/policy/cloud_policy_codegen.gyp:policy_win64', | 468 'app/policy/cloud_policy_codegen.gyp:policy_win64', |
| 505 '../breakpad/breakpad.gyp:breakpad_handler_win64', | 469 '../breakpad/breakpad.gyp:breakpad_handler_win64', |
| 506 '../breakpad/breakpad.gyp:breakpad_sender_win64', | 470 '../breakpad/breakpad.gyp:breakpad_sender_win64', |
| 507 '../base/base.gyp:base_nacl_win64', | 471 '../base/base.gyp:base_nacl_win64', |
| 508 '../base/base.gyp:base_static_win64', | 472 '../base/base.gyp:base_static_win64', |
| 509 '../sandbox/sandbox.gyp:sandbox_win64', | 473 '../sandbox/sandbox.gyp:sandbox_win64', |
| 510 ], | 474 ], |
| 511 'defines': [ | 475 'defines': [ |
| 512 '<@(nacl_win64_defines)', | 476 '<@(nacl_win64_defines)', |
| 513 ], | 477 ], |
| 514 'include_dirs': [ | 478 'include_dirs': [ |
| 515 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 479 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 516 ], | 480 ], |
| 481 'sources': [ |
| 482 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', |
| 483 ], |
| 517 'msvs_settings': { | 484 'msvs_settings': { |
| 518 'VCLinkerTool': { | 485 'VCLinkerTool': { |
| 519 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', | 486 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', |
| 520 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', | 487 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', |
| 521 }, | 488 }, |
| 522 }, | 489 }, |
| 523 'configurations': { | 490 'configurations': { |
| 524 'Common_Base': { | 491 'Common_Base': { |
| 525 'msvs_target_platform': 'x64', | 492 'msvs_target_platform': 'x64', |
| 526 }, | 493 }, |
| 527 }, | 494 }, |
| 528 }, | 495 }, |
| 529 ], | 496 ], |
| 530 }], | 497 }], |
| 531 ], | 498 ], |
| 532 } | 499 } |
| OLD | NEW |