Changeset 591

Show
Ignore:
Timestamp:
08/29/07 08:42:51 (16 years ago)
Author:
arnonym
Message:

Adopt the pyuic-check to my new-gained knowledge:-)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/SConstruct

    r588 r591  
    8989def CheckForApp( context, app ): 
    9090        context.Message( "Checking if '%s' executes... " % app ) 
    91         ret = context.TryAction( app )[0] 
    92         context.Result( ret ) 
     91        ret = context.env.WhereIs( app ) 
     92        if ret != "": 
     93                context.Result( True ) 
     94        else: 
     95                context.Result( False ) 
    9396        return ret 
    9497 
    …… 
    124127 
    125128        # 
    126         # Checking wether "which pyuic" executes is clearly wrong. Nonetheless here 
    127         # on my system it seems to be the right thing, as checking for pyuic alone 
    128         # returns false. (Both pyuic and which are installed in the same dir.) 
    129         # - Strange :-/ 
    130         env['HAVE_PYUIC'] = conf.CheckForApp( 'which pyuic' ) 
     129        env['PYUIC'] = conf.CheckForApp( 'pyuic' ) 
    131130 
    132131        env = conf.Finish() 

  • trunk/libffado/support/mixer/SConscript

    r574 r591  
    33Import( 'env' ) 
    44 
    5 if env.has_key('HAVE_PYUIC') and env['HAVE_PYUIC']: 
    6  
    7         env = env.Copy() 
    8  
     5if env.has_key('PYUIC'): 
    96        for app in ["mixer_phase24.ui","mixer_phase88.ui"]: 
    10                 env.Command( target=app.replace(".","")+".py", source=app, action="pyuic $SOURCE > $TARGET" ) 
    11  
    12  
     7                env.Command( target=app.replace(".","")+".py", source=app, action="$PYUIC $SOURCE > $TARGET" )