Changeset 904702d for waflib/extras/compat15.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/extras/compat15.py (modified) (8 diffs)

waflib/extras/compat15.py

@@ -27 +27 @@
 Build.BuildContext.is_install=0
 Node.Node.relpath_gen=Node.Node.path_from
+Utils.pproc=Utils.subprocess
+Utils.get_term_cols=Logs.get_term_cols
+def cmd_output(cmd,**kw):
+        silent=False
+        if'silent'in kw:
+                silent=kw['silent']
+                del(kw['silent'])
+        if'e'in kw:
+                tmp=kw['e']
+                del(kw['e'])
+                kw['env']=tmp
+        kw['shell']=isinstance(cmd,str)
+        kw['stdout']=Utils.subprocess.PIPE
+        if silent:
+                kw['stderr']=Utils.subprocess.PIPE
+        try:
+                p=Utils.subprocess.Popen(cmd,**kw)
+                output=p.communicate()[0]
+        except OSError ,e:
+                raise ValueError(str(e))
+        if p.returncode:
+                if not silent:
+                        msg="command execution failed: %s -> %r"%(cmd,str(output))
+                        raise ValueError(msg)
+                output=''
+        return output
+Utils.cmd_output=cmd_output
 def name_to_obj(self,s,env=None):
-        Logs.warn('compat: change "name_to_obj(name, env)" by "get_tgen_by_name(name)"')
+        if Logs.verbose:
+                Logs.warn('compat: change "name_to_obj(name, env)" by "get_tgen_by_name(name)"')
         return self.get_tgen_by_name(s)
 Build.BuildContext.name_to_obj=name_to_obj
@@ -50 +78 @@
                 self.all_envs[name]=env
         else:
-                if fromenv:Logs.warn("The environment %s may have been configured already"%name)
+                if fromenv:
+                        Logs.warn("The environment %s may have been configured already"%name)
         return env
 Configure.ConfigurationContext.retrieve=retrieve
@@ -57 +86 @@
 Configure.conftest=Configure.conf
 Configure.ConfigurationError=Errors.ConfigurationError
+Utils.WafError=Errors.WafError
 Options.OptionsContext.sub_options=Options.OptionsContext.recurse
 Options.OptionsContext.tool_options=Context.Context.load
@@ -77 +107 @@
         ret=eld(*k,**kw)
         if'set_options'in ret.__dict__:
-                Logs.warn('compat: rename "set_options" to options')
+                if Logs.verbose:
+                        Logs.warn('compat: rename "set_options" to options')
                 ret.options=ret.set_options
         if'detect'in ret.__dict__:
-                Logs.warn('compat: rename "detect" to "configure"')
+                if Logs.verbose:
+                        Logs.warn('compat: rename "detect" to "configure"')
                 ret.configure=ret.detect
         return ret
 Context.load_tool=load_tool
+def get_curdir(self):
+        return self.path.abspath()
+Context.Context.curdir=property(get_curdir,Utils.nada)
 rev=Context.load_module
-def load_module(path):
-        ret=rev(path)
+def load_module(path,encoding=None):
+        ret=rev(path,encoding)
         if'set_options'in ret.__dict__:
-                Logs.warn('compat: rename "set_options" to "options" (%r)'%path)
+                if Logs.verbose:
+                        Logs.warn('compat: rename "set_options" to "options" (%r)'%path)
                 ret.options=ret.set_options
         if'srcdir'in ret.__dict__:
-                Logs.warn('compat: rename "srcdir" to "top" (%r)'%path)
+                if Logs.verbose:
+                        Logs.warn('compat: rename "srcdir" to "top" (%r)'%path)
                 ret.top=ret.srcdir
         if'blddir'in ret.__dict__:
-                Logs.warn('compat: rename "blddir" to "out" (%r)'%path)
+                if Logs.verbose:
+                        Logs.warn('compat: rename "blddir" to "out" (%r)'%path)
                 ret.out=ret.blddir
         return ret
@@ -102 +140 @@
         self.features=self.to_list(self.features)
         if'cc'in self.features:
-                Logs.warn('compat: the feature cc does not exist anymore (use "c")')
+                if Logs.verbose:
+                        Logs.warn('compat: the feature cc does not exist anymore (use "c")')
                 self.features.remove('cc')
                 self.features.append('c')
         if'cstaticlib'in self.features:
-                Logs.warn('compat: the feature cstaticlib does not exist anymore (use "cstlib" or "cxxstlib")')
+                if Logs.verbose:
+                        Logs.warn('compat: the feature cstaticlib does not exist anymore (use "cstlib" or "cxxstlib")')
                 self.features.remove('cstaticlib')
                 self.features.append(('cxx'in self.features)and'cxxstlib'or'cstlib')
         if getattr(self,'ccflags',None):
-                Logs.warn('compat: "ccflags" was renamed to "cflags"')
+                if Logs.verbose:
+                        Logs.warn('compat: "ccflags" was renamed to "cflags"')
                 self.cflags=self.ccflags
         return old_post(self)
@@ -129 +170 @@
         get=self.bld.get_tgen_by_name
         seen=set([])
+        seen_uselib=set([])
         tmp=Utils.deque(names)
         if tmp:
-                Logs.warn('compat: "uselib_local" is deprecated, replace by "use"')
+                if Logs.verbose:
+                        Logs.warn('compat: "uselib_local" is deprecated, replace by "use"')
         while tmp:
                 lib_name=tmp.popleft()
@@ -158 +201 @@
                                 env.prepend_value('LIBPATH',[tmp_path])
                 for v in self.to_list(getattr(y,'uselib',[])):
-                        if not env['STLIB_'+v]:
-                                if not v in self.uselib:
-                                        self.uselib.insert(0,v)
+                        if v not in seen_uselib:
+                                seen_uselib.add(v)
+                                if not env['STLIB_'+v]:
+                                        if not v in self.uselib:
+                                                self.uselib.insert(0,v)
                 if getattr(y,'export_includes',None):
                         self.includes.extend(y.to_incnodes(y.export_includes))
@@ -219 +264 @@
         self.export_includes=val
 TaskGen.task_gen.export_incdirs=property(None,set_incdirs)
+def install_dir(self,path):
+        if not path:
+                return[]
+        destpath=Utils.subst_vars(path,self.env)
+        if self.is_install>0:
+                Logs.info('* creating %s'%destpath)
+                Utils.check_dir(destpath)
+        elif self.is_install<0:
+                Logs.info('* removing %s'%destpath)
+                try:
+                        os.remove(destpath)
+                except OSError:
+                        pass
+Build.BuildContext.install_dir=install_dir