Changeset c101fe1 for waflib/Tools/qt4.py

Timestamp:

Nov 13, 2013, 1:00:56 PM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

d3066e2

Parents:

54e74f0

Message:

waf, waflib: update to 1.7.13

File:

• waflib/Tools/qt4.py (modified) (9 diffs)

waflib/Tools/qt4.py

@@ -21 +21 @@
 EXT_UI=['.ui']
 EXT_QT4=['.cpp','.cc','.cxx','.C']
-QT4_LIBS="QtCore QtGui QtUiTools QtNetwork QtOpenGL QtSql QtSvg QtTest QtXml QtXmlPatterns QtWebKit Qt3Support QtHelp QtScript QtDeclarative"
-class qxx(cxx.cxx):
+QT4_LIBS="QtCore QtGui QtUiTools QtNetwork QtOpenGL QtSql QtSvg QtTest QtXml QtXmlPatterns QtWebKit Qt3Support QtHelp QtScript QtDeclarative QtDesigner"
+class qxx(Task.classes['cxx']):
         def __init__(self,*k,**kw):
                 Task.Task.__init__(self,*k,**kw)
@@ -28 +28 @@
         def scan(self):
                 (nodes,names)=c_preproc.scan(self)
+                lst=[]
                 for x in nodes:
                         if x.name.endswith('.moc'):
-                                nodes.remove(x)
-                                names.append(x.path_from(self.inputs[0].parent.get_bld()))
-                return(nodes,names)
+                                s=x.path_from(self.inputs[0].parent.get_bld())
+                                if s not in names:
+                                        names.append(s)
+                        else:
+                                lst.append(x)
+                return(lst,names)
         def runnable_status(self):
                 if self.moc_done:
@@ -42 +46 @@
                         self.add_moc_tasks()
                         return Task.Task.runnable_status(self)
+        def create_moc_task(self,h_node,m_node):
+                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)
+                        gen=self.generator.bld.producer
+                        gen.outstanding.insert(0,tsk)
+                        gen.total+=1
+                        return tsk
         def add_moc_tasks(self):
                 node=self.inputs[0]
@@ -91 +110 @@
                                 raise Errors.WafError('no header found for %r which is a moc file'%d)
                         bld.node_deps[(self.inputs[0].parent.abspath(),m_node.name)]=h_node
-                        task=Task.classes['moc'](env=self.env,generator=self.generator)
-                        task.set_inputs(h_node)
-                        task.set_outputs(m_node)
-                        gen=bld.producer
-                        gen.outstanding.insert(0,task)
-                        gen.total+=1
+                        task=self.create_moc_task(h_node,m_node)
                         moctasks.append(task)
                 tmp_lst=bld.raw_deps[self.uid()]=mocfiles
@@ -103 +117 @@
                         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)])
-                                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)
                 self.run_after.update(set(moctasks))
@@ -176 +185 @@
                         else:
                                 lst.append(flag)
-        self.env['MOC_FLAGS']=lst
+        self.env.append_value('MOC_FLAGS',lst)
 @extension(*EXT_QT4)
 def cxx_hook(self,node):
@@ -225 +234 @@
         self.find_qt4_binaries()
         self.set_qt4_libs_to_check()
+        self.set_qt4_defines()
         self.find_qt4_libraries()
         self.add_qt4_rpath()
@@ -406 +416 @@
 def add_qt4_rpath(self):
         env=self.env
-        if Options.options.want_rpath:
+        if getattr(Options.options,'want_rpath',False):
                 def process_rpath(vars_,coreval):
                         for d in vars_:
@@ -430 +440 @@
                 self.qt4_vars_debug=[a+'_debug'for a in self.qt4_vars]
         self.qt4_vars_debug=Utils.to_list(self.qt4_vars_debug)
+@conf
+def set_qt4_defines(self):
+        if sys.platform!='win32':
+                return
+        for x in self.qt4_vars:
+                y=x[2:].upper()
+                self.env.append_unique('DEFINES_%s'%x.upper(),'QT_%s_LIB'%y)
+                self.env.append_unique('DEFINES_%s_DEBUG'%x.upper(),'QT_%s_LIB'%y)
 def options(opt):
         opt.add_option('--want-rpath',action='store_true',default=False,dest='want_rpath',help='enable the rpath for qt libraries')