Changeset c101fe1 for waflib/Tools/ccroot.py

Timestamp:

Nov 13, 2013, 1:00:56 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:

d3066e2

Parents:

54e74f0

Message:

waf, waflib: update to 1.7.13

File:

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

waflib/Tools/ccroot.py

@@ -3 +3 @@
 # WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
 
-import os
+import os,re
 from waflib import Task,Utils,Node,Errors
 from waflib.TaskGen import after_method,before_method,feature,taskgen_method,extension
@@ -71 +71 @@
                                 pattern='%s'
                         folder,name=os.path.split(target)
-                        if self.__class__.__name__.find('shlib')>0:
-                                if self.env.DEST_BINFMT=='pe'and getattr(self.generator,'vnum',None):
-                                        name=name+'-'+self.generator.vnum.split('.')[0]
+                        if self.__class__.__name__.find('shlib')>0 and getattr(self.generator,'vnum',None):
+                                nums=self.generator.vnum.split('.')
+                                if self.env.DEST_BINFMT=='pe':
+                                        name=name+'-'+nums[0]
+                                elif self.env.DEST_OS=='openbsd':
+                                        pattern='%s.%s.%s'%(pattern,nums[0],nums[1])
                         tmp=folder+os.sep+pattern%name
                         target=self.generator.path.find_or_declare(tmp)
@@ -198 +201 @@
                 if getattr(y,'export_includes',None):
                         self.includes.extend(y.to_incnodes(y.export_includes))
+                if getattr(y,'export_defines',None):
+                        self.env.append_value('DEFINES',self.to_list(y.export_defines))
         for x in names:
                 try:
@@ -274 +279 @@
                 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)$')
 @feature('cshlib','cxxshlib','dshlib','fcshlib','vnum')
 @after_method('apply_link','propagate_uselib_vars')
@@ -280 +286 @@
                 return
         link=self.link_task
+        if not re_vnum.match(self.vnum):
+                raise Errors.WafError('Invalid version %r for %r'%(self.vnum,self))
         nums=self.vnum.split('.')
         node=link.outputs[0]
@@ -292 +300 @@
                 v=self.env.SONAME_ST%name2
                 self.env.append_value('LINKFLAGS',v.split())
-        self.create_task('vnum',node,[node.parent.find_or_declare(name2),node.parent.find_or_declare(name3)])
+        if self.env.DEST_OS!='openbsd':
+                self.create_task('vnum',node,[node.parent.find_or_declare(name2),node.parent.find_or_declare(name3)])
         if getattr(self,'install_task',None):
                 self.install_task.hasrun=Task.SKIP_ME
                 bld=self.bld
                 path=self.install_task.dest
-                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 self.env.DEST_OS=='openbsd':
+                        libname=self.link_task.outputs[0].name
+                        t1=bld.install_as('%s%s%s'%(path,os.sep,libname),node,env=self.env,chmod=self.link_task.chmod)
+                        self.vnum_install_task=(t1,)
+                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'-dynamiclib'in self.env['LINKFLAGS']:
                 try:
@@ -342 +356 @@
                 return Task.SKIP_ME
 @conf
-def read_shlib(self,name,paths=[]):
-        return self(name=name,features='fake_lib',lib_paths=paths,lib_type='shlib')
+def read_shlib(self,name,paths=[],export_includes=[],export_defines=[]):
+        return self(name=name,features='fake_lib',lib_paths=paths,lib_type='shlib',export_includes=export_includes,export_defines=export_defines)
 @conf
-def read_stlib(self,name,paths=[]):
-        return self(name=name,features='fake_lib',lib_paths=paths,lib_type='stlib')
+def read_stlib(self,name,paths=[],export_includes=[],export_defines=[]):
+        return self(name=name,features='fake_lib',lib_paths=paths,lib_type='stlib',export_includes=export_includes,export_defines=export_defines)
 lib_patterns={'shlib':['lib%s.so','%s.so','lib%s.dylib','lib%s.dll','%s.dll'],'stlib':['lib%s.a','%s.a','lib%s.dll','%s.dll','lib%s.lib','%s.lib'],}
 @feature('fake_lib')