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

Side by Side Diff: trunk/src/build/gyp_chromium

Issue 183993005: Revert 253993 "Default to VS2013 on Windows" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script is wrapper for Chromium that adds some support for how GYP 7 # This script is wrapper for Chromium that adds some support for how GYP
8 # is invoked by Chromium beyond what can be done in the gclient hooks. 8 # is invoked by Chromium beyond what can be done in the gclient hooks.
9 9
10 import glob 10 import glob
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 os.environ['GYP_GENERATORS'] = 'ninja' 464 os.environ['GYP_GENERATORS'] = 'ninja'
465 if sys.platform.startswith('win') and not os.environ.get('GYP_GENERATORS'): 465 if sys.platform.startswith('win') and not os.environ.get('GYP_GENERATORS'):
466 os.environ['GYP_GENERATORS'] = 'ninja' 466 os.environ['GYP_GENERATORS'] = 'ninja'
467 elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \ 467 elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \
468 not 'OS=ios' in os.environ.get('GYP_DEFINES', []): 468 not 'OS=ios' in os.environ.get('GYP_DEFINES', []):
469 os.environ['GYP_GENERATORS'] = 'ninja' 469 os.environ['GYP_GENERATORS'] = 'ninja'
470 470
471 # If on Windows, request that depot_tools install/update the automatic 471 # If on Windows, request that depot_tools install/update the automatic
472 # toolchain, and then use it (unless opted-out). 472 # toolchain, and then use it (unless opted-out).
473 vs2013_runtime_dll_dirs = None 473 vs2013_runtime_dll_dirs = None
474 # TODO(scottmg): Temporarily default to off, see http://crbug.com/345993.
474 depot_tools_win_toolchain = \ 475 depot_tools_win_toolchain = \
475 bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) 476 bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '0')))
476 if sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain: 477 if sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain:
477 import find_depot_tools 478 import find_depot_tools
478 depot_tools_path = find_depot_tools.add_depot_tools_to_path() 479 depot_tools_path = find_depot_tools.add_depot_tools_to_path()
479 temp_handle, data_file = tempfile.mkstemp(suffix='.json') 480 temp_handle, data_file = tempfile.mkstemp(suffix='.json')
480 os.close(temp_handle) 481 os.close(temp_handle)
481 get_toolchain_args = [ 482 get_toolchain_args = [
482 sys.executable, 483 sys.executable,
483 os.path.join(depot_tools_path, 484 os.path.join(depot_tools_path,
484 'win_toolchain', 485 'win_toolchain',
485 'get_toolchain_if_necessary.py'), 486 'get_toolchain_if_necessary.py'),
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 print 'Running build/landmines.py...' 556 print 'Running build/landmines.py...'
556 subprocess.check_call( 557 subprocess.check_call(
557 [sys.executable, os.path.join(script_dir, 'landmines.py')]) 558 [sys.executable, os.path.join(script_dir, 'landmines.py')])
558 559
559 if vs2013_runtime_dll_dirs: 560 if vs2013_runtime_dll_dirs:
560 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs 561 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
561 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), 562 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()),
562 (x86_runtime, x64_runtime)) 563 (x86_runtime, x64_runtime))
563 564
564 sys.exit(gyp_rc) 565 sys.exit(gyp_rc)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698