From 7e16c7cb1e0871db7240b934b06ee1ab64b27c64 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Mon, 15 Feb 2016 23:52:11 +0100 Subject: [PATCH] Removed bld.returned_tasks --- waflib/Build.py | 3 +-- waflib/Task.py | 1 - waflib/Tools/c_config.py | 1 - waflib/extras/parallel_debug.py | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/waflib/Build.py b/waflib/Build.py index e9263baa..92b95ff5 100644 --- a/waflib/Build.py +++ b/waflib/Build.py @@ -274,7 +274,7 @@ class BuildContext(Context.Context): self.compile() finally: if self.progress_bar == 1 and sys.stderr.isatty(): - c = len(self.returned_tasks) or 1 + c = self.producer.processed or 1 m = self.progress_line(c, c, Logs.colors.BLUE, Logs.colors.NORMAL) Logs.info(m, extra={'stream': sys.stderr, 'c1': Logs.colors.cursor_off, 'c2' : Logs.colors.cursor_on}) Logs.info("Waf: Leaving directory `%s'" % self.variant_dir) @@ -357,7 +357,6 @@ class BuildContext(Context.Context): # use another object to perform the producer-consumer logic (reduce the complexity) self.producer = Runner.Parallel(self, self.jobs) self.producer.biter = self.get_build_iterator() - self.returned_tasks = [] # not part of the API yet try: self.producer.start() except KeyboardInterrupt: diff --git a/waflib/Task.py b/waflib/Task.py index 8470914a..735baca6 100644 --- a/waflib/Task.py +++ b/waflib/Task.py @@ -214,7 +214,6 @@ class TaskBase(evil): pass try: - self.generator.bld.returned_tasks.append(self) self.log_display(self.generator.bld) ret = self.run() except Exception: diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py index 1e34ef75..4cda8b5c 100644 --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -1212,7 +1212,6 @@ def multicheck(self, *k, **kw): class par(object): def __init__(self): self.keep = False - self.returned_tasks = [] self.task_sigs = {} self.progress_bar = 0 def total(self): diff --git a/waflib/extras/parallel_debug.py b/waflib/extras/parallel_debug.py index d21e845c..825e411d 100644 --- a/waflib/extras/parallel_debug.py +++ b/waflib/extras/parallel_debug.py @@ -222,7 +222,6 @@ def process(self): pass try: - self.generator.bld.returned_tasks.append(self) self.log_display(self.generator.bld) ret = self.run() except Exception: