| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import os | 6 import os |
| 7 import re | 7 import re |
| 8 import subprocess | 8 import subprocess |
| 9 import sys | 9 import sys |
| 10 import urllib | 10 import urllib |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 | 53 |
| 54 def DoBuild(chrome_root, args): | 54 def DoBuild(chrome_root, args): |
| 55 """Download compile.py and run it.""" | 55 """Download compile.py and run it.""" |
| 56 compile_path = os.path.join(chrome_root, 'compile.py') | 56 compile_path = os.path.join(chrome_root, 'compile.py') |
| 57 Fetch(COMPILE_URL, compile_path) | 57 Fetch(COMPILE_URL, compile_path) |
| 58 Fetch(UTILS_URL, os.path.join(chrome_root, 'chromium_utils.py')) | 58 Fetch(UTILS_URL, os.path.join(chrome_root, 'chromium_utils.py')) |
| 59 cmd = ['python', compile_path] + args | 59 cmd = ['python', compile_path] + args |
| 60 return subprocess.call(cmd, cwd=chrome_root, shell=IS_WIN) | 60 return subprocess.call(cmd, cwd=chrome_root, shell=IS_WIN) |
| 61 | 61 |
| 62 | 62 |
| 63 def Main(args): | 63 def main(args): |
| 64 if len(args) < 3: | 64 if len(args) < 3: |
| 65 print('Usage: chrome-update.py <path> [options]') | 65 print('Usage: chrome-update.py <path> [options]') |
| 66 print('See options from compile.py at') | 66 print('See options from compile.py at') |
| 67 print(' %s' % COMPILE_URL) | 67 print(' %s' % COMPILE_URL) |
| 68 print('\nFor more example, see the compile steps on the waterfall') | 68 print('\nFor more example, see the compile steps on the waterfall') |
| 69 return 1 | 69 return 1 |
| 70 | 70 |
| 71 chrome_root = args[1] | 71 chrome_root = args[1] |
| 72 if not os.path.isdir(chrome_root): | 72 if not os.path.isdir(chrome_root): |
| 73 print('Path to chrome root (%s) not found.' % chrome_root) | 73 print('Path to chrome root (%s) not found.' % chrome_root) |
| 74 return 1 | 74 return 1 |
| 75 | 75 |
| 76 rv = DoUpdate(chrome_root) | 76 rv = DoUpdate(chrome_root) |
| 77 if rv != 0: | 77 if rv != 0: |
| 78 print('Update Failed. Bailing.') | 78 print('Update Failed. Bailing.') |
| 79 return rv | 79 return rv |
| 80 | 80 |
| 81 DoBuild(chrome_root, args[2:]) | 81 DoBuild(chrome_root, args[2:]) |
| 82 print('Success!') | 82 print('Success!') |
| 83 return 0 | 83 return 0 |
| 84 | 84 |
| 85 | 85 |
| 86 if __name__ == "__main__": | 86 if __name__ == "__main__": |
| 87 sys.exit(Main(sys.argv)) | 87 try: |
| 88 sys.exit(main(sys.argv)) |
| 89 except KeyboardInterrupt: |
| 90 sys.stderr.write('interrupted\n') |
| 91 sys.exit(1) |
| OLD | NEW |