Changeset 640

Show
Ignore:
Timestamp:
09/15/07 12:40:49 (5 years ago)
Author:
arnonym
Message:

Make the pkgconfig.py a real scons-tool.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/admin/pkgconfig.py

    r601 r640  
    33# 
    44# Taken from http://www.scons.org/wiki/UsingPkgConfig 
     5# and heavily modified 
    56# 
    67 
    …… 
    6263        return ret 
    6364 
     65def generate( env, **kw ): 
     66        env['PKGCONFIG_TESTS' ] = { 'CheckForPKGConfig' : CheckForPKGConfig, 'CheckForPKG' : CheckForPKG, 'GetPKGFlags' : GetPKGFlags } 
     67 
     68def exists( env ): 
     69        return 1 
     70 
     71 

  • trunk/libffado/SConstruct

    r638 r640  
    22 
    33import os 
    4 import sys 
    5 sys.path.append( "./admin" ) 
    6 from pkgconfig import * 
    74from string import Template 
    85 
    …… 
    6663 
    6764 
    68 env = Environment( tools=['default','scanreplace','pyuic','dbus','doxygen'], toolpath=['admin'], ENV = buildenv, options=opts ) 
     65env = Environment( tools=['default','scanreplace','pyuic','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts ) 
    6966 
    7067 
    …… 
    107104        return ret 
    108105 
     106tests = { 'CheckForApp' : CheckForApp } 
     107tests.update( env['PKGCONFIG_TESTS'] ) 
    109108 
    110109if not env.GetOption('clean'): 
    111110        conf = Configure( env, 
    112                 custom_tests={ 'CheckForPKGConfig' : CheckForPKGConfig, 'CheckForPKG' : CheckForPKG, 'GetPKGFlags' : GetPKGFlags, 'CheckForApp' : CheckForApp }, 
    113                 conf_dir="cache/" + build_base, 
    114                 log_file="cache/" + build_base + 'config.log' ) 
     111                custom_tests = tests, 
     112                conf_dir = "cache/" + build_base, 
     113                log_file = "cache/" + build_base + 'config.log' ) 
    115114 
    116115        #