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

Unified Diff: win_toolchain/get_toolchain_if_necessary.py

Issue 775733002: Disable Express path for Windows toolchain, and point to instructions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: . Created 6 years 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 | no next file » | 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 522a6972ea8b64a115d79f6c0030251af44ee2d8..d1bd3ffad40522f1db9b76e4736a8198e627823b 100755
--- a/win_toolchain/get_toolchain_if_necessary.py
+++ b/win_toolchain/get_toolchain_if_necessary.py
@@ -230,8 +230,12 @@ def main():
should_use_gs = True
if not CanAccessToolchainBucket():
RequestGsAuthentication()
- print('Windows toolchain out of date or doesn\'t exist, updating (%s)...' %
- ('Pro' if should_use_gs else 'Express'))
+ if not should_use_gs:
+ print('Please follow the instructions at '
+ 'http://www.chromium.org/developers/how-tos/'
+ 'build-instructions-windows')
+ return 1
+ print('Windows toolchain out of date or doesn\'t exist, updating (Pro)...')
print(' current_hash: %s' % current_hash)
print(' desired_hashes: %s' % ', '.join(desired_hashes))
sys.stdout.flush()
@@ -245,11 +249,8 @@ def main():
args = [sys.executable,
'toolchain2013.py',
'--targetdir', target_dir,
- '--sha1', desired_hashes[0]]
- if should_use_gs:
- args.append('--use-gs')
- else:
- args.append('--express')
+ '--sha1', desired_hashes[0],
+ '--use-gs']
subprocess.check_call(args)
current_hash = CalculateHash(target_dir)
if current_hash not in desired_hashes:
« 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