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

Side by Side Diff: gypfiles/vs_toolchain.py

Issue 1886983002: [build] Use MSVS 2015 by default. Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Use exit Created 4 years, 6 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 | « gypfiles/standalone.gypi ('k') | src/d8.cc » ('j') | 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 # Copyright 2015 the V8 project authors. All rights reserved. 2 # Copyright 2015 the V8 project authors. All rights reserved.
3 # Copyright 2014 The Chromium Authors. All rights reserved. 3 # Copyright 2014 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 import glob 7 import glob
8 import json 8 import json
9 import os 9 import os
10 import pipes 10 import pipes
11 import shutil 11 import shutil
12 import subprocess 12 import subprocess
13 import sys 13 import sys
14 14
15 15
16 script_dir = os.path.dirname(os.path.realpath(__file__)) 16 script_dir = os.path.dirname(os.path.realpath(__file__))
17 chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir)) 17 chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
18 SRC_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 18 SRC_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
19 sys.path.insert(1, os.path.join(chrome_src, 'tools')) 19 sys.path.insert(1, os.path.join(chrome_src, 'tools'))
20 sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib')) 20 sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
21 json_data_file = os.path.join(script_dir, 'win_toolchain.json') 21 json_data_file = os.path.join(script_dir, 'win_toolchain.json')
22 22
23 23
24 import gyp 24 import gyp
25 25
26 26
27 # Use MSVS2013 as the default toolchain. 27 # Use MSVS2015 as the default toolchain.
28 CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2013' 28 CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2015'
29 29
30 30
31 def SetEnvironmentAndGetRuntimeDllDirs(): 31 def SetEnvironmentAndGetRuntimeDllDirs():
32 """Sets up os.environ to use the depot_tools VS toolchain with gyp, and 32 """Sets up os.environ to use the depot_tools VS toolchain with gyp, and
33 returns the location of the VS runtime DLLs so they can be copied into 33 returns the location of the VS runtime DLLs so they can be copied into
34 the output directory after gyp generation. 34 the output directory after gyp generation.
35 """ 35 """
36 vs_runtime_dll_dirs = None 36 vs_runtime_dll_dirs = None
37 depot_tools_win_toolchain = \ 37 depot_tools_win_toolchain = \
38 bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) 38 bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 'copy_dlls': CopyDlls, 370 'copy_dlls': CopyDlls,
371 } 371 }
372 if len(sys.argv) < 2 or sys.argv[1] not in commands: 372 if len(sys.argv) < 2 or sys.argv[1] not in commands:
373 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands) 373 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands)
374 return 1 374 return 1
375 return commands[sys.argv[1]](*sys.argv[2:]) 375 return commands[sys.argv[1]](*sys.argv[2:])
376 376
377 377
378 if __name__ == '__main__': 378 if __name__ == '__main__':
379 sys.exit(main()) 379 sys.exit(main())
OLDNEW
« no previous file with comments | « gypfiles/standalone.gypi ('k') | src/d8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698