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

Change producer.outstanding.appendleft to producer.outstanding.append

Browse Source
This commit is contained in:
Thomas Nagy 2017-06-14 19:53:01 +02:00
parent 23c0d41aff
commit e5e8397154
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playground/dynamic_headers/wscript
View File

@ -56,7 +56,7 @@ def runnable_status(self):
tsk = mock_tasks[m_node] tsk = mock_tasks[m_node]
except KeyError: except KeyError:
tsk = mock_tasks[m_node] = self.generator.create_task('mock', [h_node], [m_node]) tsk = mock_tasks[m_node] = self.generator.create_task('mock', [h_node], [m_node])
bld.producer.outstanding.appendleft(tsk) bld.producer.outstanding.append(tsk)
bld.producer.total += 1 bld.producer.total += 1
# preprocessor cache :-/ # preprocessor cache :-/
@ -86,7 +86,7 @@ def runnable_status(self):
tsk = mock_tasks[x] tsk = mock_tasks[x]
except KeyError: except KeyError:
tsk = mock_tasks[x] = self.generator.create_task('mock', [h_node], [x]) tsk = mock_tasks[x] = self.generator.create_task('mock', [h_node], [x])
bld.producer.outstanding.appendleft(tsk) bld.producer.outstanding.append(tsk)
bld.producer.total += 1 bld.producer.total += 1
add = True add = True

4
waflib/Runner.py
View File

@ -29,6 +29,8 @@ class PriorityTasks(object):
self.lst = [] self.lst = []
def append(self, task): def append(self, task):
heapq.heappush(self.lst, task) heapq.heappush(self.lst, task)
def appendleft(self, task):
heapq.heappush(self.lst, task)
def pop(self): def pop(self):
return heapq.heappop(self.lst) return heapq.heappop(self.lst)
def extend(self, lst): def extend(self, lst):
@ -41,7 +43,7 @@ class PriorityTasks(object):
self.lst = lst self.lst = lst
heapq.heapify(lst) heapq.heapify(lst)
else: else:
self.lst = lst.queue self.lst = lst.lst
class Consumer(Utils.threading.Thread): class Consumer(Utils.threading.Thread):
""" """

1
waflib/Task.py
View File

@ -178,7 +178,6 @@ class Task(evil):
"""Set of tasks that must be executed before this one""" """Set of tasks that must be executed before this one"""
self.__order = 0 self.__order = 0
"""Task build order; used internally"""
def __lt__(self, other): def __lt__(self, other):
return self.__order > other.__order or id(self) > id(other) return self.__order > other.__order or id(self) > id(other)

2
waflib/Tools/qt5.py
View File

@ -149,7 +149,7 @@ class qxx(Task.classes['cxx']):
# direct injection in the build phase (safe because called from the main thread) # direct injection in the build phase (safe because called from the main thread)
gen = self.generator.bld.producer gen = self.generator.bld.producer
gen.outstanding.appendleft(tsk) gen.outstanding.append(tsk)
gen.total += 1 gen.total += 1
return tsk return tsk

2
waflib/extras/qt4.py
View File

@ -155,7 +155,7 @@ class qxx(Task.classes['cxx']):
# direct injection in the build phase (safe because called from the main thread) # direct injection in the build phase (safe because called from the main thread)
gen = self.generator.bld.producer gen = self.generator.bld.producer
gen.outstanding.appendleft(tsk) gen.outstanding.append(tsk)
gen.total += 1 gen.total += 1
return tsk return tsk

2
waflib/extras/slow_qt4.py
View File

@ -63,7 +63,7 @@ class cxx_qt(Task.classes['cxx']):
# moc is trying to be too smart but it is too dumb: # moc is trying to be too smart but it is too dumb:
# why forcing the #include when Q_OBJECT is in the cpp file? # why forcing the #include when Q_OBJECT is in the cpp file?
gen = self.generator.bld.producer gen = self.generator.bld.producer
gen.outstanding.appendleft(tsk) gen.outstanding.append(tsk)
gen.total += 1 gen.total += 1
self.set_run_after(tsk) self.set_run_after(tsk)
else: else:

2
waflib/extras/swig.py
View File

@ -113,7 +113,7 @@ def swig_c(self):
c_tsk.set_run_after(self) c_tsk.set_run_after(self)
ge = self.generator.bld.producer ge = self.generator.bld.producer
ge.outstanding.appendleft(c_tsk) ge.outstanding.append(c_tsk)
ge.total += 1 ge.total += 1
try: try: