| Index: chrome/installer/upgrade_test.gyp
|
| ===================================================================
|
| --- chrome/installer/upgrade_test.gyp (revision 72966)
|
| +++ chrome/installer/upgrade_test.gyp (working copy)
|
| @@ -10,12 +10,33 @@
|
| 'conditions': [
|
| ['OS=="win"', {
|
| 'target_defaults': {
|
| + 'variables': {
|
| + 'alternate_version_generator_target': 0,
|
| + },
|
| + 'target_conditions': [
|
| + # This part is shared between the two targets.
|
| + ['alternate_version_generator_target==1', {
|
| + 'sources': [
|
| + 'test/alternate_version_generator.cc',
|
| + 'test/alternate_version_generator.h',
|
| + 'test/pe_image_resources.cc',
|
| + 'test/pe_image_resources.h',
|
| + 'test/resource_loader.cc',
|
| + 'test/resource_loader.h',
|
| + 'test/resource_updater.cc',
|
| + 'test/resource_updater.h',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| 'targets': [
|
| {
|
| 'target_name': 'upgrade_test',
|
| 'msvs_guid': 'BC4D6130-FDAD-47FB-B4FD-FCAF78DCBC3C',
|
| 'type': 'executable',
|
| + 'variables': {
|
| + 'alternate_version_generator_target': 1,
|
| + },
|
| 'dependencies': [
|
| # This dependency, although correct, results in the mini installer
|
| # being rebuilt every time upgrade_test is built. So disable it
|
| @@ -33,18 +54,30 @@
|
| '../..',
|
| ],
|
| 'sources': [
|
| - 'test/alternate_version_generator.cc',
|
| - 'test/alternate_version_generator.h',
|
| - 'test/pe_image_resources.cc',
|
| - 'test/pe_image_resources.h',
|
| - 'test/resource_loader.cc',
|
| - 'test/resource_loader.h',
|
| - 'test/resource_updater.cc',
|
| - 'test/resource_updater.h',
|
| 'test/run_all_tests.cc',
|
| 'test/upgrade_test.cc',
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'alternate_version_generator',
|
| + 'msvs_guid': 'E6E6B339-AEC0-44C9-B9D0-E30138108379',
|
| + 'type': 'executable',
|
| + 'variables': {
|
| + 'alternate_version_generator_target': 1,
|
| + },
|
| + 'dependencies': [
|
| + '../../base/base.gyp:test_support_base',
|
| + '../../testing/gtest.gyp:gtest',
|
| + '../chrome.gyp:common_constants',
|
| + '../chrome.gyp:installer_util',
|
| + ],
|
| + 'include_dirs': [
|
| + '../..',
|
| + ],
|
| + 'sources': [
|
| + 'test/alternate_version_generator_main.cc',
|
| + ],
|
| + },
|
| ],
|
| }],
|
| [ 'branding == "Chrome"', {
|
|
|