| 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 29 matching lines...) Expand all Loading... |
| 40 'python_libs', 'argparse') | 40 'python_libs', 'argparse') |
| 41 sys.path.insert(0, python_lib_dir) | 41 sys.path.insert(0, python_lib_dir) |
| 42 import argparse | 42 import argparse |
| 43 | 43 |
| 44 # Scons tests can check this version number to decide whether to enable tests | 44 # Scons tests can check this version number to decide whether to enable tests |
| 45 # for toolchain bug fixes or new features. This allows tests to be enabled on | 45 # for toolchain bug fixes or new features. This allows tests to be enabled on |
| 46 # the toolchain buildbots/trybots before the new toolchain version is rolled | 46 # the toolchain buildbots/trybots before the new toolchain version is rolled |
| 47 # into TOOL_REVISIONS (i.e. before the tests would pass on the main NaCl | 47 # into TOOL_REVISIONS (i.e. before the tests would pass on the main NaCl |
| 48 # buildbots/trybots). If you are adding a test that depends on a toolchain | 48 # buildbots/trybots). If you are adding a test that depends on a toolchain |
| 49 # change, you can increment this version number manually. | 49 # change, you can increment this version number manually. |
| 50 FEATURE_VERSION = 4 | 50 FEATURE_VERSION = 5 |
| 51 | 51 |
| 52 # For backward compatibility, these key names match the directory names | 52 # For backward compatibility, these key names match the directory names |
| 53 # previously used with gclient | 53 # previously used with gclient |
| 54 GIT_REPOS = { | 54 GIT_REPOS = { |
| 55 'binutils': 'nacl-binutils.git', | 55 'binutils': 'nacl-binutils.git', |
| 56 'clang': 'pnacl-clang.git', | 56 'clang': 'pnacl-clang.git', |
| 57 'llvm': 'pnacl-llvm.git', | 57 'llvm': 'pnacl-llvm.git', |
| 58 'gcc': 'pnacl-gcc.git', | 58 'gcc': 'pnacl-gcc.git', |
| 59 'libcxx': 'pnacl-libcxx.git', | 59 'libcxx': 'pnacl-libcxx.git', |
| 60 'libcxxabi': 'pnacl-libcxxabi.git', | 60 'libcxxabi': 'pnacl-libcxxabi.git', |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 packages.update(Metadata()) | 634 packages.update(Metadata()) |
| 635 if pynacl.platform.IsLinux() or pynacl.platform.IsMac(): | 635 if pynacl.platform.IsLinux() or pynacl.platform.IsMac(): |
| 636 packages.update(pnacl_targetlibs.UnsandboxedIRT( | 636 packages.update(pnacl_targetlibs.UnsandboxedIRT( |
| 637 'x86-32-%s' % pynacl.platform.GetOS())) | 637 'x86-32-%s' % pynacl.platform.GetOS())) |
| 638 | 638 |
| 639 | 639 |
| 640 tb = toolchain_main.PackageBuilder(packages, | 640 tb = toolchain_main.PackageBuilder(packages, |
| 641 GetUploadPackageTargets(), | 641 GetUploadPackageTargets(), |
| 642 leftover_args) | 642 leftover_args) |
| 643 tb.Main() | 643 tb.Main() |
| OLD | NEW |