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

Side by Side Diff: build/gyp_chromium.py

Issue 1890053004: Stop gyp_chromium prior to mass DLL copies on error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unecessary copies Created 4 years, 8 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 | « no previous file | build/vs_toolchain.py » ('j') | build/vs_toolchain.py » ('J')
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 """This script is wrapper for Chromium that adds some support for how GYP 5 """This script is wrapper for Chromium that adds some support for how GYP
6 is invoked by Chromium beyond what can be done in the gclient hooks. 6 is invoked by Chromium beyond what can be done in the gclient hooks.
7 """ 7 """
8 8
9 import argparse 9 import argparse
10 import gc 10 import gc
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 if mac_toolchain_dir: 320 if mac_toolchain_dir:
321 args.append('-Gmac_toolchain_dir=' + mac_toolchain_dir) 321 args.append('-Gmac_toolchain_dir=' + mac_toolchain_dir)
322 322
323 if not use_analyzer: 323 if not use_analyzer:
324 print 'Updating projects from gyp files...' 324 print 'Updating projects from gyp files...'
325 sys.stdout.flush() 325 sys.stdout.flush()
326 326
327 # Off we go... 327 # Off we go...
328 gyp_rc = gyp.main(args) 328 gyp_rc = gyp.main(args)
329 329
330 if not use_analyzer: 330 if gyp_rc == 0 and not use_analyzer:
331 vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() 331 vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
332 if vs2013_runtime_dll_dirs: 332 if vs2013_runtime_dll_dirs:
333 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs 333 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
334 vs_toolchain.CopyVsRuntimeDlls( 334 vs_toolchain.CopyVsRuntimeDlls(
335 os.path.join(chrome_src, GetOutputDirectory()), 335 os.path.join(chrome_src, GetOutputDirectory()),
336 (x86_runtime, x64_runtime)) 336 (x86_runtime, x64_runtime))
337 337
338 sys.exit(gyp_rc) 338 sys.exit(gyp_rc)
339 339
340 if __name__ == '__main__': 340 if __name__ == '__main__':
341 sys.exit(main()) 341 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | build/vs_toolchain.py » ('j') | build/vs_toolchain.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698