Changeset 1298

Show
Ignore:
Timestamp:
07/13/08 15:37:08 (13 years ago)
Author:
ppalmers
Message:

add Qt4 port of the mixer (only for audiofire and saffire ATM). needed since PyQt?3 doesn't support DBUS signals.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/SConstruct

    r1252 r1298  
    9898                buildenv[var]='' 
    9999 
    100 env = Environment( tools=['default','scanreplace','pyuic','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts ) 
     100env = Environment( tools=['default','scanreplace','pyuic','pyuic4','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts ) 
    101101 
    102102if os.environ.has_key('CC'): 
     
    181181tests.update( env['PKGCONFIG_TESTS'] ) 
    182182tests.update( env['PYUIC_TESTS'] ) 
     183tests.update( env['PYUIC4_TESTS'] ) 
    183184 
    184185conf = Configure( env, 
     
    279280 
    280281        # PyQT checks 
     282        build_mixer = False 
    281283        if conf.CheckForApp( "which pyuic" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'qt' ): 
    282284                env['PYUIC'] = True 
     285                build_mixer = True 
     286         
     287                if conf.CheckForApp( "xdg-desktop-menu --help" ): 
     288                        env['XDG_TOOLS'] = True 
     289                else: 
     290                        print """ 
     291        I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 
     292        this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffadomixer". 
     293        """ 
     294        elif conf.CheckForApp( "which pyuic4" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ): 
     295                env['PYUIC4'] = True 
     296                build_mixer = True 
    283297         
    284298                if conf.CheckForApp( "xdg-desktop-menu --help" ): 
     
    290304        """ 
    291305         
    292         else
     306        if not build_mixer
    293307                print """ 
    294         I couldn't find all the prerequisites ('pyuic' and the python-modules 'dbus' and 
     308        I couldn't find all the prerequisites ('pyuic' / 'pyuic4' and the python-modules 'dbus' and 
    295309        'qt', the packages could be named like dbus-python and PyQt) to build the mixer. 
    296310        Therefor the mixer won't get installed. 
     
    491505env['CACHEDIR'] = "~/.ffado" 
    492506 
     507env['USER_CONFIG_FILE'] = env['CONFIGDIR'] + "/configuration" 
     508env['SYSTEM_CONFIG_FILE'] = env['SHAREDIR'] + "/configuration" 
     509 
    493510env['REGISTRATION_URL'] = "http://ffado.org/deviceregistration/register.php?action=register" 
    494511 
     
    513530pkgconfig = env.ScanReplace( "libffado.pc.in" ) 
    514531env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) 
     532 
     533env.Install( env['SYSTEM_CONFIG_FILE'], 'configuration' ) 
    515534 
    516535subdirs=['external','src','libffado','tests','support','doc'] 
     
    570589env.Command( "TAGS", "", findcommand + " |xargs etags" ) 
    571590env.AlwaysBuild( "tags", "TAGS" ) 
    572 env.NoCache( "tags", "TAGS" ) 
    573  
     591if 'NoCache' in dir(env): 
     592    env.NoCache( "tags", "TAGS" ) 
     593