Changeset 2775

Show
Ignore:
Timestamp:
06/26/18 06:38:39 (9 months ago)
Author:
jwoithe
Message:

mixer-qt4: fix for building with scons under python 3.

This is a quick fix to use os.walk instead of os.path.walk, since the latter
is gone in Python 3. Python 2 has both, so it should work fine.

Note that this is about running SCons itself on Python 3, not running
ffado-mixer et al on Python 3.

There is another problem building with SCons on Py3, which seems to be a
SCons bug. The workaround is to disable CacheDir? in SConstruct. This has
been reported that one upstream to SCons.

Thanks to Hector Martin for the report and the patch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/support/mixer-qt4/SConscript

    r2588 r2775  
    3030    e = env.Clone() 
    3131 
    32     def findfiles( arg, dirname, names ): 
    33         for name in names: 
    34             if name.startswith("."): 
    35                 names.remove(name) 
    36         for name in names: 
    37             if '.pyc' not in name and '.in' not in name: 
    38                 arg.append( os.path.join( dirname, name ) ) 
    39  
    4032    pythonfiles = [ 'ffado/config.py' ] 
    41     os.path.walk( "ffado", findfiles, pythonfiles ) 
     33    for root, dirs, files in os.walk( "ffado" ): 
     34        for name in files: 
     35            if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."): 
     36                continue 
     37            pythonfiles.append( os.path.join( root, name ) ) 
    4238 
    4339    e.ScanReplace( "ffado/config.py.in" )