| 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 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 615 print "\n\nMake: " + make_dir | 615 print "\n\nMake: " + make_dir |
| 616 if platform == 'win': | 616 if platform == 'win': |
| 617 make = os.path.join(make_dir, 'make.bat') | 617 make = os.path.join(make_dir, 'make.bat') |
| 618 else: | 618 else: |
| 619 make = 'make' | 619 make = 'make' |
| 620 | 620 |
| 621 extra_args = ['CONFIG='+config] | 621 extra_args = ['CONFIG='+config] |
| 622 if not deps: | 622 if not deps: |
| 623 extra_args += ['IGNORE_DEPS=1'] | 623 extra_args += ['IGNORE_DEPS=1'] |
| 624 | 624 |
| 625 buildbot_common.Run([make, '-j8', 'all_versions'] + extra_args, | 625 buildbot_common.Run([make, '-j8', 'TOOLCHAIN=all'] + extra_args, |
| 626 cwd=make_dir) | 626 cwd=make_dir) |
| 627 if clean: | 627 if clean: |
| 628 # Clean to remove temporary files but keep the built libraries. | 628 # Clean to remove temporary files but keep the built libraries. |
| 629 buildbot_common.Run([make, '-j8', 'clean'] + extra_args, cwd=make_dir) | 629 buildbot_common.Run([make, '-j8', 'clean', 'TOOLCHAIN=all'] + extra_args, |
| 630 cwd=make_dir) |
| 630 | 631 |
| 631 | 632 |
| 632 def BuildStepBuildLibraries(pepperdir, platform, directory, clean=True): | 633 def BuildStepBuildLibraries(pepperdir, platform, directory, clean=True): |
| 633 BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries Debug', | 634 BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries Debug', |
| 634 clean=clean, config='Debug') | 635 clean=clean, config='Debug') |
| 635 BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries Release', | 636 BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries Release', |
| 636 clean=clean, config='Release') | 637 clean=clean, config='Release') |
| 637 | 638 |
| 638 | 639 |
| 639 def GenerateNotice(fileroot, output_filename='NOTICE', extra_files=None): | 640 def GenerateNotice(fileroot, output_filename='NOTICE', extra_files=None): |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 BuildStepArchiveBundle('build', pepper_ver, clnumber, tarfile) | 902 BuildStepArchiveBundle('build', pepper_ver, clnumber, tarfile) |
| 902 if platform == 'linux': | 903 if platform == 'linux': |
| 903 BuildStepArchiveBundle('naclports', pepper_ver, clnumber, ports_tarfile) | 904 BuildStepArchiveBundle('naclports', pepper_ver, clnumber, ports_tarfile) |
| 904 BuildStepArchiveSDKTools() | 905 BuildStepArchiveSDKTools() |
| 905 | 906 |
| 906 return 0 | 907 return 0 |
| 907 | 908 |
| 908 | 909 |
| 909 if __name__ == '__main__': | 910 if __name__ == '__main__': |
| 910 sys.exit(main(sys.argv)) | 911 sys.exit(main(sys.argv)) |
| OLD | NEW |