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

Side by Side Diff: win_toolchain/package_from_installed.py

Issue 1663753004: Add accidentally deleted 'if /x64' line back (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Add back missing line to SetEnv.cmd Created 4 years, 10 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 | 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 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 """ 5 """
6 From a system-installed copy of the toolchain, packages all the required bits 6 From a system-installed copy of the toolchain, packages all the required bits
7 into a .zip file. 7 into a .zip file.
8 8
9 It assumes default install locations for tools, in particular: 9 It assumes default install locations for tools, in particular:
10 - C:\Program Files (x86)\Microsoft Visual Studio 12.0\... 10 - C:\Program Files (x86)\Microsoft Visual Studio 12.0\...
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 'set VSINSTALLDIR=%~dp0..\\..\\\n' 209 'set VSINSTALLDIR=%~dp0..\\..\\\n'
210 'set VCINSTALLDIR=%~dp0..\\..\\VC\\\n' 210 'set VCINSTALLDIR=%~dp0..\\..\\VC\\\n'
211 'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\um;' 211 'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\um;'
212 '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;' 212 '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;'
213 '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;'.replace( 213 '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;'.replace(
214 'WINVERSION', WIN_VERSION)) 214 'WINVERSION', WIN_VERSION))
215 if VS_VERSION == '2015': 215 if VS_VERSION == '2015':
216 f.write('%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;'.replace( 216 f.write('%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;'.replace(
217 'WINVERSION', WIN_VERSION)) 217 'WINVERSION', WIN_VERSION))
218 f.write('%~dp0..\\..\\VC\\include;' 218 f.write('%~dp0..\\..\\VC\\include;'
219 '%~dp0..\\..\\VC\\atlmfc\\include\n') 219 '%~dp0..\\..\\VC\\atlmfc\\include\n'
220 'if "%1"=="/x64" goto x64\n')
220 221
221 # x86. Always use amd64_x86 cross, not x86 on x86. 222 # x86. Always use amd64_x86 cross, not x86 on x86.
222 f.write('set PATH=%~dp0..\\..\\win_sdk\\bin\\x86;' 223 f.write('set PATH=%~dp0..\\..\\win_sdk\\bin\\x86;'
223 '%~dp0..\\..\\VC\\bin\\amd64_x86;' 224 '%~dp0..\\..\\VC\\bin\\amd64_x86;'
224 '%~dp0..\\..\\VC\\bin\\amd64;' # Needed for mspdb1x0.dll. 225 '%~dp0..\\..\\VC\\bin\\amd64;' # Needed for mspdb1x0.dll.
225 '%PATH%\n') 226 '%PATH%\n')
226 f.write('set LIB=%~dp0..\\..\\VC\\lib;' 227 f.write('set LIB=%~dp0..\\..\\VC\\lib;'
227 '%~dp0..\\..\\win_sdk\\Lib\\WINVERSION\\um\\x86;' 228 '%~dp0..\\..\\win_sdk\\Lib\\WINVERSION\\um\\x86;'
228 '%~dp0..\\..\\win_sdk\\Lib\\WINVERSION\\ucrt\\x86;' # VS 2015 229 '%~dp0..\\..\\win_sdk\\Lib\\WINVERSION\\ucrt\\x86;' # VS 2015
229 '%~dp0..\\..\\VC\\atlmfc\\lib\n' 230 '%~dp0..\\..\\VC\\atlmfc\\lib\n'
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 sys.stdout.write('\rWrote to %s.%s\n' % (output, ' '*50)) 344 sys.stdout.write('\rWrote to %s.%s\n' % (output, ' '*50))
344 sys.stdout.flush() 345 sys.stdout.flush()
345 346
346 RenameToSha1(output) 347 RenameToSha1(output)
347 348
348 return 0 349 return 0
349 350
350 351
351 if __name__ == '__main__': 352 if __name__ == '__main__':
352 sys.exit(main()) 353 sys.exit(main())
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