Changeset 904702d for waflib/Tools/ccroot.py

Timestamp:

Mar 14, 2015, 6:06:10 PM (10 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:

6d7acc8

Parents:

5525507

Message:

waf, waflib: update to 1.8.7

File:

• waflib/Tools/ccroot.py (modified) (11 diffs)

waflib/Tools/ccroot.py

@@ -76 +76 @@
                                         name=name+'-'+nums[0]
                                 elif self.env.DEST_OS=='openbsd':
-                                        pattern='%s.%s.%s'%(pattern,nums[0],nums[1])
+                                        pattern='%s.%s'%(pattern,nums[0])
+                                        if len(nums)>=2:
+                                                pattern+='.%s'%nums[1]
                         tmp=folder+os.sep+pattern%name
                         target=self.generator.path.find_or_declare(tmp)
@@ -82 +84 @@
 class stlink_task(link_task):
         run_str='${AR} ${ARFLAGS} ${AR_TGT_F}${TGT} ${AR_SRC_F}${SRC}'
+        chmod=Utils.O644
 def rm_tgt(cls):
         old=cls.run
@@ -112 +115 @@
                 inst_to=self.link_task.__class__.inst_to
         if inst_to:
-                self.install_task=self.bld.install_files(inst_to,self.link_task.outputs[:],env=self.env,chmod=self.link_task.chmod)
+                self.install_task=self.bld.install_files(inst_to,self.link_task.outputs[:],env=self.env,chmod=self.link_task.chmod,task=self.link_task)
 @taskgen_method
 def use_rec(self,name,**kw):
@@ -140 +143 @@
         p=self.tmp_use_prec
         for x in self.to_list(getattr(y,'use',[])):
+                if self.env["STLIB_"+x]:
+                        continue
                 try:
                         p[x].append(name)
@@ -191 +196 @@
                 var=y.tmp_use_var
                 if var and link_task:
-                        if var=='LIB'or y.tmp_use_stlib:
+                        if var=='LIB'or y.tmp_use_stlib or x in names:
                                 self.env.append_value(var,[y.target[y.target.rfind(os.sep)+1:]])
                                 self.link_task.dep_nodes.extend(y.link_task.outputs)
                                 tmp_path=y.link_task.outputs[0].parent.path_from(self.bld.bldnode)
-                                self.env.append_value(var+'PATH',[tmp_path])
+                                self.env.append_unique(var+'PATH',[tmp_path])
                 else:
                         if y.tmp_use_objects:
@@ -206 +211 @@
                 try:
                         y=self.bld.get_tgen_by_name(x)
-                except Exception:
+                except Errors.WafError:
                         if not self.env['STLIB_'+x]and not x in self.uselib:
                                 self.uselib.append(x)
                 else:
-                        for k in self.to_list(getattr(y,'uselib',[])):
+                        for k in self.to_list(getattr(y,'use',[])):
                                 if not self.env['STLIB_'+k]and not k in self.uselib:
                                         self.uselib.append(k)
@@ -239 +244 @@
         _vars=self.get_uselib_vars()
         env=self.env
-        for x in _vars:
-                y=x.lower()
-                env.append_unique(x,self.to_list(getattr(self,y,[])))
-        for x in self.features:
-                for var in _vars:
-                        compvar='%s_%s'%(var,x)
-                        env.append_value(var,env[compvar])
-        for x in self.to_list(getattr(self,'uselib',[])):
-                for v in _vars:
-                        env.append_value(v,env[v+'_'+x])
+        app=env.append_value
+        feature_uselib=self.features+self.to_list(getattr(self,'uselib',[]))
+        for var in _vars:
+                y=var.lower()
+                val=getattr(self,y,[])
+                if val:
+                        app(var,self.to_list(val))
+                for x in feature_uselib:
+                        val=env['%s_%s'%(var,x)]
+                        if val:
+                                app(var,val)
 @feature('cshlib','cxxshlib','fcshlib')
 @after_method('apply_link')
@@ -272 +278 @@
                 else:
                         self.link_task.inputs.append(node)
-        try:
-                inst_to=self.install_path
-        except AttributeError:
-                inst_to=self.link_task.__class__.inst_to
-        if not inst_to:
-                return
-        self.implib_install_task=self.bld.install_as('${LIBDIR}/%s'%implib.name,implib,self.env)
-re_vnum=re.compile('^([1-9]\\d*|0)[.]([1-9]\\d*|0)[.]([1-9]\\d*|0)$')
+        if getattr(self,'install_task',None):
+                try:
+                        inst_to=self.install_path_implib
+                except AttributeError:
+                        try:
+                                inst_to=self.install_path
+                        except AttributeError:
+                                inst_to='${IMPLIBDIR}'
+                                self.install_task.dest='${BINDIR}'
+                                if not self.env.IMPLIBDIR:
+                                        self.env.IMPLIBDIR=self.env.LIBDIR
+                self.implib_install_task=self.bld.install_files(inst_to,implib,env=self.env,chmod=self.link_task.chmod,task=self.link_task)
+re_vnum=re.compile('^([1-9]\\d*|0)([.]([1-9]\\d*|0)[.]([1-9]\\d*|0))?$')
 @feature('cshlib','cxxshlib','dshlib','fcshlib','vnum')
 @after_method('apply_link','propagate_uselib_vars')
@@ -301 +312 @@
                 self.env.append_value('LINKFLAGS',v.split())
         if self.env.DEST_OS!='openbsd':
-                self.create_task('vnum',node,[node.parent.find_or_declare(name2),node.parent.find_or_declare(name3)])
+                outs=[node.parent.find_or_declare(name3)]
+                if name2!=name3:
+                        outs.append(node.parent.find_or_declare(name2))
+                self.create_task('vnum',node,outs)
         if getattr(self,'install_task',None):
                 self.install_task.hasrun=Task.SKIP_ME
@@ -312 +326 @@
                 else:
                         t1=bld.install_as(path+os.sep+name3,node,env=self.env,chmod=self.link_task.chmod)
-                        t2=bld.symlink_as(path+os.sep+name2,name3)
                         t3=bld.symlink_as(path+os.sep+libname,name3)
-                        self.vnum_install_task=(t1,t2,t3)
+                        if name2!=name3:
+                                t2=bld.symlink_as(path+os.sep+name2,name3)
+                                self.vnum_install_task=(t1,t2,t3)
+                        else:
+                                self.vnum_install_task=(t1,t3)
         if'-dynamiclib'in self.env['LINKFLAGS']:
                 try:
@@ -328 +345 @@
         quient=True
         ext_in=['.bin']
+        def keyword(self):
+                return'Symlinking'
         def run(self):
                 for x in self.outputs: