Commit 0c806a71 authored by scottmg@chromium.org's avatar scottmg@chromium.org

Disable Express path for Windows toolchain, and point to instructions

This could be simplified a bunch more, but this path was already
non-functional and tries to download Express which is a waste of
time and confusing for people.

R=dpranke@chromium.org
BUG=433551

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293199 0039d316-1c4b-4281-b951-d872f2087c98
parent 1b62135e
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment