waf: Include waf in the souce tree and updated README on building.

Add support to build all parts of The RTEMS Tools project.

8 files changed, 133 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 7e4a24c..04fa6e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *.pyc
 *.log
 log_*
+.waf-*
+.lock-waf*
+build
diff --git a/README b/README
index be8aacd..763960a 100644
--- a/README
+++ b/README
@@ -16,9 +16,29 @@ The RTEMS Tools Project has been developed for the RTEMS Project however these
 tools can be used for a range of things not related to RTEMS. The RTEMS Project
 welcomes this.
 
-If you have a problem or question post to rtems-user@rtems.org or drop by the
-RTEMS IRC channel #rtems on chat.freenode.net. Drop by and tell us if you are
-using these tools for other uses.
+If you have a problem or question post to user@rtems.org or visit the RTEMS IRC
+channel #rtems on chat.freenode.net. Drop by and tell us if you are using these
+tools for other uses.
 
 If you have any patches please post them to the devel@rtems.org mailing list in
 git format patches with your details.
+
+Building
+--------
+
+To build and install:
+
+ $ ./waf configure --prefix=$HOME/development/rtems/4.11
+ $ ./waf build install
+
+Waf
+---
+
+The Waf project can be found here:
+
+ http://code.google.com/p/waf/
+
+Simple instructions on How to set up Waf is here:
+
+ http://www.rtems.org/ftp/pub/rtems/people/chrisj/rtl/rtems-linker/waf.html
+
diff --git a/linkers/wscript b/linkers/wscript
index 400a792..9ab4685 100644
--- a/linkers/wscript
+++ b/linkers/wscript
@@ -220,10 +220,10 @@ def bld_libelf(bld):
     # understand.
     #
     if sys.platform == 'win32':
-        m4_rule = 'type ${SRC} | m4 -D SRCDIR=../' + libelf[:-1] + '> ${TGT}"'
+        m4_rule = 'type ${SRC} | m4 -D SRCDIR=../linkers/' + libelf[:-1] + '> ${TGT}"'
         includes = ['win32']
     else:
-        m4_rule = 'm4 -D SRCDIR=../' + libelf[:-1] + ' ${SRC} > ${TGT}'
+        m4_rule = 'm4 -D SRCDIR=../linkers/' + libelf[:-1] + ' ${SRC} > ${TGT}'
         includes = []
 
     bld(target = 'libelf_convert.c', source = libelf + 'libelf_convert.m4', rule = m4_rule)
diff --git a/tester/covoar/wscript b/tester/covoar/wscript
index 88add6e..f8311d2 100644
--- a/tester/covoar/wscript
+++ b/tester/covoar/wscript
@@ -109,9 +109,3 @@ def build(bld):
                 use = 'ccovoar',
                 cflags = ['-O2', '-g'],
                 includes = ['.'])
-
-    bld.program(target = 'covoar',
-                source = ['covoar.cc'],
-                use = 'ccovoar',
-                cflags = ['-O2', '-g'],
-                includes = ['.'])
diff --git a/tester/wscript b/tester/wscript
new file mode 100644
index 0000000..1c5139c
--- /dev/null
+++ b/tester/wscript
@@ -0,0 +1,50 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+subdirs = ['covoar']
+
+def recurse(ctx):
+    for sd in subdirs:
+        ctx.recurse(sd)
+
+def options(ctx):
+    recurse(ctx)
+
+def configure(ctx):
+    recurse(ctx)
+
+def build(ctx):
+    recurse(ctx)
+
+def install(ctx):
+    recurse(ctx)
+
+def clean(ctx):
+    recurse(ctx)
diff --git a/tools/gdb/python/wscript b/tools/gdb/python/wscript
index a7f428c..5c898c1 100644
--- a/tools/gdb/python/wscript
+++ b/tools/gdb/python/wscript
@@ -2,6 +2,9 @@
 # Install the RTEMS gdb python
 #
 
+def options(opt):
+    pass
+
 def configure(conf):
     conf.load('python')
 
diff --git a/waf b/waf
new file mode 100755
index 0000000..89e1ca8
--- /dev/null
+++ b/waf
diff --git a/wscript b/wscript
new file mode 100644
index 0000000..8cefb93
--- /dev/null
+++ b/wscript
@@ -0,0 +1,52 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+subdirs = ['linkers',
+           'tester',
+           'tools/gdb/python']
+
+def recurse(ctx):
+    for sd in subdirs:
+        ctx.recurse(sd)
+
+def options(ctx):
+    recurse(ctx)
+
+def configure(ctx):
+    recurse(ctx)
+
+def build(ctx):
+    recurse(ctx)
+
+def install(ctx):
+    recurse(ctx)
+
+def clean(ctx):
+    recurse(ctx)