summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-10-10 14:30:44 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-10-10 14:30:44 (GMT)
commit82c9d1aceb9b59f06f9f16496184ec16133447be (patch)
tree905f05736a366f07f9cdd191e528732dbb7a3645 /scripts/build
parent1e41bff4aaa8765c8cc63bd3e51a6e82b7275156 (diff)
Simplify the Tools and Debug facilities menu entries:
- each config file no longer have to define their own 'menuconfig foo - if FOO - endif' gym - each build script no longer has to say wether they are enabled - generation of the 'menuconfig' entries for the Tools and Debug facilities now uses the same code Some re-ordering of the code to be consistent with the steps ordering (tools, then debug). /trunk/kconfig/kconfig.mk | 66 43 23 0 +++++++++++++++++++++++------------- /trunk/scripts/build/debug.sh | 14 9 5 0 +++++--- /trunk/scripts/build/tools/000-template.sh | 7 0 7 0 ---- /trunk/scripts/build/tools/100-libelf.sh | 3 0 3 0 -- /trunk/scripts/build/tools/200-sstrip.sh | 2 0 2 0 - /trunk/scripts/build/debug/000-template.sh | 7 0 7 0 ---- /trunk/scripts/build/debug/100-dmalloc.sh | 3 0 3 0 -- /trunk/scripts/build/debug/400-ltrace.sh | 3 0 3 0 -- /trunk/scripts/build/debug/300-gdb.sh | 3 0 3 0 -- /trunk/scripts/build/debug/500-strace.sh | 3 0 3 0 -- /trunk/scripts/build/debug/200-duma.sh | 3 0 3 0 -- /trunk/scripts/build/tools.sh | 14 9 5 0 +++++--- /trunk/scripts/crosstool.sh | 2 1 1 0 /trunk/config/debug/ltrace.in | 14 3 11 0 ++------ /trunk/config/debug/dmalloc.in | 9 1 8 0 +---- /trunk/config/debug/gdb.in | 9 1 8 0 +---- /trunk/config/debug/strace.in | 10 1 9 0 ----- /trunk/config/debug/duma.in | 10 1 9 0 ----- /trunk/config/tools/libelf.in | 12 2 10 0 +------ /trunk/config/tools/sstrip.in | 10 1 9 0 ----- /trunk/config/config.in | 4 2 2 0 +- 21 files changed, 74 insertions(+), 134 deletions(-)
Diffstat (limited to 'scripts/build')
-rw-r--r--scripts/build/debug.sh14
-rw-r--r--scripts/build/debug/000-template.sh7
-rw-r--r--scripts/build/debug/100-dmalloc.sh3
-rw-r--r--scripts/build/debug/200-duma.sh3
-rw-r--r--scripts/build/debug/300-gdb.sh3
-rw-r--r--scripts/build/debug/400-ltrace.sh3
-rw-r--r--scripts/build/debug/500-strace.sh3
-rw-r--r--scripts/build/tools.sh14
-rw-r--r--scripts/build/tools/000-template.sh7
-rw-r--r--scripts/build/tools/100-libelf.sh3
-rw-r--r--scripts/build/tools/200-sstrip.sh2
11 files changed, 18 insertions, 44 deletions
diff --git a/scripts/build/debug.sh b/scripts/build/debug.sh
index 5441229..f07b295 100644
--- a/scripts/build/debug.sh
+++ b/scripts/build/debug.sh
@@ -3,11 +3,15 @@
# List all debug facilities, and parse their scripts
CT_DEBUG_FACILITY_LIST=
for f in "${CT_LIB_DIR}/scripts/build/debug/"*.sh; do
- is_enabled=
- . "${f}"
- f=$(basename "${f}" .sh)
- if [ "${is_enabled}" = "y" ]; then
- CT_DEBUG_FACILITY_LIST="${CT_DEBUG_FACILITY_LIST} ${f#???-}"
+ _f="$(basename "${f}" .sh)"
+ _f="${_f#???-}"
+ __f="CT_DEBUG_${_f}"
+ if [ "${!__f}" = "y" ]; then
+ CT_DoLog DEBUG "Enabling debug '${_f}'"
+ . "${f}"
+ CT_DEBUG_FACILITY_LIST="${CT_DEBUG_FACILITY_LIST} ${_f}"
+ else
+ CT_DoLog DEBUG "Disabling debug '${_f}'"
fi
done
diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh
index 0e63d7e..b6eaa9a 100644
--- a/scripts/build/debug/000-template.sh
+++ b/scripts/build/debug/000-template.sh
@@ -1,19 +1,12 @@
# Template file for a debug utility
-# Check here wether your debug tool is enabled or not.
-# This will get redefined over and over again for each tool, so don't
-# count on it in the functions below.
-is_enabled="${CT_FOOBAR}"
-
# Small function to print the filename
# Note that this function gets redefined over and over for each tool
# It's of no use when building the toolchain proper, but shows all its
# usefullness when saving the toolchain and building the tarball.
-# You shall not echo anything if you're not enabled!
# Echo the name of the file, without the extension, below.
do_print_filename() {
# For example:
- # [ "${CT_FOOBAR}" = "y" ] || return 0
# echo "foobar-${CT_FOOBAR_VERSION}"
:
}
diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh
index 59b25b3..fcb6f9d 100644
--- a/scripts/build/debug/100-dmalloc.sh
+++ b/scripts/build/debug/100-dmalloc.sh
@@ -1,9 +1,6 @@
# Build script for the dmalloc debug library facility
-is_enabled="${CT_DMALLOC}"
-
do_print_filename() {
- [ "${CT_DMALLOC}" = "y" ] || return 0
echo "dmalloc-${CT_DMALLOC_VERSION}"
}
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index 954aa83..b14485d 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -1,9 +1,6 @@
# Build script for D.U.M.A.
-is_enabled="${CT_DUMA}"
-
do_print_filename() {
- [ "${CT_DUMA}" = "y" ] || return 0
echo "duma_${CT_DUMA_VERSION}"
}
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index e00841b..321e13a 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -1,9 +1,6 @@
# Build script for the gdb debug facility
-is_enabled="${CT_GDB}"
-
do_print_filename() {
- [ "${CT_GDB}" = "y" ] || return 0
echo "gdb$(do_debug_gdb_suffix)"
if [ "${CT_GDB_NATIVE}" = "y" ]; then
echo "ncurses-${CT_NCURSES_VERSION}"
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 12f610c..32e11ea 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -1,9 +1,6 @@
# Build script for ltrace
-is_enabled="${CT_LTRACE}"
-
do_print_filename() {
- [ "${CT_LTRACE}" = "y" ] || return 0
echo "ltrace-${CT_LTRACE_VERSION}.orig"
}
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 26fcc99..ee1fc2c 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -1,9 +1,6 @@
# Build script for strace
-is_enabled="${CT_STRACE}"
-
do_print_filename() {
- [ "${CT_STRACE}" = "y" ] || return 0
echo "strace-${CT_STRACE_VERSION}"
}
diff --git a/scripts/build/tools.sh b/scripts/build/tools.sh
index 693893c..bb07c9a 100644
--- a/scripts/build/tools.sh
+++ b/scripts/build/tools.sh
@@ -3,11 +3,15 @@
# List all tools facilities, and parse their scripts
CT_TOOLS_FACILITY_LIST=
for f in "${CT_LIB_DIR}/scripts/build/tools/"*.sh; do
- is_enabled=
- . "${f}"
- f=$(basename "${f}" .sh)
- if [ "${is_enabled}" = "y" ]; then
- CT_TOOLS_FACILITY_LIST="${CT_TOOLS_FACILITY_LIST} ${f#???-}"
+ _f="$(basename "${f}" .sh)"
+ _f="${_f#???-}"
+ __f="CT_TOOL_${_f}"
+ if [ "${!__f}" = "y" ]; then
+ CT_DoLog DEBUG "Enabling tool '${_f}'"
+ . "${f}"
+ CT_TOOLS_FACILITY_LIST="${CT_TOOLS_FACILITY_LIST} ${_f}"
+ else
+ CT_DoLog DEBUG "Disabling tool '${_f}'"
fi
done
diff --git a/scripts/build/tools/000-template.sh b/scripts/build/tools/000-template.sh
index 7edc807..4a27801 100644
--- a/scripts/build/tools/000-template.sh
+++ b/scripts/build/tools/000-template.sh
@@ -1,19 +1,12 @@
# Template file for a tool utility
-# Check here wether your tool is enabled or not.
-# This will get redefined over and over again for each tool, so don't
-# count on it in the functions below.
-is_enabled="${CT_FOOBAR}"
-
# Small function to print the filename
# Note that this function gets redefined over and over again for each tool.
# It's of no use when building the toolchain proper, but shows all its
# usefullness when saving the toolchain and building the tarball.
-# You shall not echo anything if you're not enabled!
# Echo the name of the file, without the extension, below.
do_print_filename() {
# For example:
- # [ "{CT_FOOBAR}" = "y" ] || return 0
# echo "foobar-${CT_FOOBAR_VERSION}"
:
}
diff --git a/scripts/build/tools/100-libelf.sh b/scripts/build/tools/100-libelf.sh
index eeb4b3c..e8cd986 100644
--- a/scripts/build/tools/100-libelf.sh
+++ b/scripts/build/tools/100-libelf.sh
@@ -1,9 +1,6 @@
# Build script for libelf
-is_enabled="${CT_LIBELF}"
-
do_print_filename() {
- [ "{CT_LIBELF}" = "y" ] || return 0
echo "libelf-${CT_LIBELF_VERSION}"
}
diff --git a/scripts/build/tools/200-sstrip.sh b/scripts/build/tools/200-sstrip.sh
index b8a9d4b..461dfcf 100644
--- a/scripts/build/tools/200-sstrip.sh
+++ b/scripts/build/tools/200-sstrip.sh
@@ -1,7 +1,5 @@
# This will build and install sstrip to run on host and sstrip target files
-is_enabled="${CT_SSTRIP}"
-
case "${CT_SSTRIP_FROM}" in
ELFkickers)
do_print_filename() {