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 multiprocessing | 6 import multiprocessing |
| 7 import optparse | 7 import optparse |
| 8 import os | 8 import os |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 import getos | 22 import getos |
| 23 import http_download | 23 import http_download |
| 24 | 24 |
| 25 | 25 |
| 26 MAKE = 'nacl_sdk/make_3.99.90-26-gf80222c/make.exe' | 26 MAKE = 'nacl_sdk/make_3.99.90-26-gf80222c/make.exe' |
| 27 LIB_DICT = { | 27 LIB_DICT = { |
| 28 'linux': [], | 28 'linux': [], |
| 29 'mac': [], | 29 'mac': [], |
| 30 'win': ['x86_32'] | 30 'win': ['x86_32'] |
| 31 } | 31 } |
| 32 VALID_TOOLCHAINS = ['newlib', 'glibc', 'pnacl', 'win', 'linux', 'mac'] | 32 VALID_TOOLCHAINS = [ |
| 33 'bionic', | |
| 34 'newlib', | |
| 35 'glibc', | |
| 36 'pnacl', | |
| 37 'win', | |
| 38 'linux', | |
| 39 'mac', | |
| 40 ] | |
| 33 | 41 |
| 34 # Global verbosity setting. | 42 # Global verbosity setting. |
| 35 # If set to try (normally via a command line arg) then build_projects will | 43 # If set to try (normally via a command line arg) then build_projects will |
| 36 # add V=1 to all calls to 'make' | 44 # add V=1 to all calls to 'make' |
| 37 verbose = False | 45 verbose = False |
| 38 | 46 |
| 39 | 47 |
| 40 def CopyFilesFromTo(filelist, srcdir, dstdir): | 48 def CopyFilesFromTo(filelist, srcdir, dstdir): |
| 41 for filename in filelist: | 49 for filename in filelist: |
| 42 srcpath = os.path.join(srcdir, filename) | 50 srcpath = os.path.join(srcdir, filename) |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 236 | 244 |
| 237 pepper_ver = str(int(build_version.ChromeMajorVersion())) | 245 pepper_ver = str(int(build_version.ChromeMajorVersion())) |
| 238 pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver) | 246 pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver) |
| 239 | 247 |
| 240 if not options.toolchain: | 248 if not options.toolchain: |
| 241 # Order matters here: the default toolchain for an example's Makefile will | 249 # Order matters here: the default toolchain for an example's Makefile will |
| 242 # be the first toolchain in this list that is available in the example. | 250 # be the first toolchain in this list that is available in the example. |
| 243 # e.g. If an example supports newlib and glibc, then the default will be | 251 # e.g. If an example supports newlib and glibc, then the default will be |
| 244 # newlib. | 252 # newlib. |
| 245 options.toolchain = ['pnacl', 'newlib', 'glibc', 'host'] | 253 options.toolchain = ['pnacl', 'newlib', 'glibc', 'host'] |
| 254 if options.experimental: | |
| 255 options.toolchain.append('bionic') | |
|
Sam Clegg
2014/02/18 20:27:21
Maybe the --bionic option should be used here, lik
noelallen1
2014/02/18 20:43:39
There are two things going on here.
1- We alread
| |
| 246 | 256 |
| 247 if 'host' in options.toolchain: | 257 if 'host' in options.toolchain: |
| 248 options.toolchain.remove('host') | 258 options.toolchain.remove('host') |
| 249 options.toolchain.append(getos.GetPlatform()) | 259 options.toolchain.append(getos.GetPlatform()) |
| 250 print 'Adding platform: ' + getos.GetPlatform() | 260 print 'Adding platform: ' + getos.GetPlatform() |
| 251 | 261 |
| 252 ValidateToolchains(options.toolchain) | 262 ValidateToolchains(options.toolchain) |
| 253 | 263 |
| 254 filters = {} | 264 filters = {} |
| 255 if options.toolchain: | 265 if options.toolchain: |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 290 | 300 |
| 291 | 301 |
| 292 if __name__ == '__main__': | 302 if __name__ == '__main__': |
| 293 script_name = os.path.basename(sys.argv[0]) | 303 script_name = os.path.basename(sys.argv[0]) |
| 294 try: | 304 try: |
| 295 sys.exit(main(sys.argv)) | 305 sys.exit(main(sys.argv)) |
| 296 except parse_dsc.ValidationError as e: | 306 except parse_dsc.ValidationError as e: |
| 297 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) | 307 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) |
| 298 except KeyboardInterrupt: | 308 except KeyboardInterrupt: |
| 299 buildbot_common.ErrorExit('%s: interrupted' % script_name) | 309 buildbot_common.ErrorExit('%s: interrupted' % script_name) |
| OLD | NEW |