Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 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 import optparse | 6 import optparse |
| 7 import os | 7 import os |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 import buildbot_common | 10 import buildbot_common |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 134 | 134 |
| 135 def BuildProjectsBranch(pepperdir, platform, branch, deps, clean, config): | 135 def BuildProjectsBranch(pepperdir, platform, branch, deps, clean, config): |
| 136 make_dir = os.path.join(pepperdir, branch) | 136 make_dir = os.path.join(pepperdir, branch) |
| 137 print "\n\nMake: " + make_dir | 137 print "\n\nMake: " + make_dir |
| 138 if platform == 'win': | 138 if platform == 'win': |
| 139 # We need to modify the environment to build host on Windows. | 139 # We need to modify the environment to build host on Windows. |
| 140 make = os.path.join(make_dir, 'make.bat') | 140 make = os.path.join(make_dir, 'make.bat') |
| 141 else: | 141 else: |
| 142 make = 'make' | 142 make = 'make' |
| 143 | 143 |
| 144 extra_args = ['CONFIG='+config] | 144 extra_args = ['CONFIG='+config, 'NACL_SDK_ROOT='+pepperdir] |
|
Sam Clegg
2013/05/22 22:39:50
This script already (via a recent change) unsets
N
noelallen1
2013/05/23 22:01:24
Done.
| |
| 145 if not deps: | 145 if not deps: |
| 146 extra_args += ['IGNORE_DEPS=1'] | 146 extra_args += ['IGNORE_DEPS=1'] |
| 147 | 147 |
| 148 try: | 148 try: |
| 149 buildbot_common.Run([make, '-j8', 'TOOLCHAIN=all'] + extra_args, | 149 buildbot_common.Run([make, '-j8', 'TOOLCHAIN=all'] + extra_args, |
| 150 cwd=make_dir) | 150 cwd=make_dir) |
| 151 except: | 151 except: |
| 152 print 'Failed to build ' + branch | 152 print 'Failed to build ' + branch |
| 153 raise | 153 raise |
| 154 | 154 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 241 else: | 241 else: |
| 242 configs = ['Debug', 'Release'] | 242 configs = ['Debug', 'Release'] |
| 243 for config in configs: | 243 for config in configs: |
| 244 BuildProjects(pepperdir, platform, project_tree, config=config) | 244 BuildProjects(pepperdir, platform, project_tree, config=config) |
| 245 | 245 |
| 246 return 0 | 246 return 0 |
| 247 | 247 |
| 248 | 248 |
| 249 if __name__ == '__main__': | 249 if __name__ == '__main__': |
| 250 sys.exit(main(sys.argv)) | 250 sys.exit(main(sys.argv)) |
| OLD | NEW |