Merge branch 'master' of git://git.denx.de/u-boot-tegra

[karo-tx-uboot.git] / tools / buildman / control.py

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 12a96995d0e15d8c58de1c477c49d31428ba2ce4..68ea961876ebde40f7b61bae85a150b7593ca7e7 100644 (file)
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -86,7 +86,7 @@ def DoBuildman(options, args):
     """
     gitutil.Setup()
 
-    bsettings.Setup()
+    bsettings.Setup(options.config_file)
     options.git_dir = os.path.join(options.git, '.git')
 
     toolchains = toolchain.Toolchains()
@@ -110,33 +110,27 @@ def DoBuildman(options, args):
             if count is None:
                 str = ("Branch '%s' not found or has no upstream" %
                        options.branch)
-                print col.Color(col.RED, str)
-                sys.exit(1)
+                sys.exit(col.Color(col.RED, str))
             count += 1   # Build upstream commit also
 
     if not count:
         str = ("No commits found to process in branch '%s': "
                "set branch's upstream or use -c flag" % options.branch)
-        print col.Color(col.RED, str)
-        sys.exit(1)
+        sys.exit(col.Color(col.RED, str))
 
     # Work out what subset of the boards we are building
     board_file = os.path.join(options.git, 'boards.cfg')
-    if not os.path.exists(board_file):
-        print 'Could not find %s' % board_file
-        status = subprocess.call([os.path.join(options.git,
-                                               'tools/genboardscfg.py')])
-        if status != 0:
-            print >> sys.stderr, "Failed to generate boards.cfg"
-            sys.exit(1)
+    status = subprocess.call([os.path.join(options.git,
+                                           'tools/genboardscfg.py')])
+    if status != 0:
+        sys.exit("Failed to generate boards.cfg")
 
     boards = board.Boards()
     boards.ReadBoards(os.path.join(options.git, 'boards.cfg'))
     why_selected = boards.SelectBoards(args)
     selected = boards.GetSelected()
     if not len(selected):
-        print col.Color(col.RED, 'No matching boards found')
-        sys.exit(1)
+        sys.exit(col.Color(col.RED, 'No matching boards found'))
 
     # Read the metadata from the commits. First look at the upstream commit,
     # then the ones in the branch. We would like to do something like
@@ -144,20 +138,29 @@ def DoBuildman(options, args):
     # a merge commit (it will list all the commits that form part of the
     # merge)
     if options.branch:
-        range_expr = gitutil.GetRangeInBranch(options.git_dir, options.branch)
-        upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch)
-        series = patchstream.GetMetaDataForList(upstream_commit,
-            options.git_dir, 1)
-
-        # Conflicting tags are not a problem for buildman, since it does not
-        # use them. For example, Series-version is not useful for buildman. On
-        # the other hand conflicting tags will cause an error. So allow later
-        # tags to overwrite earlier ones.
-        series.allow_overwrite = True
-        series = patchstream.GetMetaDataForList(range_expr, options.git_dir, None,
-                series)
+        if count == -1:
+            range_expr = gitutil.GetRangeInBranch(options.git_dir,
+                                                  options.branch)
+            upstream_commit = gitutil.GetUpstream(options.git_dir,
+                                                  options.branch)
+            series = patchstream.GetMetaDataForList(upstream_commit,
+                options.git_dir, 1)
+
+            # Conflicting tags are not a problem for buildman, since it does
+            # not use them. For example, Series-version is not useful for
+            # buildman. On the other hand conflicting tags will cause an
+            # error. So allow later tags to overwrite earlier ones.
+            series.allow_overwrite = True
+            series = patchstream.GetMetaDataForList(range_expr,
+                                              options.git_dir, None, series)
+        else:
+            # Honour the count
+            series = patchstream.GetMetaDataForList(options.branch,
+                                                    options.git_dir, count)
     else:
         series = None
+        options.verbose = True
+        options.show_errors = True
 
     # By default we have one thread per CPU. But if there are not enough jobs
     # we can have fewer threads and use a high '-j' value for make.
@@ -173,8 +176,7 @@ def DoBuildman(options, args):
     gnu_make = command.Output(os.path.join(options.git,
                                            'scripts/show-gnu-make')).rstrip()
     if not gnu_make:
-        print >> sys.stderr, 'GNU Make not found'
-        sys.exit(1)
+        sys.exit('GNU Make not found')
 
     # Create a new builder with the selected options
     if options.branch:
@@ -207,13 +209,13 @@ def DoBuildman(options, args):
         print GetActionSummary(options.summary, commits, board_selected,
                                options)
 
+        builder.SetDisplayOptions(options.show_errors, options.show_sizes,
+                                  options.show_detail, options.show_bloat)
         if options.summary:
             # We can't show function sizes without board details at present
             if options.show_bloat:
                 options.show_detail = True
-            builder.ShowSummary(commits, board_selected,
-                    options.show_errors, options.show_sizes,
-                    options.show_detail, options.show_bloat)
+            builder.ShowSummary(commits, board_selected)
         else:
             builder.BuildBoards(commits, board_selected,
-                    options.show_errors, options.keep_outputs)
+                                options.keep_outputs, options.verbose)