# HG changeset patch # User "Yann E. MORIN" # Date 1213557951 0 # Node ID 0ca969b840577d2e75fe849d5dca1059e2d98884 # Parent 49dddaaa9ecfd89953efd6538c315aee3597e68e Add a new rule to build the sample table ready to include in the WiKi. /trunk/scripts/showSamples.sh | 81 53 28 0 ++++++++++++++++++++++++++++++++----------------- /trunk/samples/samples.mk | 6 6 0 0 ++++ 2 files changed, 59 insertions(+), 28 deletions(-) diff -r 49dddaaa9ecf -r 0ca969b84057 samples/samples.mk --- a/samples/samples.mk Sun Jun 15 19:25:14 2008 +0000 +++ b/samples/samples.mk Sun Jun 15 19:25:51 2008 +0000 @@ -20,6 +20,9 @@ @echo ' regtest-local[.#] - Regtest-build all local samples' @echo ' regtest-global[.#] - Regtest-build all global samples' +help-distrib:: + @echo ' wiki-samples - Print a DokuWiki table of samples' + $(patsubst %,show-%,$(CT_SAMPLES)): @$(CT_LIB_DIR)/scripts/showSamples.sh -v $(patsubst show-%,%,$(@)) @@ -84,3 +87,6 @@ saveconfig: @$(CT_LIB_DIR)/scripts/saveSample.sh + +wiki-samples: + @$(CT_LIB_DIR)/scripts/showSamples.sh -w $(CT_SAMPLES) diff -r 49dddaaa9ecf -r 0ca969b84057 scripts/showSamples.sh --- a/scripts/showSamples.sh Sun Jun 15 19:25:14 2008 +0000 +++ b/scripts/showSamples.sh Sun Jun 15 19:25:51 2008 +0000 @@ -3,8 +3,8 @@ # Parses all samples on the command line, and for each of them, prints # the versions of the main tools -opt="$1" -[ "${opt}" = "-v" ] && shift || opt= +[ "$1" = "-v" ] && opt="$1" && shift +[ "$1" = "-w" ] && opt="$1" && shift # GREP_OPTIONS screws things up. export GREP_OPTIONS= @@ -13,6 +13,7 @@ dump_single_sample() { local verbose=0 [ "$1" = "-v" ] && verbose=1 && shift + [ "$1" = "-w" ] && wiki=1 && shift local width="$1" local sample="$2" if [ -f "${CT_TOP_DIR}/samples/${sample}/crosstool.config" ]; then @@ -22,32 +23,52 @@ sample_top="${CT_LIB_DIR}" sample_type="global" fi - printf " %-*s (%s" ${width} "${sample}" "${sample_type}" - [ -f "${sample_top}/samples/${sample}/broken" ] && printf ",broken" - 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 + . "${sample_top}/samples/${sample}/crosstool.config" + if [ -z "${wiki}" ]; then + printf " %-*s (%s" ${width} "${sample}" "${sample_type}" + [ -f "${sample_top}/samples/${sample}/broken" ] && printf ",broken" + echo ")" + if [ ${verbose} -ne 0 ]; then + 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 + fi + else + echo -n "| ''${sample}'' " + echo -n "| ${CT_CC_VERSION} " + echo -n "| ''${CT_LIBC}'' " + echo -n "| ${CT_LIBC_VERSION} " + echo -n "| ${CT_BINUTILS_VERSION} " + echo -n "| ${CT_KERNEL_VERSION} " + echo -n "| ${CT_ARCH_FLOAT_HW:+hard}${CT_ARCH_FLOAT_SW:+soft} float " + echo -n "| ${CT_THREADS_NPTL:+NPTL}${CT_THREADS_LINUXTHREADS:+linuxthreads}${CT_THREADS_NONE:+none} " + echo -n "| " + if [ -f "${sample_top}/samples/${sample}/reported.by" ]; then + ( . "${sample_top}/samples/${sample}/reported.by"; \ + echo -n "| [[${reporter_url}|${reporter_name}]] " + ) + else + echo -n "| [[http://ymorin.is-a-geek.org/|YEM]] " + fi + echo "|" fi } @@ -57,6 +78,10 @@ [ ${#sample} -gt ${width} ] && width=${#sample} done +if [ "${opt}" = -w ]; then + echo "^ $(date +%Y%m%d.%H%M) ||||||||||" + echo "^ Target ^ gcc version ^ libc ^ libc version ^ binutils version ^ kernel headers ^ float support ^ threading model ^ Misc ^ Reported by ^" +fi for sample in "${@}"; do ( dump_single_sample ${opt} ${width} "${sample}" ) done