Make a start on building the tasks.

This commit is contained in:
Russel Winder
2009-08-01 18:14:34 +01:00
parent 9b2ff087d0
commit 27c0c50728
2 changed files with 8 additions and 5 deletions

View File

@@ -149,12 +149,12 @@ else :
LINKFLAGS = [ '-nostdlib' ] ,
ENV = { 'PATH' : os.environ['PATH'] } ,
LIBS = 'gcc' ,
CPPPATH = [ '#' + includeDirectory , '#' + buildDirectory + '/l4' , includeDirectory , '#' + includeDirectory + '/l4' ] )
CPPPATH = [ '#' + includeDirectory , '#' + buildDirectory + '/l4' , includeDirectory ] )
tasks = [ ]
for task in [ item for item in os.listdir ( 'tasks' ) if os.path.isdir ( 'tasks/' + item ) ] :
tasks.append ( SConscript ( 'tasks/' + item + '/SConscript' , variant_dir = buildDirectory + '/tasks/' + task , duplicate = 0 , exports = { 'environment' : tasksEnvironment } ) )
for task in [ item for item in os.listdir ( 'tasks' ) if os.path.isdir ( 'tasks/' + item ) and os.path.exists ( 'tasks/' + item + '/SConscript' )] :
tasks.append ( SConscript ( 'tasks/' + task + '/SConscript' , variant_dir = buildDirectory + '/tasks/' + task , duplicate = 0 , exports = { 'environment' : tasksEnvironment } ) )
Default ( crts.values ( ) + libs.values ( ) + [ libelf , startAxf ] ) # + tasks )
Default ( crts.values ( ) + libs.values ( ) + [ libelf , startAxf ] + tasks )
Clean ( '.' , [ buildDirectory ] )

View File

@@ -19,6 +19,9 @@
Import ( 'environment' )
library = environment.StaticLibrary ( 'l4' , Glob ( 'src/*.c' ) + Glob ( 'src/' + environment['ARCH'] + '/*.S' ) )
e = environment.Clone ( )
e.Append ( CPPPATH = [ '#' + 'tasks/libposix/include' , 'include/libl4/arch' ] )
library = e.StaticLibrary ( 'l4' , Glob ( 'src/*.c' ) + Glob ( 'src/' + environment['ARCH'] + '/*.[cS]' ) )
Return ( 'library' )