waf, waflib: update to 1.7.15

diff --git a/waf b/waf
index 4ba08d8..75496f7 100755 (executable)
--- a/waf
+++ b/waf
@@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys
 
-VERSION="1.7.13"
-REVISION="5a064c2686fe54de4e11018d22148cfc"
+VERSION="1.7.15"
+REVISION="de1cb53b86321cda764be4b3c38c3d20"
 INSTALL=''
-C1='#('
-C2='#$'
+C1='#+'
+C2='#&'
 cwd = os.getcwd()
 join = os.path.join
 

diff --git a/waflib/Configure.py b/waflib/Configure.py
index e8148d5..2814e61 100644 (file)
--- a/waflib/Configure.py
+++ b/waflib/Configure.py
@@ -195,7 +195,7 @@ class ConfigurationContext(Context.Context):
                        self.tools.append({'tool':tool,'tooldir':tooldir,'funs':funs})
        def post_recurse(self,node):
                super(ConfigurationContext,self).post_recurse(node)
-               self.hash=hash((self.hash,node.read('rb')))
+               self.hash=Utils.h_list((self.hash,node.read('rb')))
                self.files.append(node.abspath())
        def eval_rules(self,rules):
                self.rules=Utils.to_list(rules)

diff --git a/waflib/Context.py b/waflib/Context.py
index c789c48..ab8d047 100644 (file)
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -5,9 +5,9 @@
 import os,imp,sys
 from waflib import Utils,Errors,Logs
 import waflib.Node
-HEXVERSION=0x1070d00
-WAFVERSION="1.7.13"
-WAFREVISION="daa91dba4b881d86bc25eec90a3745ebaeece835"
+HEXVERSION=0x1070f00
+WAFVERSION="1.7.15"
+WAFREVISION="f63ac9793de2d4eaae884e55d4ff70a761dcbab2"
 ABI=98
 DBFILE='.wafpickle-%s-%d-%d'%(sys.platform,sys.hexversion,ABI)
 APPNAME='APPNAME'
@@ -60,11 +60,8 @@ class Context(ctx):
                except KeyError:
                        global run_dir
                        rd=run_dir
-               class node_class(waflib.Node.Node):
-                       pass
-               self.node_class=node_class
+               self.node_class=type("Nod3",(waflib.Node.Node,),{})
                self.node_class.__module__="waflib.Node"
-               self.node_class.__name__="Nod3"
                self.node_class.ctx=self
                self.root=self.node_class('',None)
                self.cur_script=None

diff --git a/waflib/Scripting.py b/waflib/Scripting.py
index fe5c30c..aec7124 100644 (file)
--- a/waflib/Scripting.py
+++ b/waflib/Scripting.py
@@ -202,8 +202,10 @@ def distclean(ctx):
                                except OSError ,e:
                                        if e.errno!=errno.ENOENT:
                                                Logs.warn('file %r cannot be removed'%f)
-               if f.startswith('.waf')and not Options.commands:
-                       shutil.rmtree(f,ignore_errors=True)
+               if not Options.commands:
+                       for x in'.waf-1. waf-1. .waf3-1. waf3-1.'.split():
+                               if f.startswith(x):
+                                       shutil.rmtree(f,ignore_errors=True)
 class Dist(Context.Context):
        '''creates an archive containing the project source code'''
        cmd='dist'
@@ -362,7 +364,7 @@ def autoconfigure(execute_method):
                        else:
                                h=0
                                for f in env['files']:
-                                       h=hash((h,Utils.readf(f,'rb')))
+                                       h=Utils.h_list((h,Utils.readf(f,'rb')))
                                do_config=h!=env.hash
                if do_config:
                        Options.commands.insert(0,self.cmd)

diff --git a/waflib/Task.py b/waflib/Task.py
index 1b54a54..8cc4cc3 100644 (file)
--- a/waflib/Task.py
+++ b/waflib/Task.py
@@ -663,9 +663,15 @@ def update_outputs(cls):
                        prev_sig=bld.task_sigs[self.uid()]
                        if prev_sig==self.signature():
                                for x in self.outputs:
+                                       if not x.is_child_of(bld.bldnode):
+                                               x.sig=Utils.h_file(x.abspath())
                                        if not x.sig or bld.task_sigs[x.abspath()]!=self.uid():
                                                return RUN_ME
                                return SKIP_ME
+               except OSError:
+                       pass
+               except IOError:
+                       pass
                except KeyError:
                        pass
                except IndexError:

diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py
index 4e04239..381bfce 100644 (file)
--- a/waflib/TaskGen.py
+++ b/waflib/TaskGen.py
@@ -322,7 +322,8 @@ class subst_pc(Task.Task):
                                lst.append(g(1))
                                return"%%(%s)s"%g(1)
                        return''
-               code=re_m4.sub(repl,code)
+               global re_m4
+               code=getattr(self.generator,'re_m4',re_m4).sub(repl,code)
                try:
                        d=self.generator.dct
                except AttributeError:

diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py
index 9f29b49..eb615d8 100755 (executable)
--- a/waflib/Tools/c_config.py
+++ b/waflib/Tools/c_config.py
@@ -162,6 +162,13 @@ def exec_cfg(self,kw):
                defi=self.env.PKG_CONFIG_DEFINES or{}
        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)
                uselib=kw.get('uselib_store',kw['package'].upper())
@@ -173,13 +180,6 @@ def exec_cfg(self,kw):
                if not'okmsg'in kw:
                        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:
                kw['okmsg']='yes'
@@ -327,7 +327,8 @@ def validate_c(self,kw):
        if not kw.get('success'):kw['success']=None
        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):
        is_success=0
@@ -358,13 +359,11 @@ def post_check(self,*k,**kw):
                                _vars|=ccroot.USELIB_VARS[x]
                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
 def check(self,*k,**kw):
@@ -671,8 +670,11 @@ def get_suncc_version(conf,cc):
        cmd=cc+['-V']
        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]
        version_re=re.compile(r'cc:\s+sun\s+(c\+\+|c)\s+(?P<major>\d*)\.(?P<minor>\d*)',re.I).search

diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py
index dc6453b..1f99cd3 100644 (file)
--- a/waflib/Tools/c_preproc.py
+++ b/waflib/Tools/c_preproc.py
@@ -246,7 +246,7 @@ def reduce_tokens(lst,defs,ban=[]):
                                                        if one_param:args.append(one_param)
                                                        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=[]
                                                else:
@@ -362,7 +362,10 @@ def extract_macro(txt):
                return(name,[params,t[i+1:]])
        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):
        m=re_include.search(txt)

diff --git a/waflib/Tools/fc_scan.py b/waflib/Tools/fc_scan.py
index 48e06b5..e4e2344 100644 (file)
--- a/waflib/Tools/fc_scan.py
+++ b/waflib/Tools/fc_scan.py
@@ -6,7 +6,7 @@ import re
 from waflib import Utils,Task,TaskGen,Logs
 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+)"""
 re_inc=re.compile(INC_REGEX,re.I)

diff --git a/waflib/Tools/nasm.py b/waflib/Tools/nasm.py
index e3126dd..00e650a 100644 (file)
--- a/waflib/Tools/nasm.py
+++ b/waflib/Tools/nasm.py
@@ -2,6 +2,7 @@
 # encoding: utf-8
 # 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
 @feature('asm')
@@ -12,3 +13,4 @@ def configure(conf):
        conf.env.AS_TGT_F=['-o']
        conf.env.ASLNK_TGT_F=['-o']
        conf.load('asm')
+       conf.env.ASMPATH_ST='-I%s'+os.sep

diff --git a/waflib/Utils.py b/waflib/Utils.py
index 9532a3b..92cfd81 100644 (file)
--- a/waflib/Utils.py
+++ b/waflib/Utils.py
@@ -108,7 +108,7 @@ def h_file(fname):
        finally:
                f.close()
        return m.digest()
-if hasattr(os,'O_NOINHERIT'):
+if hasattr(os,'O_NOINHERIT')and sys.hexversion<0x3040000:
        def readf_win32(f,m='r',encoding='ISO8859-1'):
                flags=os.O_NOINHERIT|os.O_RDONLY
                if'b'in m:

diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py
index 0de6171..def27e4 100644 (file)
--- a/waflib/ansiterm.py
+++ b/waflib/ansiterm.py
@@ -6,7 +6,7 @@ import sys,os
 try:
        if not(sys.stderr.isatty()and sys.stdout.isatty()):
                raise ValueError('not a tty')
-       from ctypes import*
+       from ctypes import Structure,windll,c_short,c_ushort,c_ulong,c_int,byref,POINTER,c_long,c_char
        class COORD(Structure):
                _fields_=[("X",c_short),("Y",c_short)]
        class SMALL_RECT(Structure):
@@ -15,6 +15,20 @@ try:
                _fields_=[("Size",COORD),("CursorPosition",COORD),("Attributes",c_short),("Window",SMALL_RECT),("MaximumWindowSize",COORD)]
        class CONSOLE_CURSOR_INFO(Structure):
                _fields_=[('dwSize',c_ulong),('bVisible',c_int)]
+       windll.kernel32.GetStdHandle.argtypes=[c_ulong]
+       windll.kernel32.GetStdHandle.restype=c_ulong
+       windll.kernel32.GetConsoleScreenBufferInfo.argtypes=[c_ulong,POINTER(CONSOLE_SCREEN_BUFFER_INFO)]
+       windll.kernel32.GetConsoleScreenBufferInfo.restype=c_long
+       windll.kernel32.SetConsoleTextAttribute.argtypes=[c_ulong,c_ushort]
+       windll.kernel32.SetConsoleTextAttribute.restype=c_long
+       windll.kernel32.FillConsoleOutputCharacterA.argtypes=[c_ulong,c_char,c_ulong,POINTER(COORD),POINTER(c_ulong)]
+       windll.kernel32.FillConsoleOutputCharacterA.restype=c_long
+       windll.kernel32.FillConsoleOutputAttribute.argtypes=[c_ulong,c_ushort,c_ulong,POINTER(COORD),POINTER(c_ulong)]
+       windll.kernel32.FillConsoleOutputAttribute.restype=c_long
+       windll.kernel32.SetConsoleCursorPosition.argtypes=[c_ulong,POINTER(COORD)]
+       windll.kernel32.SetConsoleCursorPosition.restype=c_long
+       windll.kernel32.SetConsoleCursorInfo.argtypes=[c_ulong,POINTER(CONSOLE_CURSOR_INFO)]
+       windll.kernel32.SetConsoleCursorInfo.restype=c_long
        sbinfo=CONSOLE_SCREEN_BUFFER_INFO()
        csinfo=CONSOLE_CURSOR_INFO()
        hconsole=windll.kernel32.GetStdHandle(-11)
@@ -59,8 +73,8 @@ else:
                        else:
                                line_start=sbinfo.CursorPosition
                                line_length=sbinfo.Size.X-sbinfo.CursorPosition.X
-                       chars_written=c_int()
-                       windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_wchar(' '),line_length,line_start,byref(chars_written))
+                       chars_written=c_ulong()
+                       windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_char(' '),line_length,line_start,byref(chars_written))
                        windll.kernel32.FillConsoleOutputAttribute(self.hconsole,sbinfo.Attributes,line_length,line_start,byref(chars_written))
                def clear_screen(self,param):
                        mode=to_int(param,0)
@@ -75,8 +89,8 @@ else:
                        else:
                                clear_start=sbinfo.CursorPosition
                                clear_length=((sbinfo.Size.X-sbinfo.CursorPosition.X)+sbinfo.Size.X*(sbinfo.Size.Y-sbinfo.CursorPosition.Y))
-                       chars_written=c_int()
-                       windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_wchar(' '),clear_length,clear_start,byref(chars_written))
+                       chars_written=c_ulong()
+                       windll.kernel32.FillConsoleOutputCharacterA(self.hconsole,c_char(' '),clear_length,clear_start,byref(chars_written))
                        windll.kernel32.FillConsoleOutputAttribute(self.hconsole,sbinfo.Attributes,clear_length,clear_start,byref(chars_written))
                def push_cursor(self,param):
                        sbinfo=self.screen_buffer_info()
@@ -127,9 +141,9 @@ else:
                                        c=int(c)
                                else:
                                        c=to_int(c,0)
-                               if c in range(30,38):
+                               if 29<c<38:
                                        attr=(attr&0xfff0)|self.rgb2bgr(c-30)
-                               elif c in range(40,48):
+                               elif 39<c<48:
                                        attr=(attr&0xff0f)|(self.rgb2bgr(c-40)<<4)
                                elif c==0:
                                        attr=self.orig_sbinfo.Attributes