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

Side by Side Diff: chrome/installer/upgrade_test.gyp

Issue 6338020: Command-line tool to generate a newly versioned mini_installer.exe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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
OLDNEW
1 { 1 {
robertshield 2011/01/28 18:36:22 This file needs a license header at the top.
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 }, 9 },
10 'conditions': [ 10 'conditions': [
11 ['OS=="win"', { 11 ['OS=="win"', {
12 'target_defaults': { 12 'target_defaults': {
13 'variables': {
14 'alternate_version_generator_target': 0,
15 },
16 'target_conditions': [
17 # This part is shared between the two targets.
18 ['alternate_version_generator_target==1', {
19 'sources': [
20 'test/alternate_version_generator.cc',
21 'test/alternate_version_generator.h',
22 'test/pe_image_resources.cc',
23 'test/pe_image_resources.h',
24 'test/resource_loader.cc',
25 'test/resource_loader.h',
26 'test/resource_updater.cc',
27 'test/resource_updater.h',
28 ],
29 }],
30 ],
13 }, 31 },
14 'targets': [ 32 'targets': [
15 { 33 {
16 'target_name': 'upgrade_test', 34 'target_name': 'upgrade_test',
17 'msvs_guid': 'BC4D6130-FDAD-47FB-B4FD-FCAF78DCBC3C', 35 'msvs_guid': 'BC4D6130-FDAD-47FB-B4FD-FCAF78DCBC3C',
18 'type': 'executable', 36 'type': 'executable',
37 'variables': {
38 'alternate_version_generator_target': 1,
39 },
19 'dependencies': [ 40 'dependencies': [
20 # This dependency, although correct, results in the mini installer 41 # This dependency, although correct, results in the mini installer
21 # being rebuilt every time upgrade_test is built. So disable it 42 # being rebuilt every time upgrade_test is built. So disable it
22 # for now. 43 # for now.
23 # TODO(grt): fix rules/targets/etc for 44 # TODO(grt): fix rules/targets/etc for
24 # mini_installer.gyp:mini_installer so that it does no work if 45 # mini_installer.gyp:mini_installer so that it does no work if
25 # nothing has changed, then un-comment this next line: 46 # nothing has changed, then un-comment this next line:
26 # 'mini_installer.gyp:mini_installer', 47 # 'mini_installer.gyp:mini_installer',
27 '../../base/base.gyp:test_support_base', 48 '../../base/base.gyp:test_support_base',
28 '../../testing/gtest.gyp:gtest', 49 '../../testing/gtest.gyp:gtest',
29 '../chrome.gyp:common_constants', 50 '../chrome.gyp:common_constants',
30 '../chrome.gyp:installer_util', 51 '../chrome.gyp:installer_util',
31 ], 52 ],
32 'include_dirs': [ 53 'include_dirs': [
33 '../..', 54 '../..',
34 ], 55 ],
35 'sources': [ 56 'sources': [
36 'test/alternate_version_generator.cc',
37 'test/alternate_version_generator.h',
38 'test/pe_image_resources.cc',
39 'test/pe_image_resources.h',
40 'test/resource_loader.cc',
41 'test/resource_loader.h',
42 'test/resource_updater.cc',
43 'test/resource_updater.h',
44 'test/run_all_tests.cc', 57 'test/run_all_tests.cc',
45 'test/upgrade_test.cc', 58 'test/upgrade_test.cc',
46 ], 59 ],
47 }, 60 },
61 {
62 'target_name': 'alternate_version_generator',
63 'msvs_guid': 'E6E6B339-AEC0-44C9-B9D0-E30138108379',
64 'type': 'executable',
65 'variables': {
66 'alternate_version_generator_target': 1,
67 },
68 'dependencies': [
69 '../../base/base.gyp:test_support_base',
70 '../../testing/gtest.gyp:gtest',
71 '../chrome.gyp:common_constants',
72 '../chrome.gyp:installer_util',
73 ],
74 'include_dirs': [
75 '../..',
76 ],
77 'sources': [
78 'test/alternate_version_generator_main.cc',
79 ],
80 },
48 ], 81 ],
49 }], 82 }],
50 [ 'branding == "Chrome"', { 83 [ 'branding == "Chrome"', {
51 'variables': { 84 'variables': {
52 'branding_dir': '../app/theme/google_chrome', 85 'branding_dir': '../app/theme/google_chrome',
53 }, 86 },
54 }, { # else branding!="Chrome" 87 }, { # else branding!="Chrome"
55 'variables': { 88 'variables': {
56 'branding_dir': '../app/theme/chromium', 89 'branding_dir': '../app/theme/chromium',
57 }, 90 },
58 }], 91 }],
59 ], 92 ],
60 } 93 }
61 94
62 # Local Variables: 95 # Local Variables:
63 # tab-width:2 96 # tab-width:2
64 # indent-tabs-mode:nil 97 # indent-tabs-mode:nil
65 # End: 98 # End:
66 # vim: set expandtab tabstop=2 shiftwidth=2: 99 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698