| 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 'glibc': [ | 252 'glibc': [ |
| 253 ('native_client/src/include/nacl/nacl_exception.h', 'nacl/'), | 253 ('native_client/src/include/nacl/nacl_exception.h', 'nacl/'), |
| 254 ('native_client/src/include/nacl/nacl_minidump.h', 'nacl/'), | 254 ('native_client/src/include/nacl/nacl_minidump.h', 'nacl/'), |
| 255 ('native_client/src/untrusted/irt/irt.h', ''), | 255 ('native_client/src/untrusted/irt/irt.h', ''), |
| 256 ('native_client/src/untrusted/irt/irt_dev.h', ''), | 256 ('native_client/src/untrusted/irt/irt_dev.h', ''), |
| 257 ('native_client/src/untrusted/nacl/nacl_dyncode.h', 'nacl/'), | 257 ('native_client/src/untrusted/nacl/nacl_dyncode.h', 'nacl/'), |
| 258 ('native_client/src/untrusted/nacl/nacl_startup.h', 'nacl/'), | 258 ('native_client/src/untrusted/nacl/nacl_startup.h', 'nacl/'), |
| 259 ('native_client/src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'), | 259 ('native_client/src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'), |
| 260 ('ppapi/nacl_irt/public/irt_ppapi.h', ''), | 260 ('ppapi/nacl_irt/public/irt_ppapi.h', ''), |
| 261 ], | 261 ], |
| 262 'bionic': [ |
| 263 ('ppapi/nacl_irt/public/irt_ppapi.h', ''), |
| 264 ], |
| 262 'host': [] | 265 'host': [] |
| 263 } | 266 } |
| 264 | 267 |
| 265 def InstallFiles(src_root, dest_root, file_list): | 268 def InstallFiles(src_root, dest_root, file_list): |
| 266 """Copy a set of files from src_root to dest_root according | 269 """Copy a set of files from src_root to dest_root according |
| 267 to the given mapping. This allows files to be copied from | 270 to the given mapping. This allows files to be copied from |
| 268 to a location in the destination tree that is different to the | 271 to a location in the destination tree that is different to the |
| 269 location in the source tree. | 272 location in the source tree. |
| 270 | 273 |
| 271 If the destination mapping ends with a '/' then the destination | 274 If the destination mapping ends with a '/' then the destination |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 buildbot_common.BuildStep('SDK Items') | 561 buildbot_common.BuildStep('SDK Items') |
| 559 | 562 |
| 560 GypNinjaBuild_NaCl(GYPBUILD_DIR) | 563 GypNinjaBuild_NaCl(GYPBUILD_DIR) |
| 561 GypNinjaBuild_Breakpad(GYPBUILD_DIR) | 564 GypNinjaBuild_Breakpad(GYPBUILD_DIR) |
| 562 | 565 |
| 563 platform = getos.GetPlatform() | 566 platform = getos.GetPlatform() |
| 564 newlibdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_newlib') | 567 newlibdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_newlib') |
| 565 glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc') | 568 glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc') |
| 566 armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib') | 569 armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib') |
| 567 pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl') | 570 pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl') |
| 571 bionicdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_bionic') |
| 568 | 572 |
| 569 if set(toolchains) & set(['glibc', 'newlib']): | 573 if set(toolchains) & set(['glibc', 'newlib']): |
| 570 GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR) | 574 GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR) |
| 571 | 575 |
| 572 if 'arm' in toolchains: | 576 if 'arm' in toolchains: |
| 573 GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm') | 577 GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm') |
| 574 | 578 |
| 575 GypNinjaInstall(pepperdir, toolchains) | 579 GypNinjaInstall(pepperdir, toolchains) |
| 576 | 580 |
| 577 if 'newlib' in toolchains: | 581 if 'newlib' in toolchains: |
| 578 InstallNaClHeaders(GetToolchainNaClInclude('newlib', newlibdir, 'x86'), | 582 InstallNaClHeaders(GetToolchainNaClInclude('newlib', newlibdir, 'x86'), |
| 579 'newlib') | 583 'newlib') |
| 580 | 584 |
| 581 if 'glibc' in toolchains: | 585 if 'glibc' in toolchains: |
| 582 InstallNaClHeaders(GetToolchainNaClInclude('glibc', glibcdir, 'x86'), | 586 InstallNaClHeaders(GetToolchainNaClInclude('glibc', glibcdir, 'x86'), |
| 583 'glibc') | 587 'glibc') |
| 584 | 588 |
| 585 if 'arm' in toolchains: | 589 if 'arm' in toolchains: |
| 586 InstallNaClHeaders(GetToolchainNaClInclude('newlib', armdir, 'arm'), | 590 InstallNaClHeaders(GetToolchainNaClInclude('newlib', armdir, 'arm'), |
| 587 'arm') | 591 'arm') |
| 588 | 592 |
| 593 if 'bionic' in toolchains: |
| 594 InstallNaClHeaders(GetToolchainNaClInclude('bionic', bionicdir, 'arm'), |
| 595 'bionic') |
| 596 |
| 589 if 'pnacl' in toolchains: | 597 if 'pnacl' in toolchains: |
| 590 # NOTE: For ia32, gyp builds both x86-32 and x86-64 by default. | 598 # NOTE: For ia32, gyp builds both x86-32 and x86-64 by default. |
| 591 for arch in ('ia32', 'arm'): | 599 for arch in ('ia32', 'arm'): |
| 592 # Fill in the latest native pnacl shim library from the chrome build. | 600 # Fill in the latest native pnacl shim library from the chrome build. |
| 593 build_dir = GYPBUILD_DIR + '-pnacl-' + arch | 601 build_dir = GYPBUILD_DIR + '-pnacl-' + arch |
| 594 GypNinjaBuild_Pnacl(build_dir, arch) | 602 GypNinjaBuild_Pnacl(build_dir, arch) |
| 595 if arch == 'ia32': | 603 if arch == 'ia32': |
| 596 nacl_arches = ['x86-32', 'x86-64'] | 604 nacl_arches = ['x86-32', 'x86-64'] |
| 597 elif arch == 'arm': | 605 elif arch == 'arm': |
| 598 nacl_arches = ['arm'] | 606 nacl_arches = ['arm'] |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1031 BuildStepArchiveSDKTools() | 1039 BuildStepArchiveSDKTools() |
| 1032 | 1040 |
| 1033 return 0 | 1041 return 0 |
| 1034 | 1042 |
| 1035 | 1043 |
| 1036 if __name__ == '__main__': | 1044 if __name__ == '__main__': |
| 1037 try: | 1045 try: |
| 1038 sys.exit(main(sys.argv)) | 1046 sys.exit(main(sys.argv)) |
| 1039 except KeyboardInterrupt: | 1047 except KeyboardInterrupt: |
| 1040 buildbot_common.ErrorExit('build_sdk: interrupted') | 1048 buildbot_common.ErrorExit('build_sdk: interrupted') |
| OLD | NEW |