| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 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 """A tool to build chrome, executed by buildbot. | 6 """A tool to build chrome, executed by buildbot. |
| 7 | 7 |
| 8 When this is run, the current directory (cwd) should be the outer build | 8 When this is run, the current directory (cwd) should be the outer build |
| 9 directory (e.g., chrome-release/build/). | 9 directory (e.g., chrome-release/build/). |
| 10 | 10 |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 | 790 |
| 791 goma_teardown(options, env) | 791 goma_teardown(options, env) |
| 792 | 792 |
| 793 return result | 793 return result |
| 794 | 794 |
| 795 def main_ninja(options, args): | 795 def main_ninja(options, args): |
| 796 """Interprets options, clobbers object files, and calls ninja.""" | 796 """Interprets options, clobbers object files, and calls ninja.""" |
| 797 | 797 |
| 798 # Prepare environment. | 798 # Prepare environment. |
| 799 env = EchoDict(os.environ) | 799 env = EchoDict(os.environ) |
| 800 env.setdefault('NINJA_STATUS', '[%s/%t | %e] ') | |
| 801 goma_ready = goma_setup(options, env) | 800 goma_ready = goma_setup(options, env) |
| 802 exit_status = -1 | 801 exit_status = -1 |
| 803 try: | 802 try: |
| 804 if not goma_ready: | 803 if not goma_ready: |
| 805 assert options.compiler not in ('goma', 'goma-clang') | 804 assert options.compiler not in ('goma', 'goma-clang') |
| 806 assert options.goma_dir is None | 805 assert options.goma_dir is None |
| 807 | 806 |
| 808 # ninja is different from all the other build systems in that it requires | 807 # ninja is different from all the other build systems in that it requires |
| 809 # most configuration to be done at gyp time. This is why this function does | 808 # most configuration to be done at gyp time. This is why this function does |
| 810 # less than the other comparable functions in this file. | 809 # less than the other comparable functions in this file. |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1211 sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool)) | 1210 sys.stderr.write('Unknown build tool %s.\n' % repr(options.build_tool)) |
| 1212 return 2 | 1211 return 2 |
| 1213 | 1212 |
| 1214 options.target_output_dir = get_target_build_dir(args, options) | 1213 options.target_output_dir = get_target_build_dir(args, options) |
| 1215 | 1214 |
| 1216 return main(options, args) | 1215 return main(options, args) |
| 1217 | 1216 |
| 1218 | 1217 |
| 1219 if '__main__' == __name__: | 1218 if '__main__' == __name__: |
| 1220 sys.exit(real_main()) | 1219 sys.exit(real_main()) |
| OLD | NEW |