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

Side by Side Diff: chrome/installer/mini_installer.gypi

Issue 1372303003: Make create_installer_archive.py operate silently by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better stdout/stderr capture Created 5 years, 2 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/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/BUILD.gn » ('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 'dependencies': [ 5 'dependencies': [
6 '<@(chrome_dll_project)', 6 '<@(chrome_dll_project)',
7 '../chrome.gyp:chrome', 7 '../chrome.gyp:chrome',
8 '../chrome.gyp:chrome_nacl_win64', 8 '../chrome.gyp:chrome_nacl_win64',
9 '../chrome.gyp:default_extensions', 9 '../chrome.gyp:default_extensions',
10 '../chrome.gyp:setup', 10 '../chrome.gyp:setup',
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc', 214 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
215 '<(enable_hidpi_flag)', 215 '<(enable_hidpi_flag)',
216 '<(target_arch_flag)', 216 '<(target_arch_flag)',
217 # TODO(sgk): may just use environment variables 217 # TODO(sgk): may just use environment variables
218 #'--distribution=$(CHROMIUM_BUILD)', 218 #'--distribution=$(CHROMIUM_BUILD)',
219 '--distribution=_google_chrome', 219 '--distribution=_google_chrome',
220 # Optional arguments to generate diff installer 220 # Optional arguments to generate diff installer
221 #'--last_chrome_installer=C:/Temp/base', 221 #'--last_chrome_installer=C:/Temp/base',
222 #'--setup_exe_format=DIFF', 222 #'--setup_exe_format=DIFF',
223 #'--diff_algorithm=COURGETTE', 223 #'--diff_algorithm=COURGETTE',
224 # Optional argument for verbose archiving output.
225 #'--verbose',
224 ], 226 ],
225 'message': 'Create installer archive', 227 'message': 'Create installer archive',
226 }, 228 },
227 ], 229 ],
228 'conditions': [ 230 'conditions': [
229 # TODO(mark): <(branding_dir) should be defined by the 231 # TODO(mark): <(branding_dir) should be defined by the
230 # global condition block at the bottom of the file, but 232 # global condition block at the bottom of the file, but
231 # this doesn't work due to the following issue: 233 # this doesn't work due to the following issue:
232 # 234 #
233 # http://code.google.com/p/gyp/issues/detail?id=22 235 # http://code.google.com/p/gyp/issues/detail?id=22
234 # 236 #
235 # Remove this block once the above issue is fixed. 237 # Remove this block once the above issue is fixed.
236 ['branding == "Chrome"', { 238 ['branding == "Chrome"', {
237 'variables': { 239 'variables': {
238 'branding_dir': '../app/theme/google_chrome', 240 'branding_dir': '../app/theme/google_chrome',
239 }, 241 },
240 }, { # else branding!="Chrome" 242 }, { # else branding!="Chrome"
241 'variables': { 243 'variables': {
242 'branding_dir': '../app/theme/chromium', 244 'branding_dir': '../app/theme/chromium',
243 }, 245 },
244 }], 246 }],
245 ['OS=="win" and buildtype=="Official"', { 247 ['OS=="win" and buildtype=="Official"', {
246 # Optimize for size when doing an official build. 248 # Optimize for size when doing an official build.
247 'optimize' :'size', 249 'optimize' :'size',
248 }], 250 }],
249 ], 251 ],
250 } 252 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698