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(-)
1.1 --- a/samples/samples.mk Sun Jun 15 19:25:14 2008 +0000
1.2 +++ b/samples/samples.mk Sun Jun 15 19:25:51 2008 +0000
1.3 @@ -20,6 +20,9 @@
1.4 @echo ' regtest-local[.#] - Regtest-build all local samples'
1.5 @echo ' regtest-global[.#] - Regtest-build all global samples'
1.6
1.7 +help-distrib::
1.8 + @echo ' wiki-samples - Print a DokuWiki table of samples'
1.9 +
1.10 $(patsubst %,show-%,$(CT_SAMPLES)):
1.11 @$(CT_LIB_DIR)/scripts/showSamples.sh -v $(patsubst show-%,%,$(@))
1.12
1.13 @@ -84,3 +87,6 @@
1.14
1.15 saveconfig:
1.16 @$(CT_LIB_DIR)/scripts/saveSample.sh
1.17 +
1.18 +wiki-samples:
1.19 + @$(CT_LIB_DIR)/scripts/showSamples.sh -w $(CT_SAMPLES)
2.1 --- a/scripts/showSamples.sh Sun Jun 15 19:25:14 2008 +0000
2.2 +++ b/scripts/showSamples.sh Sun Jun 15 19:25:51 2008 +0000
2.3 @@ -3,8 +3,8 @@
2.4 # Parses all samples on the command line, and for each of them, prints
2.5 # the versions of the main tools
2.6
2.7 -opt="$1"
2.8 -[ "${opt}" = "-v" ] && shift || opt=
2.9 +[ "$1" = "-v" ] && opt="$1" && shift
2.10 +[ "$1" = "-w" ] && opt="$1" && shift
2.11
2.12 # GREP_OPTIONS screws things up.
2.13 export GREP_OPTIONS=
2.14 @@ -13,6 +13,7 @@
2.15 dump_single_sample() {
2.16 local verbose=0
2.17 [ "$1" = "-v" ] && verbose=1 && shift
2.18 + [ "$1" = "-w" ] && wiki=1 && shift
2.19 local width="$1"
2.20 local sample="$2"
2.21 if [ -f "${CT_TOP_DIR}/samples/${sample}/crosstool.config" ]; then
2.22 @@ -22,32 +23,52 @@
2.23 sample_top="${CT_LIB_DIR}"
2.24 sample_type="global"
2.25 fi
2.26 - printf " %-*s (%s" ${width} "${sample}" "${sample_type}"
2.27 - [ -f "${sample_top}/samples/${sample}/broken" ] && printf ",broken"
2.28 - echo ")"
2.29 - if [ ${verbose} -ne 0 ]; then
2.30 - . "${sample_top}/samples/${sample}/crosstool.config"
2.31 - echo " OS : ${CT_KERNEL}-${CT_KERNEL_VERSION}"
2.32 - echo " binutils : binutils-${CT_BINUTILS_VERSION}"
2.33 - echo -n " C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
2.34 - [ "${CT_CC_LANG_CXX}" = "y" ] && echo -n ",C++"
2.35 - [ "${CT_CC_LANG_FORTRAN}" = "y" ] && echo -n ",Fortran"
2.36 - [ "${CT_CC_LANG_JAVA}" = "y" ] && echo -n ",Java"
2.37 - [ "${CT_CC_LANG_ADA}" = "y" ] && echo -n ",ADA"
2.38 - [ "${CT_CC_LANG_OBJC}" = "y" ] && echo -n ",Objective-C"
2.39 - [ "${CT_CC_LANG_OBJCXX}" = "y" ] && echo -n ",Objective-C++"
2.40 - [ -n "${CT_CC_LANG_OTHERS}" ] && echo -n ",$CT_CC_LANG_OTHERS}"
2.41 - echo ")"
2.42 - echo " C library : ${CT_LIBC}-${CT_LIBC_VERSION}"
2.43 - echo -n " Tools :"
2.44 - [ "${CT_LIBELF}" ] && echo -n " libelf-${CT_LIBELF_VERSION}"
2.45 - [ "${CT_SSTRIP}" ] && echo -n " sstrip"
2.46 - [ "${CT_DMALLOC}" ] && echo -n " dmalloc-${CT_DMALLOC_VERSION}"
2.47 - [ "${CT_DUMA}" ] && echo -n " duma-${CT_DUMA_VERSION}"
2.48 - [ "${CT_GDB}" ] && echo -n " gdb-${CT_GDB_VERSION}"
2.49 - [ "${CT_LTRACE}" ] && echo -n " ltrace-${CT_LTRACE_VERSION}"
2.50 - [ "${CT_STRACE}" ] && echo -n " strace-${CT_STRACE_VERSION}"
2.51 - echo
2.52 + . "${sample_top}/samples/${sample}/crosstool.config"
2.53 + if [ -z "${wiki}" ]; then
2.54 + printf " %-*s (%s" ${width} "${sample}" "${sample_type}"
2.55 + [ -f "${sample_top}/samples/${sample}/broken" ] && printf ",broken"
2.56 + echo ")"
2.57 + if [ ${verbose} -ne 0 ]; then
2.58 + echo " OS : ${CT_KERNEL}-${CT_KERNEL_VERSION}"
2.59 + echo " binutils : binutils-${CT_BINUTILS_VERSION}"
2.60 + echo -n " C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
2.61 + [ "${CT_CC_LANG_CXX}" = "y" ] && echo -n ",C++"
2.62 + [ "${CT_CC_LANG_FORTRAN}" = "y" ] && echo -n ",Fortran"
2.63 + [ "${CT_CC_LANG_JAVA}" = "y" ] && echo -n ",Java"
2.64 + [ "${CT_CC_LANG_ADA}" = "y" ] && echo -n ",ADA"
2.65 + [ "${CT_CC_LANG_OBJC}" = "y" ] && echo -n ",Objective-C"
2.66 + [ "${CT_CC_LANG_OBJCXX}" = "y" ] && echo -n ",Objective-C++"
2.67 + [ -n "${CT_CC_LANG_OTHERS}" ] && echo -n ",$CT_CC_LANG_OTHERS}"
2.68 + echo ")"
2.69 + echo " C library : ${CT_LIBC}-${CT_LIBC_VERSION}"
2.70 + echo -n " Tools :"
2.71 + [ "${CT_LIBELF}" ] && echo -n " libelf-${CT_LIBELF_VERSION}"
2.72 + [ "${CT_SSTRIP}" ] && echo -n " sstrip"
2.73 + [ "${CT_DMALLOC}" ] && echo -n " dmalloc-${CT_DMALLOC_VERSION}"
2.74 + [ "${CT_DUMA}" ] && echo -n " duma-${CT_DUMA_VERSION}"
2.75 + [ "${CT_GDB}" ] && echo -n " gdb-${CT_GDB_VERSION}"
2.76 + [ "${CT_LTRACE}" ] && echo -n " ltrace-${CT_LTRACE_VERSION}"
2.77 + [ "${CT_STRACE}" ] && echo -n " strace-${CT_STRACE_VERSION}"
2.78 + echo
2.79 + fi
2.80 + else
2.81 + echo -n "| ''${sample}'' "
2.82 + echo -n "| ${CT_CC_VERSION} "
2.83 + echo -n "| ''${CT_LIBC}'' "
2.84 + echo -n "| ${CT_LIBC_VERSION} "
2.85 + echo -n "| ${CT_BINUTILS_VERSION} "
2.86 + echo -n "| ${CT_KERNEL_VERSION} "
2.87 + echo -n "| ${CT_ARCH_FLOAT_HW:+hard}${CT_ARCH_FLOAT_SW:+soft} float "
2.88 + echo -n "| ${CT_THREADS_NPTL:+NPTL}${CT_THREADS_LINUXTHREADS:+linuxthreads}${CT_THREADS_NONE:+none} "
2.89 + echo -n "| "
2.90 + if [ -f "${sample_top}/samples/${sample}/reported.by" ]; then
2.91 + ( . "${sample_top}/samples/${sample}/reported.by"; \
2.92 + echo -n "| [[${reporter_url}|${reporter_name}]] "
2.93 + )
2.94 + else
2.95 + echo -n "| [[http://ymorin.is-a-geek.org/|YEM]] "
2.96 + fi
2.97 + echo "|"
2.98 fi
2.99 }
2.100
2.101 @@ -57,6 +78,10 @@
2.102 [ ${#sample} -gt ${width} ] && width=${#sample}
2.103 done
2.104
2.105 +if [ "${opt}" = -w ]; then
2.106 + echo "^ $(date +%Y%m%d.%H%M) ||||||||||"
2.107 + echo "^ Target ^ gcc version ^ libc ^ libc version ^ binutils version ^ kernel headers ^ float support ^ threading model ^ Misc ^ Reported by ^"
2.108 +fi
2.109 for sample in "${@}"; do
2.110 ( dump_single_sample ${opt} ${width} "${sample}" )
2.111 done