diff options
Diffstat (limited to 'tools/buildman/control.py')
| -rw-r--r-- | tools/buildman/control.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py index aeb128a6a3e..b86d7b3c1f9 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -107,38 +107,44 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, return 0 gitutil.Setup() + col = terminal.Color() options.git_dir = os.path.join(options.git, '.git') - if not toolchains: + no_toolchains = toolchains is None + if no_toolchains: toolchains = toolchain.Toolchains() - toolchains.GetSettings() - toolchains.Scan(options.list_tool_chains) - if options.list_tool_chains: - toolchains.List() - print - return 0 if options.fetch_arch: if options.fetch_arch == 'list': sorted_list = toolchains.ListArchs() - print 'Available architectures: %s\n' % ' '.join(sorted_list) + print col.Color(col.BLUE, 'Available architectures: %s\n' % + ' '.join(sorted_list)) return 0 else: fetch_arch = options.fetch_arch if fetch_arch == 'all': fetch_arch = ','.join(toolchains.ListArchs()) - print 'Downloading toolchains: %s\n' % fetch_arch + print col.Color(col.CYAN, '\nDownloading toolchains: %s' % + fetch_arch) for arch in fetch_arch.split(','): + print ret = toolchains.FetchAndInstall(arch) if ret: return ret return 0 + if no_toolchains: + toolchains.GetSettings() + toolchains.Scan(options.list_tool_chains) + if options.list_tool_chains: + toolchains.List() + print + return 0 + # Work out how many commits to build. We want to build everything on the # branch. We also build the upstream commit as a control so we can see # problems introduced by the first commit on the branch. - col = terminal.Color() count = options.count has_range = options.branch and '..' in options.branch if count == -1: |