1.1 --- a/scripts/showSamples.sh Sun Feb 07 17:17:52 2010 +0100
1.2 +++ b/scripts/showSamples.sh Sun Mar 14 12:12:10 2010 +0100
1.3 @@ -16,6 +16,7 @@
1.4 # Dump a single sample
1.5 dump_single_sample() {
1.6 local verbose=0
1.7 + local complibs
1.8 [ "$1" = "-v" ] && verbose=1 && shift
1.9 [ "$1" = "-w" ] && wiki=1 && shift
1.10 local width="$1"
1.11 @@ -38,7 +39,7 @@
1.12 ;;
1.13 esac
1.14 if [ -z "${wiki}" ]; then
1.15 - t_width=13
1.16 + t_width=14
1.17 printf "%-*s [%s" ${width} "${sample}" "${sample_type}"
1.18 [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " "
1.19 [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " "
1.20 @@ -51,12 +52,18 @@
1.21 ;;
1.22 esac
1.23 printf " %-*s : %s\n" ${t_width} "OS" "${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}"
1.24 - if [ "${CT_GMP_MPFR}" = "y" ]; then
1.25 - printf " %-*s : %s\n" ${t_width} "GMP/MPFR" "gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}"
1.26 + if [ -n "${CT_GMP}" -o -n "${CT_MPFR}" \
1.27 + -o -n "${CT_PPL}" -o -n "${CT_CLOOG}" -o -n "${CT_MPC}" \
1.28 + ]; then
1.29 + printf " %-*s :" ${t_width} "Companion libs"
1.30 + complibs=1
1.31 fi
1.32 - if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then
1.33 - printf " %-*s : %s\n" ${t_width} "PPL/CLOOG/MPC" "ppl-${CT_PPL_VERSION} / cloog-${CT_CLOOG_VERSION} / mpc-${CT_MPC_VERSION}"
1.34 - fi
1.35 + [ -z "${CT_GMP}" ] || printf " gmp-%s" "${CT_GMP_VERSION}"
1.36 + [ -z "${CT_MPFR}" ] || printf " mpfr-%s" "${CT_MPFR_VERSION}"
1.37 + [ -z "${CT_PPL}" ] || printf " ppl-%s" "${CT_PPL_VERSION}"
1.38 + [ -z "${CT_CLOOG}" ] || printf " cloog-ppl-%s" "${CT_CLOOG_VERSION}"
1.39 + [ -z "${CT_MPC}" ] || printf " mpc-%s" "${CT_MPC_VERSION}"
1.40 + [ -z "${complibs}" ] || printf "\n"
1.41 printf " %-*s : %s\n" ${t_width} "binutils" "binutils-${CT_BINUTILS_VERSION}"
1.42 printf " %-*s : %s" ${t_width} "C compiler" "${CT_CC}-${CT_CC_VERSION} (C"
1.43 [ "${CT_CC_LANG_CXX}" = "y" ] && printf ",C++"