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

Side by Side Diff: build/vs_toolchain.py

Issue 1959413002: Allow building with VS 2015 Update 3 pre-release (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove #if statements Created 4 years, 7 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 | chrome/app/delay_load_hook_win.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 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import glob 6 import glob
7 import json 7 import json
8 import os 8 import os
9 import pipes 9 import pipes
10 import shutil 10 import shutil
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 runtime_dir = x64_runtime if target_cpu == 'x64' else x86_runtime 272 runtime_dir = x64_runtime if target_cpu == 'x64' else x86_runtime
273 _CopyRuntime(target_dir, runtime_dir, target_cpu, debug=False) 273 _CopyRuntime(target_dir, runtime_dir, target_cpu, debug=False)
274 if configuration == 'Debug': 274 if configuration == 'Debug':
275 _CopyRuntime(target_dir, runtime_dir, target_cpu, debug=True) 275 _CopyRuntime(target_dir, runtime_dir, target_cpu, debug=True)
276 276
277 277
278 def _GetDesiredVsToolchainHashes(): 278 def _GetDesiredVsToolchainHashes():
279 """Load a list of SHA1s corresponding to the toolchains that we want installed 279 """Load a list of SHA1s corresponding to the toolchains that we want installed
280 to build with.""" 280 to build with."""
281 if GetVisualStudioVersion() == '2015': 281 if GetVisualStudioVersion() == '2015':
282 # Update 2. 282 # Update 3 pre-release, May 9th.
283 return ['95ddda401ec5678f15eeed01d2bee08fcbc5ee97'] 283 return ['97b5c1d5f7c614126da344d55a20dcc424f578eb']
scottmg 2016/05/12 18:34:38 with a if bool(int(os.environ.get('DEPOT_TOOLS_WI
284 else: 284 else:
285 return ['03a4e939cd325d6bc5216af41b92d02dda1366a6'] 285 return ['03a4e939cd325d6bc5216af41b92d02dda1366a6']
286 286
287 287
288 def ShouldUpdateToolchain(): 288 def ShouldUpdateToolchain():
289 """Check if the toolchain should be upgraded.""" 289 """Check if the toolchain should be upgraded."""
290 if not os.path.exists(json_data_file): 290 if not os.path.exists(json_data_file):
291 return True 291 return True
292 with open(json_data_file, 'r') as tempf: 292 with open(json_data_file, 'r') as tempf:
293 toolchain_data = json.load(tempf) 293 toolchain_data = json.load(tempf)
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 'copy_dlls': CopyDlls, 369 'copy_dlls': CopyDlls,
370 } 370 }
371 if len(sys.argv) < 2 or sys.argv[1] not in commands: 371 if len(sys.argv) < 2 or sys.argv[1] not in commands:
372 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands) 372 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands)
373 return 1 373 return 1
374 return commands[sys.argv[1]](*sys.argv[2:]) 374 return commands[sys.argv[1]](*sys.argv[2:])
375 375
376 376
377 if __name__ == '__main__': 377 if __name__ == '__main__':
378 sys.exit(main()) 378 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | chrome/app/delay_load_hook_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698