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

Side by Side Diff: win_toolchain/package_from_installed.py

Issue 1162003009: Fix System32 vs Sysnative for x86 python (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 5 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 | « 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'api-ms-win-crt-string-l1-1-0.dll', 148 'api-ms-win-crt-string-l1-1-0.dll',
149 'api-ms-win-crt-time-l1-1-0.dll', 149 'api-ms-win-crt-time-l1-1-0.dll',
150 'api-ms-win-crt-utility-l1-1-0.dll', 150 'api-ms-win-crt-utility-l1-1-0.dll',
151 'api-ms-win-eventing-provider-l1-1-0.dll', 151 'api-ms-win-eventing-provider-l1-1-0.dll',
152 'ucrtbase.dll', 152 'ucrtbase.dll',
153 'ucrtbased.dll', 153 'ucrtbased.dll',
154 ] 154 ]
155 for system_crt_file in system_crt_files: 155 for system_crt_file in system_crt_files:
156 result.append((os.path.join(r'C:\Windows\SysWOW64', system_crt_file), 156 result.append((os.path.join(r'C:\Windows\SysWOW64', system_crt_file),
157 os.path.join('sys32', system_crt_file))) 157 os.path.join('sys32', system_crt_file)))
158 result.append((os.path.join(r'C:\Windows\System32', system_crt_file), 158 result.append((os.path.join(r'C:\Windows\Sysnative', system_crt_file),
159 os.path.join('sys64', system_crt_file))) 159 os.path.join('sys64', system_crt_file)))
160 160
161 # Generically drop all arm stuff that we don't need. 161 # Generically drop all arm stuff that we don't need.
162 return [(f, t) for f, t in result if 'arm\\' not in f.lower() and 162 return [(f, t) for f, t in result if 'arm\\' not in f.lower() and
163 'arm64\\' not in f.lower()] 163 'arm64\\' not in f.lower()]
164 164
165 165
166 def GenerateSetEnvCmd(target_dir): 166 def GenerateSetEnvCmd(target_dir):
167 """Generate a batch file that gyp expects to exist to set up the compiler 167 """Generate a batch file that gyp expects to exist to set up the compiler
168 environment. 168 environment.
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 sys.stdout.write('\rWrote to %s.%s\n' % (output, ' '*50)) 270 sys.stdout.write('\rWrote to %s.%s\n' % (output, ' '*50))
271 sys.stdout.flush() 271 sys.stdout.flush()
272 272
273 RenameToSha1(output) 273 RenameToSha1(output)
274 274
275 return 0 275 return 0
276 276
277 277
278 if __name__ == '__main__': 278 if __name__ == '__main__':
279 sys.exit(main()) 279 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