| 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 'variables': { | 6 'variables': { |
| 7 'branding_dir': '../app/theme/<(branding_path_component)', | 7 'branding_dir': '../app/theme/<(branding_path_component)', |
| 8 'version_py': '<(DEPTH)/build/util/version.py', | 8 'version_py': '<(DEPTH)/build/util/version.py', |
| 9 'version_path': '../../chrome/VERSION', | 9 'version_path': '../../chrome/VERSION', |
| 10 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', | 10 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', |
| 11 # 'branding_dir' is set in the 'conditions' section at the bottom. | 11 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 12 'msvs_use_common_release': 0, | 12 'msvs_use_common_release': 0, |
| 13 'msvs_use_common_linker_extras': 0, | 13 'msvs_use_common_linker_extras': 0, |
| 14 }, | 14 }, |
| 15 'includes': [ | 15 'includes': [ |
| 16 '../../build/win_precompile.gypi', | 16 '../../build/win_precompile.gypi', |
| 17 ], | 17 ], |
| 18 'conditions': [ | 18 'conditions': [ |
| 19 ['OS=="win"', { | 19 ['OS=="win"', { |
| 20 'targets': [ | 20 'targets': [ |
| 21 { | 21 { |
| 22 # GN version: //chrome/installer/test:alternate_version_generator_lib |
| 22 'target_name': 'alternate_version_generator_lib', | 23 'target_name': 'alternate_version_generator_lib', |
| 23 'type': 'static_library', | 24 'type': 'static_library', |
| 24 'dependencies': [ | 25 'dependencies': [ |
| 25 '../chrome.gyp:installer_util', | 26 '../chrome.gyp:installer_util', |
| 26 '../common_constants.gyp:common_constants', | 27 '../common_constants.gyp:common_constants', |
| 27 '../../base/base.gyp:base', | 28 '../../base/base.gyp:base', |
| 28 ], | 29 ], |
| 29 'include_dirs': [ | 30 'include_dirs': [ |
| 30 '../..', | 31 '../..', |
| 31 ], | 32 ], |
| 32 'sources': [ | 33 'sources': [ |
| 33 'test/alternate_version_generator.cc', | 34 'test/alternate_version_generator.cc', |
| 34 'test/alternate_version_generator.h', | 35 'test/alternate_version_generator.h', |
| 35 'test/pe_image_resources.cc', | 36 'test/pe_image_resources.cc', |
| 36 'test/pe_image_resources.h', | 37 'test/pe_image_resources.h', |
| 37 'test/resource_loader.cc', | 38 'test/resource_loader.cc', |
| 38 'test/resource_loader.h', | 39 'test/resource_loader.h', |
| 39 'test/resource_updater.cc', | 40 'test/resource_updater.cc', |
| 40 'test/resource_updater.h', | 41 'test/resource_updater.h', |
| 41 ], | 42 ], |
| 42 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 43 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 43 'msvs_disabled_warnings': [4267, ], | 44 'msvs_disabled_warnings': [4267, ], |
| 44 }, | 45 }, |
| 45 { | 46 { |
| 47 # GN version: //chrome/installer/test:upgrade_test |
| 46 'target_name': 'upgrade_test', | 48 'target_name': 'upgrade_test', |
| 47 'type': 'executable', | 49 'type': 'executable', |
| 48 'dependencies': [ | 50 'dependencies': [ |
| 49 'alternate_version_generator_lib', | 51 'alternate_version_generator_lib', |
| 50 # This dependency, although correct, results in the mini installer | 52 # This dependency, although correct, results in the mini installer |
| 51 # being rebuilt every time upgrade_test is built. So disable it | 53 # being rebuilt every time upgrade_test is built. So disable it |
| 52 # for now. | 54 # for now. |
| 53 # TODO(grt): fix rules/targets/etc for | 55 # TODO(grt): fix rules/targets/etc for |
| 54 # mini_installer.gyp:mini_installer so that it does no work if | 56 # mini_installer.gyp:mini_installer so that it does no work if |
| 55 # nothing has changed, then un-comment this next line: | 57 # nothing has changed, then un-comment this next line: |
| 56 # 'mini_installer.gyp:mini_installer', | 58 # 'mini_installer.gyp:mini_installer', |
| 57 '../../base/base.gyp:test_support_base', | 59 '../../base/base.gyp:test_support_base', |
| 58 '../../testing/gtest.gyp:gtest', | 60 '../../testing/gtest.gyp:gtest', |
| 59 '../chrome.gyp:installer_util', | 61 '../chrome.gyp:installer_util', |
| 60 '../common_constants.gyp:common_constants', | 62 '../common_constants.gyp:common_constants', |
| 61 ], | 63 ], |
| 62 'include_dirs': [ | 64 'include_dirs': [ |
| 63 '../..', | 65 '../..', |
| 64 ], | 66 ], |
| 65 'sources': [ | 67 'sources': [ |
| 66 'test/run_all_tests.cc', | 68 'test/run_all_tests.cc', |
| 67 'test/upgrade_test.cc', | 69 'test/upgrade_test.cc', |
| 68 ], | 70 ], |
| 69 }, | 71 }, |
| 70 { | 72 { |
| 73 # GN version: //chrome/installer/test:alternate_version_generator |
| 71 'target_name': 'alternate_version_generator', | 74 'target_name': 'alternate_version_generator', |
| 72 'type': 'executable', | 75 'type': 'executable', |
| 73 'dependencies': [ | 76 'dependencies': [ |
| 74 'alternate_version_generator_lib', | 77 'alternate_version_generator_lib', |
| 75 '../../base/base.gyp:test_support_base', | 78 '../../base/base.gyp:test_support_base', |
| 76 '../../testing/gtest.gyp:gtest', | 79 '../../testing/gtest.gyp:gtest', |
| 77 '../chrome.gyp:installer_util', | 80 '../chrome.gyp:installer_util', |
| 78 '../common_constants.gyp:common_constants', | 81 '../common_constants.gyp:common_constants', |
| 79 ], | 82 ], |
| 80 'include_dirs': [ | 83 'include_dirs': [ |
| 81 '../..', | 84 '../..', |
| 82 ], | 85 ], |
| 83 'sources': [ | 86 'sources': [ |
| 84 'test/alternate_version_generator_main.cc', | 87 'test/alternate_version_generator_main.cc', |
| 85 ], | 88 ], |
| 86 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 89 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 87 'msvs_disabled_warnings': [ 4267, ], | 90 'msvs_disabled_warnings': [ 4267, ], |
| 88 }, | 91 }, |
| 89 ], | 92 ], |
| 90 }], | 93 }], |
| 91 ], | 94 ], |
| 92 } | 95 } |
| OLD | NEW |