OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'conditions': [ | 6 'conditions': [ |
7 ['OS=="win"', { | 7 ['OS=="win"', { |
8 'targets': [ | 8 'targets': [ |
9 # TODO(jackhou): Add a version resource (using | |
10 # version_resource_rules.gypi). | |
11 { | 9 { |
12 'target_name': 'app_installer', | 10 'target_name': 'app_installer_util', |
13 'type': 'executable', | 11 'type': 'static_library', |
14 'dependencies': [ | 12 'dependencies': [ |
15 'installer_util', | 13 'installer_util', |
16 'installer_util_strings', | 14 'installer_util_strings', |
17 'launcher_support', | 15 'launcher_support', |
18 'common_constants.gyp:common_constants', | 16 'common_constants.gyp:common_constants', |
19 '../base/base.gyp:base', | 17 '../base/base.gyp:base', |
20 '../third_party/omaha/omaha.gyp:omaha_extractor', | 18 '../third_party/omaha/omaha.gyp:omaha_extractor', |
21 ], | 19 ], |
22 'include_dirs': [ | 20 'include_dirs': [ |
23 '..', | 21 '..', |
24 '<(INTERMEDIATE_DIR)', | 22 '<(INTERMEDIATE_DIR)', |
25 ], | 23 ], |
26 'sources': [ | 24 'sources': [ |
25 'win/app_installer_util.cc', | |
26 'win/app_installer_util.h', | |
27 ], | |
28 }, | |
29 # TODO(jackhou): Add a version resource (using | |
30 # version_resource_rules.gypi). | |
31 { | |
32 'target_name': 'app_installer', | |
33 'type': 'executable', | |
34 'dependencies': [ | |
35 'app_installer_util', | |
36 '../base/base.gyp:base', | |
37 ], | |
38 'include_dirs': [ | |
39 '..', | |
40 '<(INTERMEDIATE_DIR)', | |
41 ], | |
42 'sources': [ | |
27 'win/app_installer_main.cc', | 43 'win/app_installer_main.cc', |
28 ], | 44 ], |
29 'msvs_settings': { | 45 'msvs_settings': { |
30 'VCLinkerTool': { | 46 'VCLinkerTool': { |
31 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 47 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
32 }, | 48 }, |
33 'VCManifestTool': { | 49 'VCManifestTool': { |
34 'AdditionalManifestFiles': [ | 50 'AdditionalManifestFiles': [ |
35 'app_installer/win/app_installer.exe.manifest', | 51 'app_installer/win/app_installer.exe.manifest', |
36 ], | 52 ], |
37 }, | 53 }, |
38 }, | 54 }, |
39 }, | 55 }, |
56 { | |
57 'target_name': 'app_installer_unittests', | |
grt (UTC plus 2)
2014/11/07 03:13:36
in the new world, i think you just need to add thi
jackhou1
2014/11/07 05:37:52
Hmm, adding it to chromium_trybot.json didn't caus
| |
58 'type': 'executable', | |
59 'dependencies': [ | |
60 'app_installer_util', | |
61 '../base/base.gyp:base', | |
62 '../base/base.gyp:run_all_unittests', | |
63 '../testing/gtest.gyp:gtest', | |
64 ], | |
65 'include_dirs': [ | |
66 '..', | |
67 '<(INTERMEDIATE_DIR)', | |
68 ], | |
69 'sources': [ | |
70 'win/app_installer_util_unittest.cc', | |
71 ], | |
72 'msvs_settings': { | |
73 'VCManifestTool': { | |
74 'AdditionalManifestFiles': [ | |
75 'app_installer/win/app_installer.exe.manifest', | |
76 ], | |
77 }, | |
78 }, | |
79 }, | |
40 ], | 80 ], |
41 }], | 81 }], |
42 ], | 82 ], |
43 } | 83 } |
OLD | NEW |