From 0d434aabb659db66d801aecd20c62e2ae498fb5e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 7 Sep 2009 18:40:30 +0200 Subject: samples: replace usage of echo with printf Using printf instead of echo allows easier and better formatting. --- scripts/showSamples.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'scripts/showSamples.sh') diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index e952d644..946b7117 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -29,6 +29,7 @@ dump_single_sample() { fi . "${sample_top}/samples/${sample}/crosstool.config" if [ -z "${wiki}" ]; then + t_width=10 printf " %-*s [%s" ${width} "${sample}" "${sample_type}" [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " " [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " " @@ -37,15 +38,15 @@ dump_single_sample() { case "${CT_TOOLCHAIN_TYPE}" in cross) ;; canadian) - printf " Host : ${CT_HOST}\n" + printf " %-*s : %s\n" ${t_width} "Host" "${CT_HOST}" ;; esac - echo " OS : ${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}" + printf " %-*s : %s\n" ${t_width} "OS" "${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}" if [ "${CT_GMP_MPFR}" = "y" ]; then - echo " GMP/MPFR : gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}" + printf " %-*s : %s\n" ${t_width} "GMP/MPFR" "gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}" fi - echo " binutils : binutils-${CT_BINUTILS_VERSION}" - printf " C compiler: ${CT_CC}-${CT_CC_VERSION} (C" + printf " %-*s : %s\n" ${t_width} "binutils" "binutils-${CT_BINUTILS_VERSION}" + printf " %-*s : %s" ${t_width} "C compiler" "${CT_CC}-${CT_CC_VERSION} (C" [ "${CT_CC_LANG_CXX}" = "y" ] && printf ",C++" [ "${CT_CC_LANG_FORTRAN}" = "y" ] && printf ",Fortran" [ "${CT_CC_LANG_JAVA}" = "y" ] && printf ",Java" @@ -53,9 +54,9 @@ dump_single_sample() { [ "${CT_CC_LANG_OBJC}" = "y" ] && printf ",Objective-C" [ "${CT_CC_LANG_OBJCXX}" = "y" ] && printf ",Objective-C++" [ -n "${CT_CC_LANG_OTHERS}" ] && printf ",${CT_CC_LANG_OTHERS}" - echo ")" - echo " C library : ${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}" - printf " Tools :" + printf ")\n" + printf " %-*s : %s\n" ${t_width} "C library" "${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}" + printf " %-*s :" ${t_width} "Tools" [ "${CT_LIBELF}" ] && printf " libelf-${CT_LIBELF_VERSION}" [ "${CT_SSTRIP}" ] && printf " sstrip" [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}" @@ -63,7 +64,7 @@ dump_single_sample() { [ "${CT_GDB}" ] && printf " gdb-${CT_GDB_VERSION}" [ "${CT_LTRACE}" ] && printf " ltrace-${CT_LTRACE_VERSION}" [ "${CT_STRACE}" ] && printf " strace-${CT_STRACE_VERSION}" - echo + printf "\n" fi else printf "| ''${sample}'' " -- cgit v1.2.3 From 565378d2b9eb33224b7acca314007f9bcdc284e6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 7 Sep 2009 18:55:11 +0200 Subject: samples: fix displaying selected tools Do display selected tools / debug facilities when displaying a sample. --- scripts/showSamples.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/showSamples.sh') diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 946b7117..3c44bd76 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -57,13 +57,13 @@ dump_single_sample() { printf ")\n" printf " %-*s : %s\n" ${t_width} "C library" "${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}" printf " %-*s :" ${t_width} "Tools" - [ "${CT_LIBELF}" ] && printf " libelf-${CT_LIBELF_VERSION}" - [ "${CT_SSTRIP}" ] && printf " sstrip" - [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}" - [ "${CT_DUMA}" ] && printf " duma-${CT_DUMA_VERSION}" - [ "${CT_GDB}" ] && printf " gdb-${CT_GDB_VERSION}" - [ "${CT_LTRACE}" ] && printf " ltrace-${CT_LTRACE_VERSION}" - [ "${CT_STRACE}" ] && printf " strace-${CT_STRACE_VERSION}" + [ "${CT_TOOL_libelf}" ] && printf " libelf-${CT_LIBELF_VERSION}" + [ "${CT_TOOL_sstrip}" ] && printf " sstrip" + [ "${CT_DEBUG_dmalloc}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}" + [ "${CT_DEBUG_duma}" ] && printf " duma-${CT_DUMA_VERSION}" + [ "${CT_DEBUG_gdb}" ] && printf " gdb-${CT_GDB_VERSION}" + [ "${CT_DEBUG_ltrace}" ] && printf " ltrace-${CT_LTRACE_VERSION}" + [ "${CT_DEBUG_strace}" ] && printf " strace-${CT_STRACE_VERSION}" printf "\n" fi else -- cgit v1.2.3 From ea352a96a3ed308c87351b9ced72b27848546765 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 7 Sep 2009 19:03:09 +0200 Subject: samples: show the PPL, GLoog/ppl and MPC versions When displaying a sample, do show the PPL, CLoog/ppl and MPC versions --- scripts/showSamples.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/showSamples.sh') diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 3c44bd76..13e5a3f2 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -29,7 +29,7 @@ dump_single_sample() { fi . "${sample_top}/samples/${sample}/crosstool.config" if [ -z "${wiki}" ]; then - t_width=10 + t_width=13 printf " %-*s [%s" ${width} "${sample}" "${sample_type}" [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " " [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " " @@ -45,6 +45,9 @@ dump_single_sample() { if [ "${CT_GMP_MPFR}" = "y" ]; then printf " %-*s : %s\n" ${t_width} "GMP/MPFR" "gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}" fi + if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then + printf " %-*s : %s\n" ${t_width} "PPL/CLOOG/MPC" "ppl-${CT_PPL_VERSION} / cloog-${CT_CLOOG_VERSION} / mpc-${CT_MPC_VERSION}" + fi printf " %-*s : %s\n" ${t_width} "binutils" "binutils-${CT_BINUTILS_VERSION}" printf " %-*s : %s" ${t_width} "C compiler" "${CT_CC}-${CT_CC_VERSION} (C" [ "${CT_CC_LANG_CXX}" = "y" ] && printf ",C++" -- cgit v1.2.3