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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 19275010: Embed compatibility manifest into all *.exe files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: style fix Created 7 years, 4 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
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/installer/mini_installer/mini_installer.exe.manifest » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'lastchange_path': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 'installer/util/self_cleaning_temp_dir_unittest.cc', 130 'installer/util/self_cleaning_temp_dir_unittest.cc',
131 'installer/util/set_reg_value_work_item_unittest.cc', 131 'installer/util/set_reg_value_work_item_unittest.cc',
132 'installer/util/shell_util_unittest.cc', 132 'installer/util/shell_util_unittest.cc',
133 'installer/util/uninstall_metrics_unittest.cc', 133 'installer/util/uninstall_metrics_unittest.cc',
134 'installer/util/wmi_unittest.cc', 134 'installer/util/wmi_unittest.cc',
135 'installer/util/work_item_list_unittest.cc', 135 'installer/util/work_item_list_unittest.cc',
136 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 136 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
137 ], 137 ],
138 'msvs_settings': { 138 'msvs_settings': {
139 'VCManifestTool': { 139 'VCManifestTool': {
140 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_install er\\mini_installer.exe.manifest', 140 'AdditionalManifestFiles': [
141 '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.ma nifest',
142 ],
141 }, 143 },
142 }, 144 },
143 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 145 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
144 'msvs_disabled_warnings': [ 4267, ], 146 'msvs_disabled_warnings': [ 4267, ],
145 }, 147 },
146 { 148 {
147 'target_name': 'installer_util_strings', 149 'target_name': 'installer_util_strings',
148 'type': 'none', 150 'type': 'none',
149 'rules': [ 151 'rules': [
150 { 152 {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 'test/mini_installer_test/installer_test_util.h', 228 'test/mini_installer_test/installer_test_util.h',
227 'test/mini_installer_test/mini_installer_test_constants.cc', 229 'test/mini_installer_test/mini_installer_test_constants.cc',
228 'test/mini_installer_test/mini_installer_test_constants.h', 230 'test/mini_installer_test/mini_installer_test_constants.h',
229 'test/mini_installer_test/run_all_unittests.cc', 231 'test/mini_installer_test/run_all_unittests.cc',
230 'test/mini_installer_test/switch_builder.cc', 232 'test/mini_installer_test/switch_builder.cc',
231 'test/mini_installer_test/switch_builder.h', 233 'test/mini_installer_test/switch_builder.h',
232 'test/mini_installer_test/test.cc', 234 'test/mini_installer_test/test.cc',
233 ], 235 ],
234 'msvs_settings': { 236 'msvs_settings': {
235 'VCManifestTool': { 237 'VCManifestTool': {
236 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_install er\\mini_installer.exe.manifest', 238 'AdditionalManifestFiles': [
239 '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.ma nifest',
240 ],
237 }, 241 },
238 }, 242 },
239 }, 243 },
240 { 244 {
241 'target_name': 'setup', 245 'target_name': 'setup',
242 'type': 'executable', 246 'type': 'executable',
243 'dependencies': [ 247 'dependencies': [
244 'installer_util', 248 'installer_util',
245 'installer_util_strings', 249 'installer_util_strings',
246 'launcher_support', 250 'launcher_support',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 'installer/setup/setup_util.cc', 288 'installer/setup/setup_util.cc',
285 'installer/setup/setup_util.h', 289 'installer/setup/setup_util.h',
286 'installer/setup/uninstall.cc', 290 'installer/setup/uninstall.cc',
287 'installer/setup/uninstall.h', 291 'installer/setup/uninstall.h',
288 ], 292 ],
289 'msvs_settings': { 293 'msvs_settings': {
290 'VCLinkerTool': { 294 'VCLinkerTool': {
291 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 295 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
292 }, 296 },
293 'VCManifestTool': { 297 'VCManifestTool': {
294 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup .exe.manifest', 298 'AdditionalManifestFiles': [
299 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
300 ],
295 }, 301 },
296 }, 302 },
297 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 303 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
298 'msvs_disabled_warnings': [ 4267, ], 304 'msvs_disabled_warnings': [ 4267, ],
299 'rules': [ 305 'rules': [
300 { 306 {
301 'rule_name': 'setup_version', 307 'rule_name': 'setup_version',
302 'extension': 'version', 308 'extension': 'version',
303 'variables': { 309 'variables': {
304 'version_py_path': '../chrome/tools/build/version.py', 310 'version_py_path': '../chrome/tools/build/version.py',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 '--header_output_dir=<(INTERMEDIATE_DIR)', 352 '--header_output_dir=<(INTERMEDIATE_DIR)',
347 # TODO(sgk): may just use environment variables 353 # TODO(sgk): may just use environment variables
348 #'--distribution=$(CHROMIUM_BUILD)', 354 #'--distribution=$(CHROMIUM_BUILD)',
349 '--distribution=_google_chrome', 355 '--distribution=_google_chrome',
350 ], 356 ],
351 'msvs_cygwin_shell': 1, 357 'msvs_cygwin_shell': 1,
352 }, 358 },
353 ], 359 ],
354 'conditions': [ 360 'conditions': [
355 ['component == "shared_library"', { 361 ['component == "shared_library"', {
356 'msvs_settings': { 362 'variables': {
357 'VCManifestTool': { 363 'win_use_external_manifest': 1,
358 'EmbedManifest': 'false',
359 },
360 }, 364 },
361 }], 365 }],
362 # TODO(mark): <(branding_dir) should be defined by the 366 # TODO(mark): <(branding_dir) should be defined by the
363 # global condition block at the bottom of the file, but 367 # global condition block at the bottom of the file, but
364 # this doesn't work due to the following issue: 368 # this doesn't work due to the following issue:
365 # 369 #
366 # http://code.google.com/p/gyp/issues/detail?id=22 370 # http://code.google.com/p/gyp/issues/detail?id=22
367 # 371 #
368 # Remove this block once the above issue is fixed. 372 # Remove this block once the above issue is fixed.
369 [ 'branding == "Chrome"', { 373 [ 'branding == "Chrome"', {
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1220 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1217 }, 1221 },
1218 }, { # else branding!="Chrome" 1222 }, { # else branding!="Chrome"
1219 'variables': { 1223 'variables': {
1220 'branding_dir': 'app/theme/chromium', 1224 'branding_dir': 'app/theme/chromium',
1221 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1225 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1222 }, 1226 },
1223 }], 1227 }],
1224 ], 1228 ],
1225 } 1229 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/installer/mini_installer/mini_installer.exe.manifest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698