Changeset 1638

Show
Ignore:
Timestamp:
08/29/09 04:34:30 (12 years ago)
Author:
arnonym
Message:

Remove the old qt3 mixer. Only ports from 2.0 branch where happening here. And the new work in trunk is in the qt4 mixer. And Qt3 is unsupported since quite some time already. ppalmers okayed it...

I added a temporary code-segment to sconscript to remove the qt3 mixer stuff from the installation on the devs machines. Hopefully I remember to remove that code in two or three weeks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/SConstruct

    r1623 r1638  
    294294        build_mixer = True 
    295295 
    296 if conf.CheckForApp( 'which pyuic' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'qt' ): 
    297         env['PYUIC'] = True 
    298         build_mixer = True 
    299  
    300296if conf.CheckForApp( 'xdg-desktop-menu --help' ): 
    301297        env['XDG_TOOLS'] = True 
     
    303299        print """ 
    304300I 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". 
     301this is needed to add the fancy entry to your menu. But if the mixer will be 
     302installed, you can start it by executing "ffado-mixer". 
    306303""" 
    307304 
    308305if not build_mixer and not env.GetOption('clean'): 
    309306        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. 
     307I couldn't find all the prerequisites ('pyuic4' and the python-modules 'dbus' 
     308and 'PyQt4', the packages could be named like dbus-python and PyQt) to build the 
     309mixer. 
     310Therefor the qt4 mixer will not get installed. 
    313311""" 
    314312 
     
    639637        env.Execute( "rm cache/objects -Rf" ) 
    640638 
     639# 
     640# Temporary code to remove the installed qt3 mixer 
     641# 
     642import shutil 
     643if 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" ) ) 
     646if 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  
    2626env = env.Clone() 
    2727 
    28 env.SConscript( dirs=["mixer","mixer-qt4","firmware","dbus","tools","alsa"], exports="env" ) 
     28env.SConscript( dirs=["mixer-qt4","firmware","dbus","tools","alsa"], exports="env" )