aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update toolchain script to package SDK 8.1 instead of 8.0

Browse Source 
See also https://codereview.chromium.org/720033003/

BUG=311488,432748

Review URL: https://codereview.chromium.org/719343004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292950 0039d316-1c4b-4281-b951-d872f2087c98
changes/01/332501/1
scottmg@chromium.org 11 years ago
parent 71284d9bcb
commit c60ecf9e04
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
win_toolchain/package_from_installed.py
Unescape Escape View File

@ -8,7 +8,7 @@ into a .zip file.
It assumes default install locations for tools, in particular: It assumes default install locations for tools, in particular:
- C:\Program Files (x86)\Microsoft Visual Studio 12.0\... - C:\Program Files (x86)\Microsoft Visual Studio 12.0\...
- C:\Program Files (x86)\Windows Kits\8.0\... - C:\Program Files (x86)\Windows Kits\8.1\...
1. Start from a fresh Win7 VM image. 1. Start from a fresh Win7 VM image.
2. Install VS Pro. Deselect everything except MFC. 2. Install VS Pro. Deselect everything except MFC.
@ -81,7 +81,7 @@ def BuildFileList():
result.append((final_from, dest)) result.append((final_from, dest))
# Just copy the whole SDK. # Just copy the whole SDK.
sdk_path = r'C:\Program Files (x86)\Windows Kits\8.0' sdk_path = r'C:\Program Files (x86)\Windows Kits\8.1'
for root, _, files in os.walk(sdk_path): for root, _, files in os.walk(sdk_path):
for f in files: for f in files:
combined = os.path.normpath(os.path.join(root, f)) combined = os.path.normpath(os.path.join(root, f))

6
win_toolchain/toolchain2013.py
Unescape Escape View File

@ -344,7 +344,7 @@ def CopyToFinalLocation(extracted_dirs, target_dir):
'Program Files\\Microsoft Visual Studio 12.0\\DIA SDK\\': 'DIA SDK\\', 'Program Files\\Microsoft Visual Studio 12.0\\DIA SDK\\': 'DIA SDK\\',
'System64\\': 'sys64\\', 'System64\\': 'sys64\\',
'System\\': 'sys32\\', 'System\\': 'sys32\\',
'Windows Kits\\8.0\\': 'win8sdk\\', 'Windows Kits\\8.1\\': 'win8sdk\\',
'WinDDK\\7600.16385.win7_wdk.100208-1538\\': 'wdk\\', 'WinDDK\\7600.16385.win7_wdk.100208-1538\\': 'wdk\\',
} }
matches = [] matches = []
@ -398,7 +398,7 @@ def GenerateSetEnvCmd(target_dir, pro):
f.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;' f.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;'
'%~dp0..\\..\\VC\\bin;%PATH%\n') '%~dp0..\\..\\VC\\bin;%PATH%\n')
f.write('set LIB=%~dp0..\\..\\VC\\lib;' f.write('set LIB=%~dp0..\\..\\VC\\lib;'
'%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x86;' '%~dp0..\\..\\win8sdk\\Lib\\winv6.3\\um\\x86;'
'%~dp0..\\..\\VC\\atlmfc\\lib\n' '%~dp0..\\..\\VC\\atlmfc\\lib\n'
'goto :EOF\n') 'goto :EOF\n')
@ -420,7 +420,7 @@ def GenerateSetEnvCmd(target_dir, pro):
'%~dp0..\\..\\VC\\bin\\amd64;' '%~dp0..\\..\\VC\\bin\\amd64;'
'%PATH%\n') '%PATH%\n')
f.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;' f.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;'
'%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x64;' '%~dp0..\\..\\win8sdk\\Lib\\winv6.3\\um\\x64;'
'%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n') '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n')

Write Preview
Loading…
Cancel
Save