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

Side by Side Diff: build/vs_toolchain.py

Issue 1615603002: Fix gn builds with locally installed VS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaked comments and removed test code Created 4 years, 11 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 | « build/toolchain/win/setup_toolchain.py ('k') | 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 # 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 json 6 import json
7 import os 7 import os
8 import pipes 8 import pipes
9 import shutil 9 import shutil
10 import subprocess 10 import subprocess
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 return 0 322 return 0
323 323
324 324
325 def GetToolchainDir(): 325 def GetToolchainDir():
326 """Gets location information about the current toolchain (must have been 326 """Gets location information about the current toolchain (must have been
327 previously updated by 'update'). This is used for the GN build.""" 327 previously updated by 'update'). This is used for the GN build."""
328 runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs() 328 runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
329 329
330 # If WINDOWSSDKDIR is not set, search the default SDK path and set it. 330 # If WINDOWSSDKDIR is not set, search the default SDK path and set it.
331 if not 'WINDOWSSDKDIR' in os.environ: 331 if not 'WINDOWSSDKDIR' in os.environ:
332 default_sdk_path = 'C:\\Program Files (x86)\\Windows Kits\\8.1' 332 default_sdk_path = 'C:\\Program Files (x86)\\Windows Kits\\10'
333 if os.path.isdir(default_sdk_path): 333 if os.path.isdir(default_sdk_path):
334 os.environ['WINDOWSSDKDIR'] = default_sdk_path 334 os.environ['WINDOWSSDKDIR'] = default_sdk_path
335 335
336 print '''vs_path = "%s" 336 print '''vs_path = "%s"
337 sdk_path = "%s" 337 sdk_path = "%s"
338 vs_version = "%s" 338 vs_version = "%s"
339 wdk_dir = "%s" 339 wdk_dir = "%s"
340 runtime_dirs = "%s" 340 runtime_dirs = "%s"
341 ''' % ( 341 ''' % (
342 os.environ['GYP_MSVS_OVERRIDE_PATH'], 342 os.environ['GYP_MSVS_OVERRIDE_PATH'],
(...skipping 10 matching lines...) Expand all
353 'copy_dlls': CopyDlls, 353 'copy_dlls': CopyDlls,
354 } 354 }
355 if len(sys.argv) < 2 or sys.argv[1] not in commands: 355 if len(sys.argv) < 2 or sys.argv[1] not in commands:
356 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands) 356 print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands)
357 return 1 357 return 1
358 return commands[sys.argv[1]](*sys.argv[2:]) 358 return commands[sys.argv[1]](*sys.argv[2:])
359 359
360 360
361 if __name__ == '__main__': 361 if __name__ == '__main__':
362 sys.exit(main()) 362 sys.exit(main())
OLDNEW
« no previous file with comments | « build/toolchain/win/setup_toolchain.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698