From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Fri, 4 Sep 2009 11:13:52 +0000 (+0000)
Subject: Toplevel directory cleanup
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=84bd150c667e693c7ba6c31819b3f155f53e514a;p=senf.git

Toplevel directory cleanup

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1382 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/SConstruct b/SConstruct
index 288a1ae..5e14e7d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -172,7 +172,7 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """
             echo;
             echo "Running $$test";
             echo;
-            valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup 
+            valgrind --tool=memcheck --error-exitcode=99 --suppressions=tools/valgrind.sup 
                 $$test $BOOSTTESTARGS;
             [ $$? -ne 99 ] || exit 1;
         done
diff --git a/admin/build.sh b/admin/build.sh
deleted file mode 100755
index d976a2c..0000000
--- a/admin/build.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash -e
-
-PATH=${HOME}/bin:${PATH}
-LOGDIR=${HOME}/log
-
-cd /home/senf/src
-
-rm -f ${LOGDIR}/build.log ${LOGDIR}/upload.log
-touch ${LOGDIR}/build.log ${LOGDIR}/upload.log
-
-trap 'exec >/dev/null 2>&1; cat ${LOGDIR}/build.log ${LOGDIR}/upload.log 1>&3; exit 1' ERR
-
-exec 3>&1 > ${LOGDIR}/build.log 2>&1
-
-echo -n '# Starting build at '; date --utc
-
-if [ "$1" == "-c" ]; then
-    echo '$ find -mindepth 1 -maxdepth 1 ! -name .svn | xargs rm -rf'
-    find -mindepth 1 -maxdepth 1 ! -name .svn | xargs rm -rf
-fi
-
-echo '$ svn update'
-svn update | tee ${LOGDIR}/svn-update.log
-if grep -qv '^At ' ${LOGDIR}/svn-update.log; then
-    echo '$ rm -f doc/html/html.stamp'
-    rm -f doc/html/html.stamp
-fi
-rm -f ${LOGDIR}/svn-update.log
-
-echo "\$ nice ${SCONS:-scons} -kj2 all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
-nice ${SCONS:-scons} -kj2 all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
-echo "\$ nice ${SCONS:-scons} all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
-nice ${SCONS:-scons} all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
-echo "\$ nice ${SCONS:-scons} linklint ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
-nice ${SCONS:-scons} linklint ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
-echo "\$ nice ${SCONS:-scons} fixlinks ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
-nice ${SCONS:-scons} fixlinks ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
-echo -n '# Build completed at '; date --utc
-
-exec > ${LOGDIR}/upload.log 2>&1
-
-if [ "$1" == "-c" ]; then
-    cp ${LOGDIR}/build.log ${LOGDIR}/build-full.log
-fi
-
-echo -n '# Upload started at '; date --utc
-rsync -rzv --del --delete-excluded \
-    --filter="- .svn" \
-    --filter="- linklint" \
-    --filter="- debian" \
-    --filter="+ */" \
-    --filter="+ *.html" \
-    --filter="+ *.css" \
-    --filter="+ *.png" \
-    --filter="+ *.php" \
-    --filter="+ *.idx" \
-    --filter="+ *.log" \
-    --filter="- *" \
-    . g0dil@shell.berlios.de://home/groups/senf/htdocs/src
-echo -n '# Upload completed at '; date --utc
-
-exec >/dev/null 2>&1
-scp ${LOGDIR}/upload.log g0dil@shell.berlios.de:/home/groups/senf/htdocs/upload.log
diff --git a/admin/dump.sh b/admin/dump.sh
deleted file mode 100755
index 65073f8..0000000
--- a/admin/dump.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-#
-# Dump the complete subversion repository from berlios into the dumps/ folder
-
-PATH=${HOME}/bin:${PATH}
-LOGDIR=${HOME}/log
-
-target=`date +'%Y%m%d.dump.gz'`
-dumpdir=${HOME}/dumps
-log=${LOGDIR}/dump.log
-keep=4
-
-###########################################################################
-
-trap 'exec >/dev/null 2>&1; cat $log 1>&3; exit 1' ERR
-exec 3>&1 >$log 2>&1
-
-cd $dumpdir
-ssh g0dil@svn.berlios.de "svnadmin dump /svnroot/repos/senf -r 1:HEAD | gzip" >$target
-ls | sort -r | sed -e "1,${keep}d" | xargs -r rm
diff --git a/Glossary.dox b/doclib/Glossary.dox
similarity index 100%
rename from Glossary.dox
rename to doclib/Glossary.dox
diff --git a/Mainpage.dox b/doclib/Mainpage.dox
similarity index 100%
rename from Mainpage.dox
rename to doclib/Mainpage.dox
diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index 1a41a75..07ffa25 100644
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,14 +1,15 @@
 import os.path, SCons
 
-# SCons is at     #/scons/scons-<v>/engine/SCons/__init__.py
+# SCons is at     #/tools/scons-<v>/engine/SCons/__init__.py
 # site_init is at #/site_scons/site_init.py
 
-sconsbase = os.path.join(os.path.dirname(os.path.dirname(__file__)),"scons")
-sconsbase = os.path.abspath(os.path.join(sconsbase, sorted(os.listdir(sconsbase))[-1]))
+sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),"tools")
+sconsbase = os.path.join(
+    sconsbase,sorted((f for f in os.listdir(sconsbase) if f.startswith("scons-")))[-1])
 sconsengine = os.path.join(sconsbase, 'engine')
-sconsscript = os.path.join(os.path.join(sconsbase, 'script'),'scons')
+sconsscript = os.path.join(sconsbase, 'script', 'scons')
 
-if os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(SCons.__file__)))) != sconsbase:
+if os.path.dirname(os.path.dirname(os.path.abspath(SCons.__file__))) != sconsengine:
     import os, sys, SCons.Util
     SCons.Util.display("scons: Switching version")
 
diff --git a/_templates/SConscript b/tools/_templates/Example.SConscript
similarity index 100%
rename from _templates/SConscript
rename to tools/_templates/Example.SConscript
diff --git a/_templates/Example.cc b/tools/_templates/Example.cc
similarity index 100%
rename from _templates/Example.cc
rename to tools/_templates/Example.cc
diff --git a/_templates/Example.cci b/tools/_templates/Example.cci
similarity index 100%
rename from _templates/Example.cci
rename to tools/_templates/Example.cci
diff --git a/_templates/Example.ct b/tools/_templates/Example.ct
similarity index 100%
rename from _templates/Example.ct
rename to tools/_templates/Example.ct
diff --git a/_templates/Example.cti b/tools/_templates/Example.cti
similarity index 100%
rename from _templates/Example.cti
rename to tools/_templates/Example.cti
diff --git a/_templates/Example.dox b/tools/_templates/Example.dox
similarity index 100%
rename from _templates/Example.dox
rename to tools/_templates/Example.dox
diff --git a/_templates/Example.hh b/tools/_templates/Example.hh
similarity index 100%
rename from _templates/Example.hh
rename to tools/_templates/Example.hh
diff --git a/_templates/Example.ih b/tools/_templates/Example.ih
similarity index 100%
rename from _templates/Example.ih
rename to tools/_templates/Example.ih
diff --git a/_templates/Example.mpp b/tools/_templates/Example.mpp
similarity index 100%
rename from _templates/Example.mpp
rename to tools/_templates/Example.mpp
diff --git a/_templates/Example.test.cc b/tools/_templates/Example.test.cc
similarity index 100%
rename from _templates/Example.test.cc
rename to tools/_templates/Example.test.cc
diff --git a/_templates/add.sh b/tools/add.sh
similarity index 89%
rename from _templates/add.sh
rename to tools/add.sh
index af6b2d8..1d89a60 100755
--- a/_templates/add.sh
+++ b/tools/add.sh
@@ -2,7 +2,9 @@
 
 if [ -z "$1" ]; then
     cat <<EOF
-Usage: $0 [-f] <name>.<ext> [<author>]
+Usage: 
+    $0 [-f] <name>.<ext> [<author>]
+    $0 [-f] SConscript [<author>]
 
 Will add the file with that name to the current directory by copying
 the appropriate template and replacing the @NAME@ placeholders
@@ -30,7 +32,7 @@ EOF
     exit 1
 fi
 
-base="`dirname "$0"`"; base="`cd "$base"; pwd`"
+base="`dirname "$0"`"; base="`cd "$base/_templates"; pwd`"
 
 if [ "$1" == "-f" ]; then
     force=1
@@ -40,7 +42,7 @@ fi
 name="`basename "$1"`"
 case "$name" in
     *.*) type=".${name#*.}"; name="${name%.$type}" ;;
-    *) type="" ;;
+    *) type=".$name" ;;
 esac
 
 if [ ! -r "$base/Example$type" ] ; then
diff --git a/senf/PPI/drawmodules.py b/tools/drawmodules.py
old mode 100644
new mode 100755
similarity index 100%
rename from senf/PPI/drawmodules.py
rename to tools/drawmodules.py
diff --git a/find-sources.sh b/tools/find-sources.sh
similarity index 100%
rename from find-sources.sh
rename to tools/find-sources.sh
diff --git a/run-test-gdb.sh b/tools/run-test-gdb.sh
similarity index 100%
rename from run-test-gdb.sh
rename to tools/run-test-gdb.sh
diff --git a/tools/scons b/tools/scons
new file mode 100755
index 0000000..81eae7c
--- /dev/null
+++ b/tools/scons
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+base="`dirname "$0"`"; base="`cd "$base"; pwd`"
+
+sconsbase="$(ls -d "$base/scons-"* | sort | tail -1)"
+sconsengine="$sconsbase/engine"
+sconsscript="$sconsbase/script/scons"
+
+export SCONS_LIB_DIR="$sconsengine"
+exec "$sconsscript" "$@"
diff --git a/scons/scons-1.2.0/CHANGES.txt b/tools/scons-1.2.0/CHANGES.txt
similarity index 100%
rename from scons/scons-1.2.0/CHANGES.txt
rename to tools/scons-1.2.0/CHANGES.txt
diff --git a/scons/scons-1.2.0/LICENSE.txt b/tools/scons-1.2.0/LICENSE.txt
similarity index 100%
rename from scons/scons-1.2.0/LICENSE.txt
rename to tools/scons-1.2.0/LICENSE.txt
diff --git a/scons/scons-1.2.0/MANIFEST b/tools/scons-1.2.0/MANIFEST
similarity index 100%
rename from scons/scons-1.2.0/MANIFEST
rename to tools/scons-1.2.0/MANIFEST
diff --git a/scons/scons-1.2.0/PKG-INFO b/tools/scons-1.2.0/PKG-INFO
similarity index 100%
rename from scons/scons-1.2.0/PKG-INFO
rename to tools/scons-1.2.0/PKG-INFO
diff --git a/scons/scons-1.2.0/README.txt b/tools/scons-1.2.0/README.txt
similarity index 100%
rename from scons/scons-1.2.0/README.txt
rename to tools/scons-1.2.0/README.txt
diff --git a/scons/scons-1.2.0/RELEASE.txt b/tools/scons-1.2.0/RELEASE.txt
similarity index 100%
rename from scons/scons-1.2.0/RELEASE.txt
rename to tools/scons-1.2.0/RELEASE.txt
diff --git a/scons/scons-1.2.0/engine/SCons/Action.py b/tools/scons-1.2.0/engine/SCons/Action.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Action.py
rename to tools/scons-1.2.0/engine/SCons/Action.py
diff --git a/scons/scons-1.2.0/engine/SCons/Builder.py b/tools/scons-1.2.0/engine/SCons/Builder.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Builder.py
rename to tools/scons-1.2.0/engine/SCons/Builder.py
diff --git a/scons/scons-1.2.0/engine/SCons/CacheDir.py b/tools/scons-1.2.0/engine/SCons/CacheDir.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/CacheDir.py
rename to tools/scons-1.2.0/engine/SCons/CacheDir.py
diff --git a/scons/scons-1.2.0/engine/SCons/Conftest.py b/tools/scons-1.2.0/engine/SCons/Conftest.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Conftest.py
rename to tools/scons-1.2.0/engine/SCons/Conftest.py
diff --git a/scons/scons-1.2.0/engine/SCons/Debug.py b/tools/scons-1.2.0/engine/SCons/Debug.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Debug.py
rename to tools/scons-1.2.0/engine/SCons/Debug.py
diff --git a/scons/scons-1.2.0/engine/SCons/Defaults.py b/tools/scons-1.2.0/engine/SCons/Defaults.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Defaults.py
rename to tools/scons-1.2.0/engine/SCons/Defaults.py
diff --git a/scons/scons-1.2.0/engine/SCons/Environment.py b/tools/scons-1.2.0/engine/SCons/Environment.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Environment.py
rename to tools/scons-1.2.0/engine/SCons/Environment.py
diff --git a/scons/scons-1.2.0/engine/SCons/Errors.py b/tools/scons-1.2.0/engine/SCons/Errors.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Errors.py
rename to tools/scons-1.2.0/engine/SCons/Errors.py
diff --git a/scons/scons-1.2.0/engine/SCons/Executor.py b/tools/scons-1.2.0/engine/SCons/Executor.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Executor.py
rename to tools/scons-1.2.0/engine/SCons/Executor.py
diff --git a/scons/scons-1.2.0/engine/SCons/Job.py b/tools/scons-1.2.0/engine/SCons/Job.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Job.py
rename to tools/scons-1.2.0/engine/SCons/Job.py
diff --git a/scons/scons-1.2.0/engine/SCons/Memoize.py b/tools/scons-1.2.0/engine/SCons/Memoize.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Memoize.py
rename to tools/scons-1.2.0/engine/SCons/Memoize.py
diff --git a/scons/scons-1.2.0/engine/SCons/Node/Alias.py b/tools/scons-1.2.0/engine/SCons/Node/Alias.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Node/Alias.py
rename to tools/scons-1.2.0/engine/SCons/Node/Alias.py
diff --git a/scons/scons-1.2.0/engine/SCons/Node/FS.py b/tools/scons-1.2.0/engine/SCons/Node/FS.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Node/FS.py
rename to tools/scons-1.2.0/engine/SCons/Node/FS.py
diff --git a/scons/scons-1.2.0/engine/SCons/Node/Python.py b/tools/scons-1.2.0/engine/SCons/Node/Python.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Node/Python.py
rename to tools/scons-1.2.0/engine/SCons/Node/Python.py
diff --git a/scons/scons-1.2.0/engine/SCons/Node/__init__.py b/tools/scons-1.2.0/engine/SCons/Node/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Node/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Node/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Options/BoolOption.py b/tools/scons-1.2.0/engine/SCons/Options/BoolOption.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Options/BoolOption.py
rename to tools/scons-1.2.0/engine/SCons/Options/BoolOption.py
diff --git a/scons/scons-1.2.0/engine/SCons/Options/EnumOption.py b/tools/scons-1.2.0/engine/SCons/Options/EnumOption.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Options/EnumOption.py
rename to tools/scons-1.2.0/engine/SCons/Options/EnumOption.py
diff --git a/scons/scons-1.2.0/engine/SCons/Options/ListOption.py b/tools/scons-1.2.0/engine/SCons/Options/ListOption.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Options/ListOption.py
rename to tools/scons-1.2.0/engine/SCons/Options/ListOption.py
diff --git a/scons/scons-1.2.0/engine/SCons/Options/PackageOption.py b/tools/scons-1.2.0/engine/SCons/Options/PackageOption.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Options/PackageOption.py
rename to tools/scons-1.2.0/engine/SCons/Options/PackageOption.py
diff --git a/scons/scons-1.2.0/engine/SCons/Options/PathOption.py b/tools/scons-1.2.0/engine/SCons/Options/PathOption.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Options/PathOption.py
rename to tools/scons-1.2.0/engine/SCons/Options/PathOption.py
diff --git a/scons/scons-1.2.0/engine/SCons/Options/__init__.py b/tools/scons-1.2.0/engine/SCons/Options/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Options/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Options/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/PathList.py b/tools/scons-1.2.0/engine/SCons/PathList.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/PathList.py
rename to tools/scons-1.2.0/engine/SCons/PathList.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/__init__.py b/tools/scons-1.2.0/engine/SCons/Platform/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Platform/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/aix.py b/tools/scons-1.2.0/engine/SCons/Platform/aix.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/aix.py
rename to tools/scons-1.2.0/engine/SCons/Platform/aix.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/cygwin.py b/tools/scons-1.2.0/engine/SCons/Platform/cygwin.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/cygwin.py
rename to tools/scons-1.2.0/engine/SCons/Platform/cygwin.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/darwin.py b/tools/scons-1.2.0/engine/SCons/Platform/darwin.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/darwin.py
rename to tools/scons-1.2.0/engine/SCons/Platform/darwin.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/hpux.py b/tools/scons-1.2.0/engine/SCons/Platform/hpux.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/hpux.py
rename to tools/scons-1.2.0/engine/SCons/Platform/hpux.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/irix.py b/tools/scons-1.2.0/engine/SCons/Platform/irix.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/irix.py
rename to tools/scons-1.2.0/engine/SCons/Platform/irix.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/os2.py b/tools/scons-1.2.0/engine/SCons/Platform/os2.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/os2.py
rename to tools/scons-1.2.0/engine/SCons/Platform/os2.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/posix.py b/tools/scons-1.2.0/engine/SCons/Platform/posix.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/posix.py
rename to tools/scons-1.2.0/engine/SCons/Platform/posix.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/sunos.py b/tools/scons-1.2.0/engine/SCons/Platform/sunos.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/sunos.py
rename to tools/scons-1.2.0/engine/SCons/Platform/sunos.py
diff --git a/scons/scons-1.2.0/engine/SCons/Platform/win32.py b/tools/scons-1.2.0/engine/SCons/Platform/win32.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Platform/win32.py
rename to tools/scons-1.2.0/engine/SCons/Platform/win32.py
diff --git a/scons/scons-1.2.0/engine/SCons/SConf.py b/tools/scons-1.2.0/engine/SCons/SConf.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/SConf.py
rename to tools/scons-1.2.0/engine/SCons/SConf.py
diff --git a/scons/scons-1.2.0/engine/SCons/SConsign.py b/tools/scons-1.2.0/engine/SCons/SConsign.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/SConsign.py
rename to tools/scons-1.2.0/engine/SCons/SConsign.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/C.py b/tools/scons-1.2.0/engine/SCons/Scanner/C.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/C.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/C.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/D.py b/tools/scons-1.2.0/engine/SCons/Scanner/D.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/D.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/D.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/Dir.py b/tools/scons-1.2.0/engine/SCons/Scanner/Dir.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/Dir.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/Dir.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/Fortran.py b/tools/scons-1.2.0/engine/SCons/Scanner/Fortran.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/Fortran.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/Fortran.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/IDL.py b/tools/scons-1.2.0/engine/SCons/Scanner/IDL.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/IDL.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/IDL.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/LaTeX.py b/tools/scons-1.2.0/engine/SCons/Scanner/LaTeX.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/LaTeX.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/LaTeX.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/Prog.py b/tools/scons-1.2.0/engine/SCons/Scanner/Prog.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/Prog.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/Prog.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/RC.py b/tools/scons-1.2.0/engine/SCons/Scanner/RC.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/RC.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/RC.py
diff --git a/scons/scons-1.2.0/engine/SCons/Scanner/__init__.py b/tools/scons-1.2.0/engine/SCons/Scanner/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Scanner/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Scanner/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Script/Interactive.py b/tools/scons-1.2.0/engine/SCons/Script/Interactive.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Script/Interactive.py
rename to tools/scons-1.2.0/engine/SCons/Script/Interactive.py
diff --git a/scons/scons-1.2.0/engine/SCons/Script/Main.py b/tools/scons-1.2.0/engine/SCons/Script/Main.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Script/Main.py
rename to tools/scons-1.2.0/engine/SCons/Script/Main.py
diff --git a/scons/scons-1.2.0/engine/SCons/Script/SConsOptions.py b/tools/scons-1.2.0/engine/SCons/Script/SConsOptions.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Script/SConsOptions.py
rename to tools/scons-1.2.0/engine/SCons/Script/SConsOptions.py
diff --git a/scons/scons-1.2.0/engine/SCons/Script/SConscript.py b/tools/scons-1.2.0/engine/SCons/Script/SConscript.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Script/SConscript.py
rename to tools/scons-1.2.0/engine/SCons/Script/SConscript.py
diff --git a/scons/scons-1.2.0/engine/SCons/Script/__init__.py b/tools/scons-1.2.0/engine/SCons/Script/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Script/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Script/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Sig.py b/tools/scons-1.2.0/engine/SCons/Sig.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Sig.py
rename to tools/scons-1.2.0/engine/SCons/Sig.py
diff --git a/scons/scons-1.2.0/engine/SCons/Subst.py b/tools/scons-1.2.0/engine/SCons/Subst.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Subst.py
rename to tools/scons-1.2.0/engine/SCons/Subst.py
diff --git a/scons/scons-1.2.0/engine/SCons/Taskmaster.py b/tools/scons-1.2.0/engine/SCons/Taskmaster.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Taskmaster.py
rename to tools/scons-1.2.0/engine/SCons/Taskmaster.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/386asm.py b/tools/scons-1.2.0/engine/SCons/Tool/386asm.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/386asm.py
rename to tools/scons-1.2.0/engine/SCons/Tool/386asm.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/BitKeeper.py b/tools/scons-1.2.0/engine/SCons/Tool/BitKeeper.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/BitKeeper.py
rename to tools/scons-1.2.0/engine/SCons/Tool/BitKeeper.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/CVS.py b/tools/scons-1.2.0/engine/SCons/Tool/CVS.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/CVS.py
rename to tools/scons-1.2.0/engine/SCons/Tool/CVS.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/FortranCommon.py b/tools/scons-1.2.0/engine/SCons/Tool/FortranCommon.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/FortranCommon.py
rename to tools/scons-1.2.0/engine/SCons/Tool/FortranCommon.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/JavaCommon.py b/tools/scons-1.2.0/engine/SCons/Tool/JavaCommon.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/JavaCommon.py
rename to tools/scons-1.2.0/engine/SCons/Tool/JavaCommon.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/Perforce.py b/tools/scons-1.2.0/engine/SCons/Tool/Perforce.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/Perforce.py
rename to tools/scons-1.2.0/engine/SCons/Tool/Perforce.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/PharLapCommon.py b/tools/scons-1.2.0/engine/SCons/Tool/PharLapCommon.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/PharLapCommon.py
rename to tools/scons-1.2.0/engine/SCons/Tool/PharLapCommon.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/RCS.py b/tools/scons-1.2.0/engine/SCons/Tool/RCS.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/RCS.py
rename to tools/scons-1.2.0/engine/SCons/Tool/RCS.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/SCCS.py b/tools/scons-1.2.0/engine/SCons/Tool/SCCS.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/SCCS.py
rename to tools/scons-1.2.0/engine/SCons/Tool/SCCS.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/Subversion.py b/tools/scons-1.2.0/engine/SCons/Tool/Subversion.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/Subversion.py
rename to tools/scons-1.2.0/engine/SCons/Tool/Subversion.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/__init__.py b/tools/scons-1.2.0/engine/SCons/Tool/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Tool/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/aixc++.py b/tools/scons-1.2.0/engine/SCons/Tool/aixc++.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/aixc++.py
rename to tools/scons-1.2.0/engine/SCons/Tool/aixc++.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/aixcc.py b/tools/scons-1.2.0/engine/SCons/Tool/aixcc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/aixcc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/aixcc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/aixf77.py b/tools/scons-1.2.0/engine/SCons/Tool/aixf77.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/aixf77.py
rename to tools/scons-1.2.0/engine/SCons/Tool/aixf77.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/aixlink.py b/tools/scons-1.2.0/engine/SCons/Tool/aixlink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/aixlink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/aixlink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/applelink.py b/tools/scons-1.2.0/engine/SCons/Tool/applelink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/applelink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/applelink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/ar.py b/tools/scons-1.2.0/engine/SCons/Tool/ar.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/ar.py
rename to tools/scons-1.2.0/engine/SCons/Tool/ar.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/as.py b/tools/scons-1.2.0/engine/SCons/Tool/as.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/as.py
rename to tools/scons-1.2.0/engine/SCons/Tool/as.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/bcc32.py b/tools/scons-1.2.0/engine/SCons/Tool/bcc32.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/bcc32.py
rename to tools/scons-1.2.0/engine/SCons/Tool/bcc32.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/c++.py b/tools/scons-1.2.0/engine/SCons/Tool/c++.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/c++.py
rename to tools/scons-1.2.0/engine/SCons/Tool/c++.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/cc.py b/tools/scons-1.2.0/engine/SCons/Tool/cc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/cc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/cc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/cvf.py b/tools/scons-1.2.0/engine/SCons/Tool/cvf.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/cvf.py
rename to tools/scons-1.2.0/engine/SCons/Tool/cvf.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/default.py b/tools/scons-1.2.0/engine/SCons/Tool/default.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/default.py
rename to tools/scons-1.2.0/engine/SCons/Tool/default.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/dmd.py b/tools/scons-1.2.0/engine/SCons/Tool/dmd.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/dmd.py
rename to tools/scons-1.2.0/engine/SCons/Tool/dmd.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/dvi.py b/tools/scons-1.2.0/engine/SCons/Tool/dvi.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/dvi.py
rename to tools/scons-1.2.0/engine/SCons/Tool/dvi.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/dvipdf.py b/tools/scons-1.2.0/engine/SCons/Tool/dvipdf.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/dvipdf.py
rename to tools/scons-1.2.0/engine/SCons/Tool/dvipdf.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/dvips.py b/tools/scons-1.2.0/engine/SCons/Tool/dvips.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/dvips.py
rename to tools/scons-1.2.0/engine/SCons/Tool/dvips.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/f77.py b/tools/scons-1.2.0/engine/SCons/Tool/f77.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/f77.py
rename to tools/scons-1.2.0/engine/SCons/Tool/f77.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/f90.py b/tools/scons-1.2.0/engine/SCons/Tool/f90.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/f90.py
rename to tools/scons-1.2.0/engine/SCons/Tool/f90.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/f95.py b/tools/scons-1.2.0/engine/SCons/Tool/f95.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/f95.py
rename to tools/scons-1.2.0/engine/SCons/Tool/f95.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/filesystem.py b/tools/scons-1.2.0/engine/SCons/Tool/filesystem.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/filesystem.py
rename to tools/scons-1.2.0/engine/SCons/Tool/filesystem.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/fortran.py b/tools/scons-1.2.0/engine/SCons/Tool/fortran.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/fortran.py
rename to tools/scons-1.2.0/engine/SCons/Tool/fortran.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/g++.py b/tools/scons-1.2.0/engine/SCons/Tool/g++.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/g++.py
rename to tools/scons-1.2.0/engine/SCons/Tool/g++.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/g77.py b/tools/scons-1.2.0/engine/SCons/Tool/g77.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/g77.py
rename to tools/scons-1.2.0/engine/SCons/Tool/g77.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/gas.py b/tools/scons-1.2.0/engine/SCons/Tool/gas.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/gas.py
rename to tools/scons-1.2.0/engine/SCons/Tool/gas.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/gcc.py b/tools/scons-1.2.0/engine/SCons/Tool/gcc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/gcc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/gcc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/gfortran.py b/tools/scons-1.2.0/engine/SCons/Tool/gfortran.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/gfortran.py
rename to tools/scons-1.2.0/engine/SCons/Tool/gfortran.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/gnulink.py b/tools/scons-1.2.0/engine/SCons/Tool/gnulink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/gnulink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/gnulink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/gs.py b/tools/scons-1.2.0/engine/SCons/Tool/gs.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/gs.py
rename to tools/scons-1.2.0/engine/SCons/Tool/gs.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/hpc++.py b/tools/scons-1.2.0/engine/SCons/Tool/hpc++.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/hpc++.py
rename to tools/scons-1.2.0/engine/SCons/Tool/hpc++.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/hpcc.py b/tools/scons-1.2.0/engine/SCons/Tool/hpcc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/hpcc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/hpcc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/hplink.py b/tools/scons-1.2.0/engine/SCons/Tool/hplink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/hplink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/hplink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/icc.py b/tools/scons-1.2.0/engine/SCons/Tool/icc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/icc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/icc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/icl.py b/tools/scons-1.2.0/engine/SCons/Tool/icl.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/icl.py
rename to tools/scons-1.2.0/engine/SCons/Tool/icl.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/ifl.py b/tools/scons-1.2.0/engine/SCons/Tool/ifl.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/ifl.py
rename to tools/scons-1.2.0/engine/SCons/Tool/ifl.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/ifort.py b/tools/scons-1.2.0/engine/SCons/Tool/ifort.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/ifort.py
rename to tools/scons-1.2.0/engine/SCons/Tool/ifort.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/ilink.py b/tools/scons-1.2.0/engine/SCons/Tool/ilink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/ilink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/ilink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/ilink32.py b/tools/scons-1.2.0/engine/SCons/Tool/ilink32.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/ilink32.py
rename to tools/scons-1.2.0/engine/SCons/Tool/ilink32.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/install.py b/tools/scons-1.2.0/engine/SCons/Tool/install.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/install.py
rename to tools/scons-1.2.0/engine/SCons/Tool/install.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/intelc.py b/tools/scons-1.2.0/engine/SCons/Tool/intelc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/intelc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/intelc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/jar.py b/tools/scons-1.2.0/engine/SCons/Tool/jar.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/jar.py
rename to tools/scons-1.2.0/engine/SCons/Tool/jar.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/javac.py b/tools/scons-1.2.0/engine/SCons/Tool/javac.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/javac.py
rename to tools/scons-1.2.0/engine/SCons/Tool/javac.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/javah.py b/tools/scons-1.2.0/engine/SCons/Tool/javah.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/javah.py
rename to tools/scons-1.2.0/engine/SCons/Tool/javah.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/latex.py b/tools/scons-1.2.0/engine/SCons/Tool/latex.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/latex.py
rename to tools/scons-1.2.0/engine/SCons/Tool/latex.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/lex.py b/tools/scons-1.2.0/engine/SCons/Tool/lex.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/lex.py
rename to tools/scons-1.2.0/engine/SCons/Tool/lex.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/link.py b/tools/scons-1.2.0/engine/SCons/Tool/link.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/link.py
rename to tools/scons-1.2.0/engine/SCons/Tool/link.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/linkloc.py b/tools/scons-1.2.0/engine/SCons/Tool/linkloc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/linkloc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/linkloc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/m4.py b/tools/scons-1.2.0/engine/SCons/Tool/m4.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/m4.py
rename to tools/scons-1.2.0/engine/SCons/Tool/m4.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/masm.py b/tools/scons-1.2.0/engine/SCons/Tool/masm.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/masm.py
rename to tools/scons-1.2.0/engine/SCons/Tool/masm.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/midl.py b/tools/scons-1.2.0/engine/SCons/Tool/midl.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/midl.py
rename to tools/scons-1.2.0/engine/SCons/Tool/midl.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/mingw.py b/tools/scons-1.2.0/engine/SCons/Tool/mingw.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/mingw.py
rename to tools/scons-1.2.0/engine/SCons/Tool/mingw.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/mslib.py b/tools/scons-1.2.0/engine/SCons/Tool/mslib.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/mslib.py
rename to tools/scons-1.2.0/engine/SCons/Tool/mslib.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/mslink.py b/tools/scons-1.2.0/engine/SCons/Tool/mslink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/mslink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/mslink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/msvc.py b/tools/scons-1.2.0/engine/SCons/Tool/msvc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/msvc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/msvc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/msvs.py b/tools/scons-1.2.0/engine/SCons/Tool/msvs.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/msvs.py
rename to tools/scons-1.2.0/engine/SCons/Tool/msvs.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/mwcc.py b/tools/scons-1.2.0/engine/SCons/Tool/mwcc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/mwcc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/mwcc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/mwld.py b/tools/scons-1.2.0/engine/SCons/Tool/mwld.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/mwld.py
rename to tools/scons-1.2.0/engine/SCons/Tool/mwld.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/nasm.py b/tools/scons-1.2.0/engine/SCons/Tool/nasm.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/nasm.py
rename to tools/scons-1.2.0/engine/SCons/Tool/nasm.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/__init__.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/ipk.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/ipk.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/ipk.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/ipk.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/msi.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/msi.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/msi.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/msi.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/rpm.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/rpm.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/rpm.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/rpm.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/src_tarbz2.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/src_tarbz2.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/src_tarbz2.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/src_tarbz2.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/src_targz.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/src_targz.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/src_targz.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/src_targz.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/src_zip.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/src_zip.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/src_zip.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/src_zip.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/tarbz2.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/tarbz2.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/tarbz2.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/tarbz2.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/targz.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/targz.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/targz.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/targz.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/packaging/zip.py b/tools/scons-1.2.0/engine/SCons/Tool/packaging/zip.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/packaging/zip.py
rename to tools/scons-1.2.0/engine/SCons/Tool/packaging/zip.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/pdf.py b/tools/scons-1.2.0/engine/SCons/Tool/pdf.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/pdf.py
rename to tools/scons-1.2.0/engine/SCons/Tool/pdf.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/pdflatex.py b/tools/scons-1.2.0/engine/SCons/Tool/pdflatex.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/pdflatex.py
rename to tools/scons-1.2.0/engine/SCons/Tool/pdflatex.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/pdftex.py b/tools/scons-1.2.0/engine/SCons/Tool/pdftex.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/pdftex.py
rename to tools/scons-1.2.0/engine/SCons/Tool/pdftex.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/qt.py b/tools/scons-1.2.0/engine/SCons/Tool/qt.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/qt.py
rename to tools/scons-1.2.0/engine/SCons/Tool/qt.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/rmic.py b/tools/scons-1.2.0/engine/SCons/Tool/rmic.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/rmic.py
rename to tools/scons-1.2.0/engine/SCons/Tool/rmic.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/rpcgen.py b/tools/scons-1.2.0/engine/SCons/Tool/rpcgen.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/rpcgen.py
rename to tools/scons-1.2.0/engine/SCons/Tool/rpcgen.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/rpm.py b/tools/scons-1.2.0/engine/SCons/Tool/rpm.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/rpm.py
rename to tools/scons-1.2.0/engine/SCons/Tool/rpm.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sgiar.py b/tools/scons-1.2.0/engine/SCons/Tool/sgiar.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sgiar.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sgiar.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sgic++.py b/tools/scons-1.2.0/engine/SCons/Tool/sgic++.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sgic++.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sgic++.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sgicc.py b/tools/scons-1.2.0/engine/SCons/Tool/sgicc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sgicc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sgicc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sgilink.py b/tools/scons-1.2.0/engine/SCons/Tool/sgilink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sgilink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sgilink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sunar.py b/tools/scons-1.2.0/engine/SCons/Tool/sunar.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sunar.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sunar.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sunc++.py b/tools/scons-1.2.0/engine/SCons/Tool/sunc++.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sunc++.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sunc++.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/suncc.py b/tools/scons-1.2.0/engine/SCons/Tool/suncc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/suncc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/suncc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sunf77.py b/tools/scons-1.2.0/engine/SCons/Tool/sunf77.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sunf77.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sunf77.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sunf90.py b/tools/scons-1.2.0/engine/SCons/Tool/sunf90.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sunf90.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sunf90.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sunf95.py b/tools/scons-1.2.0/engine/SCons/Tool/sunf95.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sunf95.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sunf95.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/sunlink.py b/tools/scons-1.2.0/engine/SCons/Tool/sunlink.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/sunlink.py
rename to tools/scons-1.2.0/engine/SCons/Tool/sunlink.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/swig.py b/tools/scons-1.2.0/engine/SCons/Tool/swig.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/swig.py
rename to tools/scons-1.2.0/engine/SCons/Tool/swig.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/tar.py b/tools/scons-1.2.0/engine/SCons/Tool/tar.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/tar.py
rename to tools/scons-1.2.0/engine/SCons/Tool/tar.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/tex.py b/tools/scons-1.2.0/engine/SCons/Tool/tex.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/tex.py
rename to tools/scons-1.2.0/engine/SCons/Tool/tex.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/tlib.py b/tools/scons-1.2.0/engine/SCons/Tool/tlib.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/tlib.py
rename to tools/scons-1.2.0/engine/SCons/Tool/tlib.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/wix.py b/tools/scons-1.2.0/engine/SCons/Tool/wix.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/wix.py
rename to tools/scons-1.2.0/engine/SCons/Tool/wix.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/yacc.py b/tools/scons-1.2.0/engine/SCons/Tool/yacc.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/yacc.py
rename to tools/scons-1.2.0/engine/SCons/Tool/yacc.py
diff --git a/scons/scons-1.2.0/engine/SCons/Tool/zip.py b/tools/scons-1.2.0/engine/SCons/Tool/zip.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Tool/zip.py
rename to tools/scons-1.2.0/engine/SCons/Tool/zip.py
diff --git a/scons/scons-1.2.0/engine/SCons/Util.py b/tools/scons-1.2.0/engine/SCons/Util.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Util.py
rename to tools/scons-1.2.0/engine/SCons/Util.py
diff --git a/scons/scons-1.2.0/engine/SCons/Variables/BoolVariable.py b/tools/scons-1.2.0/engine/SCons/Variables/BoolVariable.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Variables/BoolVariable.py
rename to tools/scons-1.2.0/engine/SCons/Variables/BoolVariable.py
diff --git a/scons/scons-1.2.0/engine/SCons/Variables/EnumVariable.py b/tools/scons-1.2.0/engine/SCons/Variables/EnumVariable.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Variables/EnumVariable.py
rename to tools/scons-1.2.0/engine/SCons/Variables/EnumVariable.py
diff --git a/scons/scons-1.2.0/engine/SCons/Variables/ListVariable.py b/tools/scons-1.2.0/engine/SCons/Variables/ListVariable.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Variables/ListVariable.py
rename to tools/scons-1.2.0/engine/SCons/Variables/ListVariable.py
diff --git a/scons/scons-1.2.0/engine/SCons/Variables/PackageVariable.py b/tools/scons-1.2.0/engine/SCons/Variables/PackageVariable.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Variables/PackageVariable.py
rename to tools/scons-1.2.0/engine/SCons/Variables/PackageVariable.py
diff --git a/scons/scons-1.2.0/engine/SCons/Variables/PathVariable.py b/tools/scons-1.2.0/engine/SCons/Variables/PathVariable.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Variables/PathVariable.py
rename to tools/scons-1.2.0/engine/SCons/Variables/PathVariable.py
diff --git a/scons/scons-1.2.0/engine/SCons/Variables/__init__.py b/tools/scons-1.2.0/engine/SCons/Variables/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Variables/__init__.py
rename to tools/scons-1.2.0/engine/SCons/Variables/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/Warnings.py b/tools/scons-1.2.0/engine/SCons/Warnings.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/Warnings.py
rename to tools/scons-1.2.0/engine/SCons/Warnings.py
diff --git a/scons/scons-1.2.0/engine/SCons/__init__.py b/tools/scons-1.2.0/engine/SCons/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/__init__.py
rename to tools/scons-1.2.0/engine/SCons/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/__init__.py b/tools/scons-1.2.0/engine/SCons/compat/__init__.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/__init__.py
rename to tools/scons-1.2.0/engine/SCons/compat/__init__.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_UserString.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_UserString.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_UserString.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_UserString.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_hashlib.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_hashlib.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_hashlib.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_hashlib.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_itertools.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_itertools.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_itertools.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_itertools.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_optparse.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_optparse.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_optparse.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_optparse.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_sets.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_sets.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_sets.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_sets.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_sets15.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_sets15.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_sets15.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_sets15.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_shlex.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_shlex.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_shlex.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_shlex.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_subprocess.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_subprocess.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_subprocess.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_subprocess.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/_scons_textwrap.py b/tools/scons-1.2.0/engine/SCons/compat/_scons_textwrap.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/_scons_textwrap.py
rename to tools/scons-1.2.0/engine/SCons/compat/_scons_textwrap.py
diff --git a/scons/scons-1.2.0/engine/SCons/compat/builtins.py b/tools/scons-1.2.0/engine/SCons/compat/builtins.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/compat/builtins.py
rename to tools/scons-1.2.0/engine/SCons/compat/builtins.py
diff --git a/scons/scons-1.2.0/engine/SCons/cpp.py b/tools/scons-1.2.0/engine/SCons/cpp.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/cpp.py
rename to tools/scons-1.2.0/engine/SCons/cpp.py
diff --git a/scons/scons-1.2.0/engine/SCons/dblite.py b/tools/scons-1.2.0/engine/SCons/dblite.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/dblite.py
rename to tools/scons-1.2.0/engine/SCons/dblite.py
diff --git a/scons/scons-1.2.0/engine/SCons/exitfuncs.py b/tools/scons-1.2.0/engine/SCons/exitfuncs.py
similarity index 100%
rename from scons/scons-1.2.0/engine/SCons/exitfuncs.py
rename to tools/scons-1.2.0/engine/SCons/exitfuncs.py
diff --git a/scons/scons-1.2.0/os_spawnv_fix.diff b/tools/scons-1.2.0/os_spawnv_fix.diff
similarity index 100%
rename from scons/scons-1.2.0/os_spawnv_fix.diff
rename to tools/scons-1.2.0/os_spawnv_fix.diff
diff --git a/scons/scons-1.2.0/scons-time.1 b/tools/scons-1.2.0/scons-time.1
similarity index 100%
rename from scons/scons-1.2.0/scons-time.1
rename to tools/scons-1.2.0/scons-time.1
diff --git a/scons/scons-1.2.0/scons.1 b/tools/scons-1.2.0/scons.1
similarity index 100%
rename from scons/scons-1.2.0/scons.1
rename to tools/scons-1.2.0/scons.1
diff --git a/scons/scons-1.2.0/sconsign.1 b/tools/scons-1.2.0/sconsign.1
similarity index 100%
rename from scons/scons-1.2.0/sconsign.1
rename to tools/scons-1.2.0/sconsign.1
diff --git a/scons/scons-1.2.0/script/scons b/tools/scons-1.2.0/script/scons
similarity index 96%
rename from scons/scons-1.2.0/script/scons
rename to tools/scons-1.2.0/script/scons
index 92b4edf..522a3a9 100755
--- a/scons/scons-1.2.0/script/scons
+++ b/tools/scons-1.2.0/script/scons
@@ -99,10 +99,6 @@ else:
             # script_dir is /foo/bin;
             # check /foo/lib/scons*.
             prefs.append(head)
-        elif tail == "script":
-            # script_dir is /foo/script, probably extracted tarball
-            # check /foo/engine
-            libs.append(os.path.join(head, 'engine'))
 
     head, tail = os.path.split(sys.prefix)
     if tail == "usr":
diff --git a/scons/scons-1.2.0/script/scons-time b/tools/scons-1.2.0/script/scons-time
similarity index 100%
rename from scons/scons-1.2.0/script/scons-time
rename to tools/scons-1.2.0/script/scons-time
diff --git a/scons/scons-1.2.0/script/scons.bat b/tools/scons-1.2.0/script/scons.bat
similarity index 100%
rename from scons/scons-1.2.0/script/scons.bat
rename to tools/scons-1.2.0/script/scons.bat
diff --git a/scons/scons-1.2.0/script/sconsign b/tools/scons-1.2.0/script/sconsign
similarity index 100%
rename from scons/scons-1.2.0/script/sconsign
rename to tools/scons-1.2.0/script/sconsign
diff --git a/scons/scons-1.2.0/setup.cfg b/tools/scons-1.2.0/setup.cfg
similarity index 100%
rename from scons/scons-1.2.0/setup.cfg
rename to tools/scons-1.2.0/setup.cfg
diff --git a/scons/scons-1.2.0/setup.py b/tools/scons-1.2.0/setup.py
similarity index 100%
rename from scons/scons-1.2.0/setup.py
rename to tools/scons-1.2.0/setup.py
diff --git a/valgrind.sup b/tools/valgrind.sup
similarity index 100%
rename from valgrind.sup
rename to tools/valgrind.sup