Changeset 1402

Show
Ignore:
Timestamp:
11/01/08 08:48:30 (12 years ago)
Author:
arnonym
Message:

Install both the qt3 and the qt4 mixer when the needed tools are available...

Files:

Legend:

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

    r1399 r1402  
    275275 
    276276        # PyQT checks 
    277         build_mixer = False 
     277       build_mixer = False 
    278278        if conf.CheckForApp( "which pyuic4" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ): 
    279279                env['PYUIC4'] = True 
    280280                build_mixer = True 
    281281         
    282                 if conf.CheckForApp( "xdg-desktop-menu --help" ): 
    283                         env['XDG_TOOLS'] = True 
    284                 else: 
    285                         print """ 
    286         I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 
    287         this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffadomixer". 
    288         """ 
    289         elif conf.CheckForApp( "which pyuic" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'qt' ): 
     282        if conf.CheckForApp( "which pyuic" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'qt' ): 
    290283                env['PYUIC'] = True 
    291284                build_mixer = True 
    292285         
    293                if conf.CheckForApp( "xdg-desktop-menu --help" ): 
    294                        env['XDG_TOOLS'] = True 
    295                else: 
    296                        print """ 
    297        I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 
    298        this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffadomixer". 
    299        """ 
     286        if conf.CheckForApp( "xdg-desktop-menu --help" ): 
     287                env['XDG_TOOLS'] = True 
     288        else: 
     289                print """ 
     290I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 
     291this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffado-mixer". 
     292""" 
    300293         
    301294        if not build_mixer: 
    302295                print """ 
    303296        I couldn't find all the prerequisites ('pyuic' / 'pyuic4' and the python-modules 'dbus' and 
    304         'qt', the packages could be named like dbus-python and PyQt) to build the mixer. 
    305         Therefor the mixer won't get installed. 
     297        'qt' / 'PyQt4', the packages could be named like dbus-python and PyQt) to build the mixer. 
     298        Therefor neither the qt3 nor the qt4 mixer will get installed. 
    306299        """ 
    307300 
     
    576569                        env.Execute( action ) 
    577570 
    578         if env.has_key( 'XDG_TOOLS' ) and env.has_key( 'PYUIC' ): 
     571        if env.has_key( 'XDG_TOOLS' ) and env.has_key( 'PYUIC4' ): 
    579572                if not env.GetOption("clean"): 
    580573                        action = "install" 
  • branches/libffado-2.0/support/mixer/ffado-mixer3.in

    • Property svn:mergeinfo set
  • branches/libffado-2.0/support/mixer/SConscript

    r1394 r1402  
    5353    # 
    5454    # For the ffadomixer.in 
    55     e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python' ) ).safe_substitute( e ) 
     55    e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python-qt3' ) ).safe_substitute( e ) 
    5656    # For the installation of the stuff 
    57     e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) 
     57    e['pythondir'] = Template( os.path.join( e['sharedir'], 'python-qt3' ) ).safe_substitute( e ) 
    5858 
    5959    for m in e['MIXERGUIS']: 
     
    7979    e.Install( "$pythondir", "ffadomixer_config.py" ) 
    8080 
    81     e.ScanReplace( "ffado-mixer.in" ) 
    82     e.Depends( "ffado-mixer", "#/config.h" ) 
    83     e.Depends( "ffado-mixer", "SConscript" ) 
    84     e.Install( "$bindir", "ffado-mixer" ) 
     81    e.ScanReplace( "ffado-mixer3.in" ) 
     82    e.Depends( "ffado-mixer3", "#/config.h" ) 
     83    e.Depends( "ffado-mixer3", "SConscript" ) 
     84    e.Install( "$bindir", "ffado-mixer3" ) 
    8585