Changeset 1638
- Timestamp:
- 08/29/09 04:34:30 (14 years ago)
- Files:
-
- trunk/libffado/SConstruct (modified) (3 diffs)
- trunk/libffado/support/mixer (deleted)
- trunk/libffado/support/SConscript (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/SConstruct
r1623 r1638 294 294 build_mixer = True 295 295 296 if conf.CheckForApp( 'which pyuic' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'qt' ):297 env['PYUIC'] = True298 build_mixer = True299 300 296 if conf.CheckForApp( 'xdg-desktop-menu --help' ): 301 297 env['XDG_TOOLS'] = True … … 303 299 print """ 304 300 I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 305 this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffado-mixer". 301 this is needed to add the fancy entry to your menu. But if the mixer will be 302 installed, you can start it by executing "ffado-mixer". 306 303 """ 307 304 308 305 if not build_mixer and not env.GetOption('clean'): 309 306 print """ 310 I couldn't find all the prerequisites ('pyuic' / 'pyuic4' and the python-modules 'dbus' and 311 'qt' / 'PyQt4', the packages could be named like dbus-python and PyQt) to build the mixer. 312 Therefor neither the qt3 nor the qt4 mixer will get installed. 307 I couldn't find all the prerequisites ('pyuic4' and the python-modules 'dbus' 308 and 'PyQt4', the packages could be named like dbus-python and PyQt) to build the 309 mixer. 310 Therefor the qt4 mixer will not get installed. 313 311 """ 314 312 … … 639 637 env.Execute( "rm cache/objects -Rf" ) 640 638 639 # 640 # Temporary code to remove the installed qt3 mixer 641 # 642 import shutil 643 if os.path.exists( os.path.join( env['BINDIR'], "ffado-mixer-qt3" ) ): 644 print "Removing the old qt3-mixer from the installation..." 645 os.remove( os.path.join( env['BINDIR'], "ffado-mixer-qt3" ) ) 646 if os.path.exists( os.path.join( env['SHAREDIR'], 'python-qt3' ) ): 647 print "Removing the old qt3-mixer files from the installation..." 648 shutil.rmtree( os.path.join( env['SHAREDIR'], 'python-qt3' ) ) 649 650 651 # 652 # vim: ts=4 ws=4 et trunk/libffado/support/SConscript
r1498 r1638 26 26 env = env.Clone() 27 27 28 env.SConscript( dirs=["mixer ","mixer-qt4","firmware","dbus","tools","alsa"], exports="env" )28 env.SConscript( dirs=["mixer-qt4","firmware","dbus","tools","alsa"], exports="env" )