Changeset 1a31baf for waflib/Tools

Timestamp:

Mar 12, 2014, 2:02:47 AM (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:

46b00690

Parents:

db21ca4

Message:

waf, waflib: update to 1.7.15

Location:

waflib/Tools

Files:

• c_config.py (modified) (5 diffs)
• c_preproc.py (modified) (2 diffs)
• fc_scan.py (modified) (1 diff)
• nasm.py (modified) (2 diffs)

waflib/Tools/c_config.py

@@ -163 +163 @@
         for key,val in defi.items():
                 lst.append('--define-variable=%s=%s'%(key,val))
+        static=False
+        if'args'in kw:
+                args=Utils.to_list(kw['args'])
+                if'--static'in args or'--static-libs'in args:
+                        static=True
+                lst+=args
+        lst.extend(Utils.to_list(kw['package']))
         if'variables'in kw:
                 env=kw.get('env',self.env)
@@ -174 +181 @@
                         kw['okmsg']='yes'
                 return
-        static=False
-        if'args'in kw:
-                args=Utils.to_list(kw['args'])
-                if'--static'in args or'--static-libs'in args:
-                        static=True
-                lst+=args
-        lst.extend(Utils.to_list(kw['package']))
         ret=self.cmd_and_log(lst)
         if not'okmsg'in kw:
@@ -328 +328 @@
         if'define_name'in kw:
                 self.undefine(kw['define_name'])
-        assert'msg'in kw,'invalid parameters, read http://freehackers.org/~tnagy/wafbook/single.html#config_helpers_c'
+        if not'msg'in kw:
+                self.fatal('missing "msg" in conf.check(...)')
 @conf
 def post_check(self,*k,**kw):
@@ -359 +360 @@
                 for k in _vars:
                         lk=k.lower()
-                        if k=='INCLUDES':lk='includes'
-                        if k=='DEFINES':lk='defines'
                         if lk in kw:
                                 val=kw[lk]
                                 if isinstance(val,str):
                                         val=val.rstrip(os.path.sep)
-                                self.env.append_unique(k+'_'+kw['uselib_store'],val)
+                                self.env.append_unique(k+'_'+kw['uselib_store'],Utils.to_list(val))
         return is_success
 @conf
@@ -672 +671 @@
         try:
                 out,err=conf.cmd_and_log(cmd,output=0)
-        except Errors.WafError:
-                conf.fatal('Could not find suncc %r'%cmd)
+        except Errors.WafError ,e:
+                if not(hasattr(e,'returncode')and hasattr(e,'stdout')and hasattr(e,'stderr')):
+                        conf.fatal('Could not find suncc %r'%cmd)
+                out=e.stdout
+                err=e.stderr
         version=(out or err)
         version=version.split('\n')[0]

waflib/Tools/c_preproc.py

@@ -247 +247 @@
                                                         break
                                                 elif v2==',':
-                                                        if not one_param:raise PreprocError("empty param in funcall %s"%p)
+                                                        if not one_param:raise PreprocError("empty param in funcall %s"%v)
                                                         args.append(one_param)
                                                         one_param=[]
@@ -363 +363 @@
         else:
                 (p,v)=t[0]
-                return(v,[[],t[1:]])
+                if len(t)>1:
+                        return(v,[[],t[1:]])
+                else:
+                        return(v,[[],[('T','')]])
 re_include=re.compile('^\s*(<(?P<a>.*)>|"(?P<b>.*)")')
 def extract_include(txt,defs):

waflib/Tools/fc_scan.py

@@ -7 +7 @@
 from waflib.TaskGen import feature,before_method,after_method,extension
 from waflib.Configure import conf
-INC_REGEX="""(?:^|['">]\s*;)\s*INCLUDE\s+(?:\w+_)?[<"'](.+?)(?=["'>])"""
+INC_REGEX="""(?:^|['">]\s*;)\s*(?:|#\s*)INCLUDE\s+(?:\w+_)?[<"'](.+?)(?=["'>])"""
 USE_REGEX="""(?:^|;)\s*USE(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""
 MOD_REGEX="""(?:^|;)\s*MODULE(?!\s*PROCEDURE)(?:\s+|(?:(?:\s*,\s*(?:NON_)?INTRINSIC)?\s*::))\s*(\w+)"""

waflib/Tools/nasm.py

@@ -3 +3 @@
 # WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
 
+import os
 import waflib.Tools.asm
 from waflib.TaskGen import feature
@@ -13 +14 @@
         conf.env.ASLNK_TGT_F=['-o']
         conf.load('asm')
+        conf.env.ASMPATH_ST='-I%s'+os.sep