Changeset 1661

Show
Ignore:
Timestamp:
09/13/09 12:36:26 (14 years ago)
Author:
arnonym
Message:

There seems to be something wrong with build_dir and multiple SConstruct files. No need to have some probably broken developer tool in the mostly stable branch...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/libffado-2.0/SConstruct

    r1565 r1661  
    3232import imp 
    3333 
    34 build_dir = ARGUMENTS.get('BUILDDIR', "") 
    35 if build_dir: 
    36         build_base=build_dir+'/' 
    37         if not os.path.isdir( build_base ): 
    38                 os.makedirs( build_base ) 
    39         print "Building into: " + build_base 
    40 else: 
    41         build_base='' 
    42  
    4334if not os.path.isdir( "cache" ): 
    4435        os.makedirs( "cache" ) 
    4536 
    46 opts = Options( "cache/"+build_base+"options.cache" ) 
    47  
    48 # 
    49 # If this is just to display a help-text for the variable used via ARGUMENTS, then its wrong... 
    50 opts.Add( "BUILDDIR", "Path to place the built files in", "") 
     37opts = Options( "cache/options.cache" ) 
    5138 
    5239opts.AddOptions( 
    …… 
    128115 
    129116# make sure the necessary dirs exist 
    130 if not os.path.isdir( "cache/" + build_base ): 
    131         os.makedirs( "cache/" + build_base ) 
     117if not os.path.isdir( "cache" ): 
     118        os.makedirs( "cache" ) 
    132119if not os.path.isdir( 'cache/objects' ): 
    133120        os.makedirs( 'cache/objects' ) 
    …… 
    135122CacheDir( 'cache/objects' ) 
    136123 
    137 opts.Save( 'cache/' + build_base + "options.cache", env ) 
     124opts.Save( 'cache/options.cache', env ) 
    138125 
    139126def ConfigGuess( context ): 
    …… 
    190177conf = Configure( env, 
    191178        custom_tests = tests, 
    192         conf_dir = "cache/" + build_base, 
    193         log_file = "cache/" + build_base + 'config.log' ) 
     179        conf_dir = "cache/", 
     180        log_file = 'cache/config.log' ) 
    194181 
    195182if env['SERIALIZE_USE_EXPAT']: 
    …… 
    330317    env['BUILD_STATIC_LIB'] = True 
    331318 
    332 if build_base: 
    333         env['build_base']="#/"+build_base 
    334 else: 
    335         env['build_base']="#/" 
     319env['build_base']="#/" 
    336320 
    337321# 
    …… 
    520504 
    521505env.Depends( "config.h", "SConstruct" ) 
    522 env.Depends( "config.h", 'cache/' + build_base + "options.cache" ) 
     506env.Depends( "config.h", 'cache/options.cache' ) 
    523507 
    524508# update config.h whenever the SVN revision changes 
    …… 
    535519        subdirs.append('tests') 
    536520 
    537 if build_base: 
    538         env.SConscript( dirs=subdirs, exports="env", build_dir=build_base+subdir ) 
    539 else: 
    540         env.SConscript( dirs=subdirs, exports="env" ) 
     521env.SConscript( dirs=subdirs, exports="env" ) 
    541522 
    542523# By default only src is built but all is cleaned