| 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 | 493 |
| 494 def GypNinjaBuild_Pnacl(rel_out_dir, target_arch): | 494 def GypNinjaBuild_Pnacl(rel_out_dir, target_arch): |
| 495 # TODO(binji): This will build the pnacl_irt_shim twice; once as part of the | 495 # TODO(binji): This will build the pnacl_irt_shim twice; once as part of the |
| 496 # Chromium build, and once here. When we move more of the SDK build process | 496 # Chromium build, and once here. When we move more of the SDK build process |
| 497 # to gyp, we can remove this. | 497 # to gyp, we can remove this. |
| 498 gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium') | 498 gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium') |
| 499 | 499 |
| 500 out_dir = MakeNinjaRelPath(rel_out_dir) | 500 out_dir = MakeNinjaRelPath(rel_out_dir) |
| 501 gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src', | 501 gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src', |
| 502 'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp') | 502 'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp') |
| 503 targets = ['shim_aot'] | 503 targets = ['aot'] |
| 504 GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False) | 504 GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False) |
| 505 | 505 |
| 506 | 506 |
| 507 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, | 507 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, |
| 508 out_dir, force_arm_gcc=True): | 508 out_dir, force_arm_gcc=True): |
| 509 gyp_env = dict(os.environ) | 509 gyp_env = dict(os.environ) |
| 510 gyp_env['GYP_GENERATORS'] = 'ninja' | 510 gyp_env['GYP_GENERATORS'] = 'ninja' |
| 511 gyp_defines = [] | 511 gyp_defines = [] |
| 512 if options.mac_sdk: | 512 if options.mac_sdk: |
| 513 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) | 513 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1024 BuildStepArchiveSDKTools() | 1024 BuildStepArchiveSDKTools() |
| 1025 | 1025 |
| 1026 return 0 | 1026 return 0 |
| 1027 | 1027 |
| 1028 | 1028 |
| 1029 if __name__ == '__main__': | 1029 if __name__ == '__main__': |
| 1030 try: | 1030 try: |
| 1031 sys.exit(main(sys.argv)) | 1031 sys.exit(main(sys.argv)) |
| 1032 except KeyboardInterrupt: | 1032 except KeyboardInterrupt: |
| 1033 buildbot_common.ErrorExit('build_sdk: interrupted') | 1033 buildbot_common.ErrorExit('build_sdk: interrupted') |
| OLD | NEW |