Add a new help entry to list each samples more verbosely, but only on-demand.

/trunk/samples/samples.mk     |    4     4     0     0 ++++
 /trunk/scripts/showSamples.sh |   32    31     1     0 +++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
This commit is contained in:
Yann E. MORIN" 2008-05-02 21:49:43 +00:00
parent bf3d5df0ff
commit 8739aa7574
2 changed files with 35 additions and 1 deletions

View File

@ -10,6 +10,7 @@ help-config::
@echo ' saveconfig - Save current config as a preconfigured target' @echo ' saveconfig - Save current config as a preconfigured target'
help-samples:: help-samples::
@echo ' show-samples - show a brief overview of each samples listed below:'
@$(CT_LIB_DIR)/scripts/showSamples.sh $(CT_SAMPLES) @$(CT_LIB_DIR)/scripts/showSamples.sh $(CT_SAMPLES)
help-build:: help-build::
@ -17,6 +18,9 @@ help-build::
@echo ' regtest-local[.#] - Regtest-build all local samples' @echo ' regtest-local[.#] - Regtest-build all local samples'
@echo ' regtest-global[.#] - Regtest-build all global samples' @echo ' regtest-global[.#] - Regtest-build all global samples'
show-samples:
@$(CT_LIB_DIR)/scripts/showSamples.sh -v $(CT_SAMPLES)
# How we do build one sample # How we do build one sample
PHONY += $(CT_SAMPLES) PHONY += $(CT_SAMPLES)
$(CT_SAMPLES): $(CT_SAMPLES):

View File

@ -3,11 +3,16 @@
# Parses all samples on the command line, and for each of them, prints # Parses all samples on the command line, and for each of them, prints
# the versions of the main tools # the versions of the main tools
opt="$1"
[ "${opt}" = "-v" ] && shift || opt=
# GREP_OPTIONS screws things up. # GREP_OPTIONS screws things up.
export GREP_OPTIONS= export GREP_OPTIONS=
# Dump a single sample # Dump a single sample
dump_single_sample() { dump_single_sample() {
local verbose=0
[ "$1" = "-v" ] && verbose=1 && shift
local width="$1" local width="$1"
local sample="$2" local sample="$2"
if [ -f "${CT_TOP_DIR}/samples/${sample}/crosstool.config" ]; then if [ -f "${CT_TOP_DIR}/samples/${sample}/crosstool.config" ]; then
@ -20,6 +25,31 @@ dump_single_sample() {
printf " %-*s (%s" ${width} "${sample}" "${sample_type}" printf " %-*s (%s" ${width} "${sample}" "${sample_type}"
[ -f "${sample_top}/samples/${sample}/broken" ] && printf ",broken" [ -f "${sample_top}/samples/${sample}/broken" ] && printf ",broken"
echo ")" echo ")"
if [ ${verbose} -ne 0 ]; then
. "${sample_top}/samples/${sample}/crosstool.config"
echo " OS : ${CT_KERNEL}-${CT_KERNEL_VERSION}"
echo " binutils : binutils-${CT_BINUTILS_VERSION}"
echo -n " C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
[ "${CT_CC_LANG_CXX}" = "y" ] && echo -n ",C++"
[ "${CT_CC_LANG_FORTRAN}" = "y" ] && echo -n ",Fortran"
[ "${CT_CC_LANG_JAVA}" = "y" ] && echo -n ",Java"
[ "${CT_CC_LANG_ADA}" = "y" ] && echo -n ",ADA"
[ "${CT_CC_LANG_OBJC}" = "y" ] && echo -n ",Objective-C"
[ "${CT_CC_LANG_OBJCXX}" = "y" ] && echo -n ",Objective-C++"
[ -n "${CT_CC_LANG_OTHERS}" ] && echo -n ",$CT_CC_LANG_OTHERS}"
echo ")"
echo " C library : ${CT_LIBC}-${CT_LIBC_VERSION}"
echo -n " Tools :"
[ "${CT_LIBELF}" ] && echo -n " libelf-${CT_LIBELF_VERSION}"
[ "${CT_SSTRIP}" ] && echo -n " sstrip"
[ "${CT_DMALLOC}" ] && echo -n " dmalloc-${CT_DMALLOC_VERSION}"
[ "${CT_DUMA}" ] && echo -n " duma-${CT_DUMA_VERSION}"
[ "${CT_GDB}" ] && echo -n " gdb-${CT_GDB_VERSION}"
[ "${CT_LTRACE}" ] && echo -n " ltrace-${CT_LTRACE_VERSION}"
[ "${CT_STRACE}" ] && echo -n " strace-${CT_STRACE_VERSION}"
echo
echo
fi
} }
# Get largest sample width # Get largest sample width
@ -29,5 +59,5 @@ for sample in "${@}"; do
done done
for sample in "${@}"; do for sample in "${@}"; do
( dump_single_sample ${width} "${sample}" ) ( dump_single_sample ${opt} ${width} "${sample}" )
done done