| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2013 The Native Client 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 """Recipes for PNaCl toolchain packages. | 6 """Recipes for PNaCl toolchain packages. |
| 7 | 7 |
| 8 Recipes consist of specially-structured dictionaries, with keys for package | 8 Recipes consist of specially-structured dictionaries, with keys for package |
| 9 name, type, commands to execute, etc. The structure is documented in the | 9 name, type, commands to execute, etc. The structure is documented in the |
| 10 PackageBuilder docstring in toolchain_main.py. | 10 PackageBuilder docstring in toolchain_main.py. |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 'python_libs', 'argparse') | 36 'python_libs', 'argparse') |
| 37 sys.path.insert(0, python_lib_dir) | 37 sys.path.insert(0, python_lib_dir) |
| 38 import argparse | 38 import argparse |
| 39 | 39 |
| 40 # Scons tests can check this version number to decide whether to enable tests | 40 # Scons tests can check this version number to decide whether to enable tests |
| 41 # for toolchain bug fixes or new features. This allows tests to be enabled on | 41 # for toolchain bug fixes or new features. This allows tests to be enabled on |
| 42 # the toolchain buildbots/trybots before the new toolchain version is pinned | 42 # the toolchain buildbots/trybots before the new toolchain version is pinned |
| 43 # (i.e. before the tests would pass on the main NaCl buildbots/trybots). | 43 # (i.e. before the tests would pass on the main NaCl buildbots/trybots). |
| 44 # If you are adding a test that depends on a toolchain change, you can | 44 # If you are adding a test that depends on a toolchain change, you can |
| 45 # increment this version number manually. | 45 # increment this version number manually. |
| 46 FEATURE_VERSION = 7 | 46 FEATURE_VERSION = 8 |
| 47 | 47 |
| 48 # For backward compatibility, these key names match the directory names | 48 # For backward compatibility, these key names match the directory names |
| 49 # previously used with gclient | 49 # previously used with gclient |
| 50 GIT_REPOS = { | 50 GIT_REPOS = { |
| 51 'binutils': 'nacl-binutils.git', | 51 'binutils': 'nacl-binutils.git', |
| 52 'clang': 'pnacl-clang.git', | 52 'clang': 'pnacl-clang.git', |
| 53 'llvm': 'pnacl-llvm.git', | 53 'llvm': 'pnacl-llvm.git', |
| 54 'gcc': 'pnacl-gcc.git', | 54 'gcc': 'pnacl-gcc.git', |
| 55 'libcxx': 'pnacl-libcxx.git', | 55 'libcxx': 'pnacl-libcxx.git', |
| 56 'libcxxabi': 'pnacl-libcxxabi.git', | 56 'libcxxabi': 'pnacl-libcxxabi.git', |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 packages.update(Metadata()) | 715 packages.update(Metadata()) |
| 716 if pynacl.platform.IsLinux() or pynacl.platform.IsMac(): | 716 if pynacl.platform.IsLinux() or pynacl.platform.IsMac(): |
| 717 packages.update(pnacl_targetlibs.UnsandboxedIRT( | 717 packages.update(pnacl_targetlibs.UnsandboxedIRT( |
| 718 'x86-32-%s' % pynacl.platform.GetOS())) | 718 'x86-32-%s' % pynacl.platform.GetOS())) |
| 719 | 719 |
| 720 | 720 |
| 721 tb = toolchain_main.PackageBuilder(packages, | 721 tb = toolchain_main.PackageBuilder(packages, |
| 722 upload_packages, | 722 upload_packages, |
| 723 leftover_args) | 723 leftover_args) |
| 724 tb.Main() | 724 tb.Main() |
| OLD | NEW |