| 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 """Entry point for both build and try bots. | 6 """Entry point for both build and try bots. |
| 7 | 7 |
| 8 This script is invoked from XXX, usually without arguments | 8 This script is invoked from XXX, usually without arguments |
| 9 to package an SDK. It automatically determines whether | 9 to package an SDK. It automatically determines whether |
| 10 this SDK is for mac, win, linux. | 10 this SDK is for mac, win, linux. |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 pair[0] += '.exe' | 411 pair[0] += '.exe' |
| 412 pair[1] += '.exe' | 412 pair[1] += '.exe' |
| 413 | 413 |
| 414 InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files) | 414 InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files) |
| 415 | 415 |
| 416 # Add ARM binaries | 416 # Add ARM binaries |
| 417 if platform == 'linux' and not options.no_arm_trusted: | 417 if platform == 'linux' and not options.no_arm_trusted: |
| 418 tools_files = [ | 418 tools_files = [ |
| 419 ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'], | 419 ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'], |
| 420 ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'], | 420 ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'], |
| 421 ['sel_ldr', 'sel_ldr_arm'], | 421 ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm'], |
| 422 ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm'] | 422 ['nonsfi_loader_newlib_arm_nonsfi.nexe', 'nonsfi_loader_arm'], |
| 423 ['sel_ldr', 'sel_ldr_arm'] |
| 423 ] | 424 ] |
| 424 ninja_out_dir = os.path.join(OUT_DIR, build_dir + '-arm', 'Release') | 425 ninja_out_dir = os.path.join(OUT_DIR, build_dir + '-arm', 'Release') |
| 425 InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files) | 426 InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files) |
| 426 | 427 |
| 427 for tc in set(toolchains) & set(['newlib', 'glibc', 'pnacl']): | 428 for tc in set(toolchains) & set(['newlib', 'glibc', 'pnacl']): |
| 428 if tc == 'pnacl': | 429 if tc == 'pnacl': |
| 429 xarches = (None,) | 430 xarches = (None,) |
| 430 else: | 431 else: |
| 431 xarches = ('arm', '32', '64') | 432 xarches = ('arm', '32', '64') |
| 432 | 433 |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1072 BuildStepArchiveSDKTools() | 1073 BuildStepArchiveSDKTools() |
| 1073 | 1074 |
| 1074 return 0 | 1075 return 0 |
| 1075 | 1076 |
| 1076 | 1077 |
| 1077 if __name__ == '__main__': | 1078 if __name__ == '__main__': |
| 1078 try: | 1079 try: |
| 1079 sys.exit(main(sys.argv[1:])) | 1080 sys.exit(main(sys.argv[1:])) |
| 1080 except KeyboardInterrupt: | 1081 except KeyboardInterrupt: |
| 1081 buildbot_common.ErrorExit('build_sdk: interrupted') | 1082 buildbot_common.ErrorExit('build_sdk: interrupted') |
| OLD | NEW |