Change the way tasks and task libraries are processed.

This commit is contained in:
Russel Winder
2009-08-05 06:32:58 +01:00
parent e7820903d9
commit 376fb32d48

View File

@@ -168,8 +168,10 @@ else :
LIBS = 'gcc' ,
CPPPATH = [ '#' + buildDirectory , '#' + buildDirectory + '/l4' , '#' + includeDirectory , '#' + includeDirectory + '/l4' ] )
taskLibraryNames = [ f.name for f in Glob ( 'tasks/lib*' ) ]
taskLibraries = [ ]
for library in [ 'libmem' , 'libl4' , 'libposix' ] :
for library in taskLibraryNames :
taskLibraries.append ( SConscript ( 'tasks/' + library + '/SConscript' , variant_dir = buildDirectory + '/tasks/' + library , duplicate = 0 , exports = { 'environment' : tasksSupportLibraryEnvironment } ) )
Depends ( taskLibraries , tasksSupportLibraryEnvironment['configFiles'] )
@@ -186,7 +188,7 @@ else :
CPPPATH = [ '#' + buildDirectory , '#' + buildDirectory + '/l4' , '#' + includeDirectory , '#' + includeDirectory + '/l4' ] )
tasks = [ ]
for task in [ 'mm0' ] : # [ 'mm0' , 'fs0' , 'test0' ] :
for task in [ f.name for f in Glob ( 'tasks/*' ) if f.name not in taskLibraryNames + [ 'bootdesc' ] ] :
tasks.append ( SConscript ( 'tasks/' + task + '/SConscript' , variant_dir = buildDirectory + '/tasks/' + task , duplicate = 0 , exports = { 'environment' : tasksEnvironment } ) )
Depends ( tasks , tasksEnvironment['configFiles'] )