Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 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 import platform | 6 import platform |
| 7 import re # For StripArchFromLDCommand hack. | 7 import re # For StripArchFromLDCommand hack. |
| 8 import os.path # For getting basenames. | 8 import os.path # For getting basenames. |
| 9 | 9 |
| 10 Import('env') | 10 Import('env') |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 ./mypage.html | 50 ./mypage.html |
| 51 ./mybitcode.pexe | 51 ./mybitcode.pexe |
| 52 ''' | 52 ''' |
| 53 # TODO(jvoung): rename the "arm-untrusted" part to "pnacl-untrusted" | 53 # TODO(jvoung): rename the "arm-untrusted" part to "pnacl-untrusted" |
| 54 # since that is what it really should be. | 54 # since that is what it really should be. |
| 55 # TODO(jvoung): simplify how utman installs these files in the first | 55 # TODO(jvoung): simplify how utman installs these files in the first |
| 56 # place so that mapping is pretty much one-to-one (someone could just | 56 # place so that mapping is pretty much one-to-one (someone could just |
| 57 # copy the files from the toolchain-dir to their webserver). | 57 # copy the files from the toolchain-dir to their webserver). |
| 58 map_files = [] | 58 map_files = [] |
| 59 replicates = [] # track staging dependencies | 59 replicates = [] # track staging dependencies |
| 60 toolchain_dir = '${SCONSTRUCT_DIR}/toolchain/linux_arm-untrusted' | 60 toolchain_dir = env['PNACL_ROOT'] |
|
bradn
2011/04/12 00:47:41
Why not '${PNACL_ROOT} '?
pdox
2011/04/12 00:53:38
Done.
| |
| 61 # TODO(jvoung): add ARM when we have a sandboxed LD in tools-sb. | 61 # TODO(jvoung): add ARM when we have a sandboxed LD in tools-sb. |
| 62 for arch in ['x8632', 'x8664']: | 62 for arch in ['x8632', 'x8664']: |
| 63 toolchain_bin = '%s/tools-sb/%s/srpc/bin/' % (toolchain_dir, | 63 toolchain_bin = '%s/tools-sb/%s/srpc/bin/' % (toolchain_dir, |
| 64 arch) | 64 arch) |
| 65 toolchain_binaries = [toolchain_bin + 'llc', | 65 toolchain_binaries = [toolchain_bin + 'llc', |
| 66 toolchain_bin + 'ld'] | 66 toolchain_bin + 'ld'] |
| 67 # We should really be consistent and use directory structure | 67 # We should really be consistent and use directory structure |
| 68 # to separate the arch-specific ld_script instead of embedding | 68 # to separate the arch-specific ld_script instead of embedding |
| 69 # the arch in the basename. | 69 # the arch in the basename. |
| 70 toolchain_ldscript = '%s/ldscripts/ld_script_%s_untrusted' % (toolchain_dir, | 70 toolchain_ldscript = '%s/ldscripts/ld_script_%s_untrusted' % (toolchain_dir, |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 bitcode_env.AddNodeToTestSuite(node, | 161 bitcode_env.AddNodeToTestSuite(node, |
| 162 ['chrome_browser_tests'], | 162 ['chrome_browser_tests'], |
| 163 'run_pnacl_srpc_hw_browser_test', | 163 'run_pnacl_srpc_hw_browser_test', |
| 164 is_broken=no_ports_broken or \ | 164 is_broken=no_ports_broken or \ |
| 165 # http://code.google.com/p/nativeclient/issues/detail?id=1521 \ | 165 # http://code.google.com/p/nativeclient/issues/detail?id=1521 \ |
| 166 env.Bit('target_x86_64') or \ | 166 env.Bit('target_x86_64') or \ |
| 167 bitcode_env.PPAPIBrowserTesterIsBroken()) | 167 bitcode_env.PPAPIBrowserTesterIsBroken()) |
| 168 | 168 |
| 169 | 169 |
| 170 # TODO(jvoung) Add a PPAPI example like pi_generator. | 170 # TODO(jvoung) Add a PPAPI example like pi_generator. |
| OLD | NEW |