Merge branch 'newBuild' of /opt/c0-trees/codezero-russel into devel

Conflicts:

	SConstruct
	src/api/SConscript
	src/arch/arm/SConscript
	src/generic/SConscript
	tasks/bootdesc/SConstruct

tasks/fs0/SConscript

@@ -0,0 +1,24 @@
+# -*- mode: python; coding: utf-8; -*-
+
+#  Codezero -- a microkernel for embedded systems.
+#
+#  Copyright © 2009  B Labs Ltd
+#
+#  This program is free software: you can redistribute it and/or modify it under the terms of the GNU
+#  General Public License as published by the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+#  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+#  License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with this program.  If not, see
+#  <http://www.gnu.org/licenses/>.
+#
+#  Author: Russel Winder
+
+Import('environment', 'previousImage')
+
+program = environment['buildTask']('fs0', Glob('*.c') + [Glob(directory + '/*.c') for directory in [ 'src', 'src/lib', 'src/lib/elf', 'src/memfs']], environment, previousImage)
+
+Return('program')

tasks/fs0/SConstruct

@@ -1,75 +0,0 @@
-#
-# User space application build script
-#
-# Copyright (C) 2007 Bahadir Balban
-#
-import os
-import sys
-import shutil
-from os.path import join
-from glob import glob
-
-task_name = "fs0"
-
-# The root directory of the repository where this file resides:
-project_root = "../.."
-tools_root = join(project_root, "tools")
-prev_image = join(project_root, "tasks/mm0/mm0.axf")
-libs_path = join(project_root, "libs")
-ld_script = "include/linker.lds"
-physical_base_ld_script = "include/physical_base.lds"
-
-# libc paths:
-libc_variant = "userspace"
-libc_libpath = join(libs_path, "c/build/%s" % libc_variant)
-libc_incpath = join(libc_libpath, "include")
-libc_crt0 = join(libs_path, "c/build/crt/sys-userspace/arch-arm/crt0.o")
-libc_name = "c-%s" % libc_variant
-
-#libmem paths:
-libmem_path = "../libmem"
-libmem_incpath = "../libmem"
-
-# libl4 paths:
-libl4_path = "../libl4"
-libl4_incpath1 = join(libl4_path, "include")
-
-# libposix paths:
-libposix_path = "../libposix"
-libposix_incpath = join(libposix_path, "include")
-
-# kernel paths:
-kernel_incpath = join(project_root, "include")
-
-# If crt0 is in its library path, it becomes hard to link with it.
-# For instance the linker script must use an absolute path for it.
-def copy_crt0(source, target, env):
-	os.system("cp " + str(source[0]) + " " + str(target[0]))
-
-def get_physical_base(source, target, env):
-	os.system(join(tools_root, "pyelf/readelf.py --first-free-page " + \
-		  prev_image + " >> " + physical_base_ld_script))
-
-# The kernel build environment:
-env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
-		  # We don't use -nostdinc because sometimes we need standard headers,
-		  # such as stdarg.h e.g. for variable args, as in printk().
-		  CCFLAGS = ['-g', '-nostdlib', '-ffreestanding', '-std=gnu99', '-Wall', '-Werror'],
-		  LINKFLAGS = ['-nostdlib', '-T' + ld_script, "-L" + libc_libpath, "-L" + libl4_path,\
-			       "-L" + libmem_path, "-L" + libposix_path],
-		  ASFLAGS = ['-D__ASSEMBLY__'],
-		  PROGSUFFIX = '.axf',			# The suffix to use for final executable
-		  ENV = {'PATH' : os.environ['PATH']},	# Inherit shell path
-		  LIBS = [libc_name, 'gcc', 'libmc', 'libl4', 'gcc', libc_name, "posix"],
-		  CPPFLAGS = "-D__USERSPACE__",
-		  CPPPATH = ['#include', libl4_incpath1, kernel_incpath, libc_incpath, \
-		  		libposix_incpath, libmem_incpath])
-
-src = [glob("src/*.c"), glob("*.c"), glob("src/arch/arm/*.c"), glob("src/memfs/*.c"), glob("src/lib/*.c")]
-objs = env.Object(src)
-physical_base = env.Command(physical_base_ld_script, prev_image, get_physical_base)
-crt0_copied = env.Command("crt0.o", libc_crt0, copy_crt0)
-
-task = env.Program(task_name, objs + [crt0_copied])
-env.Alias(task_name, task)
-env.Depends(task, physical_base)