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

Unified Diff: build/vs_toolchain.py

Issue 204663004: Use depot_tools toolchain, remove now unneeded code, fix not including path to win sdk tools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comment Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain/win/setup_toolchain.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/vs_toolchain.py
diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py
index 2bf39498b8f25982c743407d0dde2b9772f74e5e..247703b8654094dd91eb4767eff3593eaa5561e7 100644
--- a/build/vs_toolchain.py
+++ b/build/vs_toolchain.py
@@ -82,8 +82,6 @@ def DownloadVsToolchain():
# Include the VS runtime in the PATH in case it's not machine-installed.
runtime_path = ';'.join(vs2013_runtime_dll_dirs)
os.environ['PATH'] = runtime_path + ';' + os.environ['PATH']
- print('Using automatic toolchain in %s (%s edition).' % (
- toolchain, 'Pro' if version_is_pro else 'Express'))
return vs2013_runtime_dll_dirs
@@ -135,7 +133,18 @@ def CopyVsRuntimeDlls(output_dir, runtime_dirs):
def main():
+ if len(sys.argv) < 2:
+ print >>sys.stderr, 'Expected either "get_toolchain_dir" or "copy_dlls"'
+ return 1
+ if sys.argv[1] == 'get_toolchain_dir':
+ DownloadVsToolchain()
+ print '["%s", "%s"]' % (
+ os.environ['GYP_MSVS_OVERRIDE_PATH'], os.environ['WINDOWSSDKDIR'])
+ else:
+ print >>sys.stderr, 'TODO: not implemented "%s"' % sys.argv[1]
+ return 1
return 0
+
if __name__ == '__main__':
sys.exit(main())
« 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