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/libl4/SConscript

@@ -0,0 +1,33 @@
+# -*- 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')
+
+e = environment.Clone()
+e.Append(CPPPATH = ['include'])
+
+#  TODO:  There are errors in this code that -Werror gives problems with.
+
+e['CCFLAGS'] = ['-g', '-nostdlib', '-Wall', '-ffreestanding', '-std=gnu99']
+
+objects = e.StaticObject(Glob('src/*.c') + Glob('src/' + e['ARCH'] + '/*.[cS]'))
+Depends(objects, e['configFiles'])
+library = e.StaticLibrary('l4', objects)
+
+Return('library')

tasks/libl4/SConstruct

@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2007 Bahadir Balban
-#
-
-import os
-import glob
-import sys
-from os.path import join
-from string import split
-
-# libposix paths:
-libposix_libpath = "../libposix"
-libposix_incpath = "../libposix/include/posix"
-
-project_root = "../.."
-kernel_headers = join(project_root, "include")
-config_h = join(project_root, "include/l4/config.h")
-
-env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
-		  CCFLAGS = ['-g', '-nostdlib', '-ffreestanding'],
-		  LINKFLAGS = ['-nostdlib'],
-		  ASFLAGS = ['-D__ASSEMBLY__'],
-		  ENV = {'PATH' : os.environ['PATH']},
-		  LIBS = 'gcc',
-		  CPPPATH = ['#include', libposix_incpath])
-
-
-def extract_arch_subarch_plat(config_header):
-	'''
-	From the autogenerated kernel config.h, extracts platform, archictecture,
-	subarchitecture information. This is used to include the relevant headers
-	from the kernel directories.
-	'''
-	arch = None
-	subarch = None
-	plat = None
-
-	if not os.path.exists(config_header):
-		print "\n\nconfig.h does not exist. "\
-		      "Please run: `scons configure' first\n\n"
-		sys.exit()
-	f = open(config_h, "r")
-	while True:
-		line = f.readline()
-		if line == "":
-			break
-		parts = split(line)
-		if len(parts) > 0:
-			if parts[0] == "#define":
-				if parts[1] == "__ARCH__":
-					arch = parts[2]
-			   	elif parts[1] == "__PLATFORM__":
-					plat = parts[2]
-			   	elif parts[1] == "__SUBARCH__":
-					subarch = parts[2]
-	f.close()
-	if arch == None:
-		print "Error: No config symbol found for architecture"
-		sys.exit()
-	if subarch == None:
-		print "Error: No config symbol found for subarchitecture"
-		sys.exit()
-	if plat == None:
-		print "Error: No config symbol found for platform"
-		sys.exit()
-	return arch, subarch, plat
-
-def create_symlinks(arch):
-	if not os.path.exists("include/l4lib/arch"):
-		os.system("ln -s %s %s" % ("arch-" + arch, "include/l4lib/arch"))
-
-arch, subarch, plat = extract_arch_subarch_plat(config_h)
-
-create_symlinks(arch) # Creates symlinks to architecture specific directories.
-
-headers = ["#include", "#include/libl4/arch", kernel_headers]
-
-env.Append(CPPPATH = headers)
-
-src = glob.glob("src/*.c") + glob.glob("src/%s/*.[cS]" % arch)
-
-libl4 = env.StaticLibrary('l4', src)
-
-