FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-11 12:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Removed bld.returned_tasks

Browse Source
This commit is contained in:
Thomas Nagy 2016-02-15 23:52:11 +01:00
parent 0bafa590f3
commit 7e16c7cb1e
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
waflib/Build.py
View File

@ -274,7 +274,7 @@ class BuildContext(Context.Context):
self.compile() self.compile()
finally: finally:
if self.progress_bar == 1 and sys.stderr.isatty(): 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) 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(m, extra={'stream': sys.stderr, 'c1': Logs.colors.cursor_off, 'c2' : Logs.colors.cursor_on})
Logs.info("Waf: Leaving directory `%s'" % self.variant_dir) 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) # use another object to perform the producer-consumer logic (reduce the complexity)
self.producer = Runner.Parallel(self, self.jobs) self.producer = Runner.Parallel(self, self.jobs)
self.producer.biter = self.get_build_iterator() self.producer.biter = self.get_build_iterator()
self.returned_tasks = [] # not part of the API yet
try: try:
self.producer.start() self.producer.start()
except KeyboardInterrupt: except KeyboardInterrupt:

1
waflib/Task.py
View File

@ -214,7 +214,6 @@ class TaskBase(evil):
pass pass
try: try:
self.generator.bld.returned_tasks.append(self)
self.log_display(self.generator.bld) self.log_display(self.generator.bld)
ret = self.run() ret = self.run()
except Exception: except Exception:

1
waflib/Tools/c_config.py
View File

@ -1212,7 +1212,6 @@ def multicheck(self, *k, **kw):
class par(object): class par(object):
def __init__(self): def __init__(self):
self.keep = False self.keep = False
self.returned_tasks = []
self.task_sigs = {} self.task_sigs = {}
self.progress_bar = 0 self.progress_bar = 0
def total(self): def total(self):

1
waflib/extras/parallel_debug.py
View File

@ -222,7 +222,6 @@ def process(self):
pass pass
try: try:
self.generator.bld.returned_tasks.append(self)
self.log_display(self.generator.bld) self.log_display(self.generator.bld)
ret = self.run() ret = self.run()
except Exception: except Exception: