FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue 1318 reuse moc tasks

This commit is contained in:
Thomas Nagy 2013-05-18 14:08:41 +02:00
parent 29f80f4aeb
commit 8267e7ae97
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@ NEW IN WAF 1.7.11
* QtDesigner library detection #1315
* Redundant check_dir call causing random uninstall failures #1313
* Append to moc flags instead of replacing them #1317
* Share moc tasks in the Qt processing #1318
NEW IN WAF 1.7.10
-----------------

48
waflib/Tools/qt4.py
View File

@ -139,6 +139,34 @@ class qxx(Task.classes['cxx']):
self.add_moc_tasks()
return Task.Task.runnable_status(self)
def create_moc_task(self, h_node, m_node):
"""
If several libraries use the same classes, it is possible that moc will run several times (Issue 1318)
It is not possible to change the file names, but we can assume that the moc transformation will be identical,
and the moc tasks can be shared in a global cache.
The defines passed to moc will then depend on task generator order. If this is not acceptable, then
use the tool slow_qt4 instead (and enjoy the slow builds... :-( )
"""
try:
moc_cache = self.generator.bld.moc_cache
except AttributeError:
moc_cache = self.generator.bld.moc_cache = {}
try:
return moc_cache[h_node]
except KeyError:
tsk = moc_cache[h_node] = Task.classes['moc'](env=self.env, generator=self.generator)
tsk.set_inputs(h_node)
tsk.set_outputs(m_node)
# direct injection in the build phase (safe because called from the main thread)
gen = self.generator.bld.producer
gen.outstanding.insert(0, tsk)
gen.total += 1
return tsk
def add_moc_tasks(self):
"""
Create the moc tasks by looking in ``bld.raw_deps[self.uid()]``
@ -206,15 +234,7 @@ class qxx(Task.classes['cxx']):
bld.node_deps[(self.inputs[0].parent.abspath(), m_node.name)] = h_node
# create the task
task = Task.classes['moc'](env=self.env, generator=self.generator)
task.set_inputs(h_node)
task.set_outputs(m_node)
# direct injection in the build phase (safe because called from the main thread)
gen = bld.producer
gen.outstanding.insert(0, task)
gen.total += 1
task = self.create_moc_task(h_node, m_node)
moctasks.append(task)
# remove raw deps except the moc files to save space (optimization)
@ -225,18 +245,12 @@ class qxx(Task.classes['cxx']):
for d in lst:
name = d.name
if name.endswith('.moc'):
task = Task.classes['moc'](env=self.env, generator=self.generator)
task.set_inputs(bld.node_deps[(self.inputs[0].parent.abspath(), name)]) # 1st element in a tuple
task.set_outputs(d)
gen = bld.producer
gen.outstanding.insert(0, task)
gen.total += 1
task = self.create_moc_task(bld.node_deps[(self.inputs[0].parent.abspath(), name)], d)
moctasks.append(task)
# simple scheduler dependency: run the moc task before others
self.run_after.update(set(moctasks))
print self.outputs, self.run_after
self.moc_done = 1
run = Task.classes['cxx'].__dict__['run']