Changeset 904702d for waflib/Tools/python.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/python.py (modified) (12 diffs)

waflib/Tools/python.py

@@ -4 +4 @@
 
 import os,sys
-from waflib import Utils,Options,Errors,Logs
+from waflib import Utils,Options,Errors,Logs,Task,Node
 from waflib.TaskGen import extension,before_method,after_method,feature
 from waflib.Configure import conf
@@ -27 +27 @@
 INST='''
 import sys, py_compile
-py_compile.compile(sys.argv[1], sys.argv[2], sys.argv[3])
+py_compile.compile(sys.argv[1], sys.argv[2], sys.argv[3], True)
 '''
 DISTUTILS_IMP=['from distutils.sysconfig import get_config_var, get_python_lib']
+@before_method('process_source')
+@feature('py')
+def feature_py(self):
+        self.install_path=getattr(self,'install_path','${PYTHONDIR}')
+        install_from=getattr(self,'install_from',None)
+        if install_from and not isinstance(install_from,Node.Node):
+                install_from=self.path.find_dir(install_from)
+        self.install_from=install_from
+        ver=self.env.PYTHON_VERSION
+        if not ver:
+                self.bld.fatal('Installing python files requires PYTHON_VERSION, try conf.check_python_version')
+        if int(ver.replace('.',''))>31:
+                self.install_32=True
 @extension('.py')
 def process_py(self,node):
-        try:
-                if not self.bld.is_install:
-                        return
-        except AttributeError:
-                return
-        try:
-                if not self.install_path:
-                        return
-        except AttributeError:
-                self.install_path='${PYTHONDIR}'
-        def inst_py(ctx):
-                install_from=getattr(self,'install_from',None)
-                if install_from:
-                        install_from=self.path.find_dir(install_from)
-                install_pyfile(self,node,install_from)
-        self.bld.add_post_fun(inst_py)
-def install_pyfile(self,node,install_from=None):
-        from_node=install_from or node.parent
-        tsk=self.bld.install_as(self.install_path+'/'+node.path_from(from_node),node,postpone=False)
-        path=tsk.get_install_path()
-        if self.bld.is_install<0:
-                Logs.info("+ removing byte compiled python files")
-                for x in'co':
-                        try:
-                                os.remove(path+x)
-                        except OSError:
-                                pass
-        if self.bld.is_install>0:
-                try:
-                        st1=os.stat(path)
-                except OSError:
-                        Logs.error('The python file is missing, this should not happen')
-                for x in['c','o']:
-                        do_inst=self.env['PY'+x.upper()]
-                        try:
-                                st2=os.stat(path+x)
-                        except OSError:
-                                pass
-                        else:
-                                if st1.st_mtime<=st2.st_mtime:
-                                        do_inst=False
-                        if do_inst:
-                                lst=(x=='o')and[self.env['PYFLAGS_OPT']]or[]
-                                (a,b,c)=(path,path+x,tsk.get_install_path(destdir=False)+x)
-                                argv=self.env['PYTHON']+lst+['-c',INST,a,b,c]
-                                Logs.info('+ byte compiling %r'%(path+x))
-                                env=self.env.env or None
-                                ret=Utils.subprocess.Popen(argv,env=env).wait()
-                                if ret:
-                                        raise Errors.WafError('py%s compilation failed %r'%(x,path))
-@feature('py')
-def feature_py(self):
-        pass
+        assert(node.get_bld_sig())
+        assert(getattr(self,'install_path')),'add features="py"'
+        if self.install_path:
+                if self.install_from:
+                        self.bld.install_files(self.install_path,[node],cwd=self.install_from,relative_trick=True)
+                else:
+                        self.bld.install_files(self.install_path,[node],relative_trick=True)
+        lst=[]
+        if self.env.PYC:
+                lst.append('pyc')
+        if self.env.PYO:
+                lst.append('pyo')
+        if self.install_path:
+                if self.install_from:
+                        pyd=Utils.subst_vars("%s/%s"%(self.install_path,node.path_from(self.install_from)),self.env)
+                else:
+                        pyd=Utils.subst_vars("%s/%s"%(self.install_path,node.path_from(self.path)),self.env)
+        else:
+                pyd=node.abspath()
+        for ext in lst:
+                if self.env.PYTAG:
+                        name=node.name[:-3]
+                        pyobj=node.parent.get_bld().make_node('__pycache__').make_node("%s.%s.%s"%(name,self.env.PYTAG,ext))
+                        pyobj.parent.mkdir()
+                else:
+                        pyobj=node.change_ext(".%s"%ext)
+                tsk=self.create_task(ext,node,pyobj)
+                tsk.pyd=pyd
+                if self.install_path:
+                        self.bld.install_files(os.path.dirname(pyd),pyobj,cwd=node.parent.get_bld(),relative_trick=True)
+class pyc(Task.Task):
+        color='PINK'
+        def run(self):
+                cmd=[Utils.subst_vars('${PYTHON}',self.env),'-c',INST,self.inputs[0].abspath(),self.outputs[0].abspath(),self.pyd]
+                ret=self.generator.bld.exec_command(cmd)
+                return ret
+class pyo(Task.Task):
+        color='PINK'
+        def run(self):
+                cmd=[Utils.subst_vars('${PYTHON}',self.env),Utils.subst_vars('${PYFLAGS_OPT}',self.env),'-c',INST,self.inputs[0].abspath(),self.outputs[0].abspath(),self.pyd]
+                ret=self.generator.bld.exec_command(cmd)
+                return ret
 @feature('pyext')
 @before_method('propagate_uselib_vars','apply_link')
@@ -132 +134 @@
         self.to_log(out)
         return_values=[]
-        for s in out.split('\n'):
+        for s in out.splitlines():
                 s=s.strip()
                 if not s:
@@ -145 +147 @@
         return return_values
 @conf
-def check_python_headers(conf):
+def python_cross_compile(self,features='pyembed pyext'):
+        features=Utils.to_list(features)
+        if not('PYTHON_LDFLAGS'in self.environ or'PYTHON_PYEXT_LDFLAGS'in self.environ or'PYTHON_PYEMBED_LDFLAGS'in self.environ):
+                return False
+        for x in'PYTHON_VERSION PYTAG pyext_PATTERN'.split():
+                if not x in self.environ:
+                        self.fatal('Please set %s in the os environment'%x)
+                else:
+                        self.env[x]=self.environ[x]
+        xx=self.env.CXX_NAME and'cxx'or'c'
+        if'pyext'in features:
+                flags=self.environ.get('PYTHON_PYEXT_LDFLAGS',self.environ.get('PYTHON_LDFLAGS',None))
+                if flags is None:
+                        self.fatal('No flags provided through PYTHON_PYEXT_LDFLAGS as required')
+                else:
+                        self.parse_flags(flags,'PYEXT')
+                self.check(header_name='Python.h',define_name='HAVE_PYEXT',msg='Testing pyext configuration',features='%s %sshlib pyext'%(xx,xx),fragment=FRAG,errmsg='Could not build python extensions')
+        if'pyembed'in features:
+                flags=self.environ.get('PYTHON_PYEMBED_LDFLAGS',self.environ.get('PYTHON_LDFLAGS',None))
+                if flags is None:
+                        self.fatal('No flags provided through PYTHON_PYEMBED_LDFLAGS as required')
+                else:
+                        self.parse_flags(flags,'PYEMBED')
+                self.check(header_name='Python.h',define_name='HAVE_PYEMBED',msg='Testing pyembed configuration',fragment=FRAG,errmsg='Could not build a python embedded interpreter',features='%s %sprogram pyembed'%(xx,xx))
+        return True
+@conf
+def check_python_headers(conf,features='pyembed pyext'):
+        features=Utils.to_list(features)
+        assert('pyembed'in features)or('pyext'in features),"check_python_headers features must include 'pyembed' and/or 'pyext'"
         env=conf.env
         if not env['CC_NAME']and not env['CXX_NAME']:
                 conf.fatal('load a compiler first (gcc, g++, ..)')
+        if conf.python_cross_compile(features):
+                return
         if not env['PYTHON_VERSION']:
                 conf.check_python_version()
-        pybin=conf.env.PYTHON
+        pybin=env.PYTHON
         if not pybin:
                 conf.fatal('Could not find the python executable')
-        v='prefix SO LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS'.split()
+        v='prefix SO LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS LDVERSION'.split()
         try:
                 lst=conf.get_python_variables(["get_config_var('%s') or ''"%x for x in v])
@@ -160 +192 @@
                 conf.fatal("Python development headers not found (-v for details).")
         vals=['%s = %r'%(x,y)for(x,y)in zip(v,lst)]
-        conf.to_log("Configuration returned from %r:\n%r\n"%(pybin,'\n'.join(vals)))
+        conf.to_log("Configuration returned from %r:\n%s\n"%(pybin,'\n'.join(vals)))
         dct=dict(zip(v,lst))
         x='MACOSX_DEPLOYMENT_TARGET'
         if dct[x]:
-                conf.env[x]=conf.environ[x]=dct[x]
+                env[x]=conf.environ[x]=dct[x]
         env['pyext_PATTERN']='%s'+dct['SO']
+        num='.'.join(env['PYTHON_VERSION'].split('.')[:2])
+        conf.find_program([''.join(pybin)+'-config','python%s-config'%num,'python-config-%s'%num,'python%sm-config'%num],var='PYTHON_CONFIG',msg="python-config",mandatory=False)
+        if env.PYTHON_CONFIG:
+                all_flags=[['--cflags','--libs','--ldflags']]
+                if sys.hexversion<0x2070000:
+                        all_flags=[[k]for k in all_flags[0]]
+                xx=env.CXX_NAME and'cxx'or'c'
+                if'pyembed'in features:
+                        for flags in all_flags:
+                                conf.check_cfg(msg='Asking python-config for pyembed %r flags'%' '.join(flags),path=env.PYTHON_CONFIG,package='',uselib_store='PYEMBED',args=flags)
+                        conf.check(header_name='Python.h',define_name='HAVE_PYEMBED',msg='Getting pyembed flags from python-config',fragment=FRAG,errmsg='Could not build a python embedded interpreter',features='%s %sprogram pyembed'%(xx,xx))
+                if'pyext'in features:
+                        for flags in all_flags:
+                                conf.check_cfg(msg='Asking python-config for pyext %r flags'%' '.join(flags),path=env.PYTHON_CONFIG,package='',uselib_store='PYEXT',args=flags)
+                        conf.check(header_name='Python.h',define_name='HAVE_PYEXT',msg='Getting pyext flags from python-config',features='%s %sshlib pyext'%(xx,xx),fragment=FRAG,errmsg='Could not build python extensions')
+                conf.define('HAVE_PYTHON_H',1)
+                return
         all_flags=dct['LDFLAGS']+' '+dct['CFLAGS']
         conf.parse_flags(all_flags,'PYEMBED')
@@ -171 +220 @@
         conf.parse_flags(all_flags,'PYEXT')
         result=None
-        for name in('python'+env['PYTHON_VERSION'],'python'+env['PYTHON_VERSION']+'m','python'+env['PYTHON_VERSION'].replace('.','')):
+        if not dct["LDVERSION"]:
+                dct["LDVERSION"]=env['PYTHON_VERSION']
+        for name in('python'+dct['LDVERSION'],'python'+env['PYTHON_VERSION']+'m','python'+env['PYTHON_VERSION'].replace('.','')):
                 if not result and env['LIBPATH_PYEMBED']:
                         path=env['LIBPATH_PYEMBED']
@@ -195 +246 @@
         else:
                 conf.to_log("\n\n### LIB NOT FOUND\n")
-        if(Utils.is_win32 or sys.platform.startswith('os2')or dct['Py_ENABLE_SHARED']):
+        if Utils.is_win32 or dct['Py_ENABLE_SHARED']:
                 env['LIBPATH_PYEXT']=env['LIBPATH_PYEMBED']
                 env['LIB_PYEXT']=env['LIB_PYEMBED']
-        num='.'.join(env['PYTHON_VERSION'].split('.')[:2])
-        conf.find_program([''.join(pybin)+'-config','python%s-config'%num,'python-config-%s'%num,'python%sm-config'%num],var='PYTHON_CONFIG',mandatory=False)
-        includes=[]
-        if conf.env.PYTHON_CONFIG:
-                for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-                        if(incstr.startswith('-I')or incstr.startswith('/I')):
-                                incstr=incstr[2:]
-                        if incstr not in includes:
-                                includes.append(incstr)
-                conf.to_log("Include path for Python extensions (found via python-config --includes): %r\n"%(includes,))
-                env['INCLUDES_PYEXT']=includes
-                env['INCLUDES_PYEMBED']=includes
-        else:
-                conf.to_log("Include path for Python extensions ""(found via distutils module): %r\n"%(dct['INCLUDEPY'],))
-                env['INCLUDES_PYEXT']=[dct['INCLUDEPY']]
-                env['INCLUDES_PYEMBED']=[dct['INCLUDEPY']]
+        conf.to_log("Include path for Python extensions (found via distutils module): %r\n"%(dct['INCLUDEPY'],))
+        env['INCLUDES_PYEXT']=[dct['INCLUDEPY']]
+        env['INCLUDES_PYEMBED']=[dct['INCLUDEPY']]
         if env['CC_NAME']=='gcc':
                 env.append_value('CFLAGS_PYEMBED',['-fno-strict-aliasing'])
@@ -227 +265 @@
                 env.append_value('CXXFLAGS_PYEXT',dist_compiler.compile_options)
                 env.append_value('LINKFLAGS_PYEXT',dist_compiler.ldflags_shared)
-        try:
-                conf.check(header_name='Python.h',define_name='HAVE_PYTHON_H',uselib='PYEMBED',fragment=FRAG,errmsg=':-(')
-        except conf.errors.ConfigurationError:
-                xx=conf.env.CXX_NAME and'cxx'or'c'
-                flags=['--cflags','--libs','--ldflags']
-                for f in flags:
-                        conf.check_cfg(msg='Asking python-config for pyembed %s flags'%f,path=conf.env.PYTHON_CONFIG,package='',uselib_store='PYEMBED',args=[f])
-                conf.check(header_name='Python.h',define_name='HAVE_PYTHON_H',msg='Getting pyembed flags from python-config',fragment=FRAG,errmsg='Could not build a python embedded interpreter',features='%s %sprogram pyembed'%(xx,xx))
-                for f in flags:
-                        conf.check_cfg(msg='Asking python-config for pyext %s flags'%f,path=conf.env.PYTHON_CONFIG,package='',uselib_store='PYEXT',args=[f])
-                conf.check(header_name='Python.h',define_name='HAVE_PYTHON_H',msg='Getting pyext flags from python-config',features='%s %sshlib pyext'%(xx,xx),fragment=FRAG,errmsg='Could not build python extensions')
+        conf.check(header_name='Python.h',define_name='HAVE_PYTHON_H',uselib='PYEMBED',fragment=FRAG,errmsg='Distutils not installed? Broken python installation? Get python-config now!')
 @conf
 def check_python_version(conf,minver=None):
@@ -253 +281 @@
                 pyver='.'.join([str(x)for x in pyver_tuple[:2]])
                 conf.env['PYTHON_VERSION']=pyver
-                if'PYTHONDIR'in conf.environ:
+                if'PYTHONDIR'in conf.env:
+                        pydir=conf.env['PYTHONDIR']
+                elif'PYTHONDIR'in conf.environ:
                         pydir=conf.environ['PYTHONDIR']
                 else:
                         if Utils.is_win32:
-                                (python_LIBDEST,pydir)=conf.get_python_variables(["get_config_var('LIBDEST') or ''","get_python_lib(standard_lib=0, prefix=%r) or ''"%conf.env['PREFIX']])
+                                (python_LIBDEST,pydir)=conf.get_python_variables(["get_config_var('LIBDEST') or ''","get_python_lib(standard_lib=0) or ''"])
                         else:
                                 python_LIBDEST=None
-                                (pydir,)=conf.get_python_variables(["get_python_lib(standard_lib=0, prefix=%r) or ''"%conf.env['PREFIX']])
+                                (pydir,)=conf.get_python_variables(["get_python_lib(standard_lib=0) or ''"])
                         if python_LIBDEST is None:
                                 if conf.env['LIBDIR']:
@@ -266 +296 @@
                                 else:
                                         python_LIBDEST=os.path.join(conf.env['PREFIX'],"lib","python"+pyver)
-                if'PYTHONARCHDIR'in conf.environ:
+                if'PYTHONARCHDIR'in conf.env:
+                        pyarchdir=conf.env['PYTHONARCHDIR']
+                elif'PYTHONARCHDIR'in conf.environ:
                         pyarchdir=conf.environ['PYTHONARCHDIR']
                 else:
-                        (pyarchdir,)=conf.get_python_variables(["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''"%conf.env['PREFIX']])
+                        (pyarchdir,)=conf.get_python_variables(["get_python_lib(plat_specific=1, standard_lib=0) or ''"])
                         if not pyarchdir:
                                 pyarchdir=pydir
@@ -289 +321 @@
 version = getattr(current_module, '__version__', None)
 if version is not None:
-    print(str(version))
+        print(str(version))
 else:
-    print('unknown version')
+        print('unknown version')
 '''
 @conf
 def check_python_module(conf,module_name,condition=''):
-        msg='Python module %s'%module_name
+        msg="Checking for python module '%s'"%module_name
         if condition:
                 msg='%s (%s)'%(msg,condition)
@@ -325 +357 @@
                         conf.end_msg(ret)
 def configure(conf):
-        try:
-                conf.find_program('python',var='PYTHON')
-        except conf.errors.ConfigurationError:
-                Logs.warn("could not find a python executable, setting to sys.executable '%s'"%sys.executable)
-                conf.env.PYTHON=sys.executable
-        if conf.env.PYTHON!=sys.executable:
-                Logs.warn("python executable %r differs from system %r"%(conf.env.PYTHON,sys.executable))
-        conf.env.PYTHON=conf.cmd_to_list(conf.env.PYTHON)
         v=conf.env
-        v['PYCMD']='"import sys, py_compile;py_compile.compile(sys.argv[1], sys.argv[2])"'
+        v['PYTHON']=Options.options.python or os.environ.get('PYTHON',sys.executable)
+        if Options.options.pythondir:
+                v['PYTHONDIR']=Options.options.pythondir
+        if Options.options.pythonarchdir:
+                v['PYTHONARCHDIR']=Options.options.pythonarchdir
+        conf.find_program('python',var='PYTHON')
         v['PYFLAGS']=''
         v['PYFLAGS_OPT']='-O'
         v['PYC']=getattr(Options.options,'pyc',1)
         v['PYO']=getattr(Options.options,'pyo',1)
+        try:
+                v.PYTAG=conf.cmd_and_log(conf.env.PYTHON+['-c',"import imp;print(imp.get_tag())"]).strip()
+        except Errors.WafError:
+                pass
 def options(opt):
-        opt.add_option('--nopyc',action='store_false',default=1,help='Do not install bytecode compiled .pyc files (configuration) [Default:install]',dest='pyc')
-        opt.add_option('--nopyo',action='store_false',default=1,help='Do not install optimised compiled .pyo files (configuration) [Default:install]',dest='pyo')
+        pyopt=opt.add_option_group("Python Options")
+        pyopt.add_option('--nopyc',dest='pyc',action='store_false',default=1,help='Do not install bytecode compiled .pyc files (configuration) [Default:install]')
+        pyopt.add_option('--nopyo',dest='pyo',action='store_false',default=1,help='Do not install optimised compiled .pyo files (configuration) [Default:install]')
+        pyopt.add_option('--python',dest="python",help='python binary to be used [Default: %s]'%sys.executable)
+        pyopt.add_option('--pythondir',dest='pythondir',help='Installation path for python modules (py, platform-independent .py and .pyc files)')
+        pyopt.add_option('--pythonarchdir',dest='pythonarchdir',help='Installation path for python extension (pyext, platform-dependent .so or .dylib files)')