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

Unified Diff: win_toolchain/get_toolchain_if_necessary.py

Issue 1382873003: win_toolchain: Update packaging script to package win10 sdk (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: . Created 5 years, 2 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 | « no previous file | win_toolchain/package_from_installed.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win_toolchain/get_toolchain_if_necessary.py
diff --git a/win_toolchain/get_toolchain_if_necessary.py b/win_toolchain/get_toolchain_if_necessary.py
index c38785d1732e1eef7c8ff65f4095b545730effe2..27fa18120dd11acf5903470bf8ef46758c0f279e 100755
--- a/win_toolchain/get_toolchain_if_necessary.py
+++ b/win_toolchain/get_toolchain_if_necessary.py
@@ -203,7 +203,12 @@ def DoTreeMirror(target_dir, tree_sha1):
"""In order to save temporary space on bots that do not have enough space to
download ISOs, unpack them, and copy to the target location, the whole tree
is uploaded as a zip to internal storage, and then mirrored here."""
- temp_dir, local_zip = DownloadUsingGsutil(tree_sha1 + '.zip')
+ use_local_zip = bool(int(os.environ.get('USE_LOCAL_ZIP', 0)))
+ if use_local_zip:
+ temp_dir = None
+ local_zip = tree_sha1 + '.zip'
+ else:
+ temp_dir, local_zip = DownloadUsingGsutil(tree_sha1 + '.zip')
sys.stdout.write('Extracting %s...\n' % local_zip)
sys.stdout.flush()
with zipfile.ZipFile(local_zip, 'r', zipfile.ZIP_DEFLATED, True) as zf:
@@ -266,9 +271,9 @@ def main():
if not CanAccessToolchainBucket():
RequestGsAuthentication()
if not should_use_gs:
- print('Please follow the instructions at '
- 'http://www.chromium.org/developers/how-tos/'
- 'build-instructions-windows')
+ print('\n\n\nPlease follow the instructions at '
+ 'https://www.chromium.org/developers/how-tos/'
+ 'build-instructions-windows\n\n')
return 1
print('Windows toolchain out of date or doesn\'t exist, updating (Pro)...')
print(' current_hash: %s' % current_hash)
« no previous file with comments | « no previous file | win_toolchain/package_from_installed.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698