From 5a4ac4ed36a6d50686efbbe7fb17d2d6fd4e2fe4 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Fri, 26 Jun 2009 19:09:22 +0200
Subject: [samples] Don't mix canadian samples with non-canadian ones.

- save the canadian smples in their own way, so as not to
  mix non-canadian samples with canadian ones
- list canadian samples with the host information

diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in
index 6a097a6..4ef71ce 100644
--- a/scripts/saveSample.sh.in
+++ b/scripts/saveSample.sh.in
@@ -62,6 +62,7 @@ CT_LOG_LEVEL_MAX="WARN"
 # Compute the name of the sample directory
 case "${CT_TOOLCHAIN_TYPE}" in
     cross)      samp_name="${CT_TARGET}";;
+    canadian)   samp_name="${CT_HOST},${CT_TARGET}";;
     *)          CT_Abort "Unsupported toolchain type '${CT_TOOLCHAIN_TYPE}'";;
 esac
 samp_dir="samples/${samp_name}"
diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh
index f06a183..e952d64 100755
--- a/scripts/showSamples.sh
+++ b/scripts/showSamples.sh
@@ -34,6 +34,12 @@ dump_single_sample() {
         [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " "
         echo "]"
         if [ ${verbose} -ne 0 ]; then
+            case "${CT_TOOLCHAIN_TYPE}" in
+                cross)  ;;
+                canadian)
+                    printf "    Host      : ${CT_HOST}\n"
+                    ;;
+            esac
             echo    "    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}"
@@ -64,8 +70,13 @@ dump_single_sample() {
         printf "|  "
         [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X"
         [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B"
-        printf '  '
-        printf "|  ''${CT_KERNEL}''  |"
+        printf '  |  '
+        case "${CT_TOOLCHAIN_TYPE}" in
+            cross)      ;;
+            canadian)   printf "${CT_HOST}";;
+            *)          ;;
+        esac
+        printf "  |  ''${CT_KERNEL}''  |"
         if [ "${CT_KERNEL}" != "bare-metal" ];then
             if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" = "y" ]; then
                 printf "  //custom//  "
@@ -102,13 +113,7 @@ dump_single_sample() {
               printf "|  [[http://ymorin.is-a-geek.org/|YEM]]  "
           fi
         )
-        sample_updated=$(date -u "+%Y%m%d"                                                  \
-                              -d "$(LC_ALL=C svn info ${sample_top}/samples/${sample}       \
-                                    |GREP_OPTIONS= "${grep}" -E '^Last Changed Date:'       \
-                                    |"${sed}" -r -e 's/^[^:]+: //;'                         \
-                                            -e 's/^(.+:.. [+-][[:digit:]]{4}) \(.+\)$/\1/;' \
-                                   )"                                                       \
-                        )
+        sample_updated="$( hg log -l 1 --template '{date|shortdate}' "${sample_top}/samples/${sample}" )"
         printf "|  ${sample_updated}  "
         echo "|"
     fi
@@ -124,6 +129,7 @@ if [ "${opt}" = -w ]; then
     echo "^ @@DATE@@  ^ |||||||||||||"
     printf "^ Target "
     printf "^  Status  "
+    printf "^  Host  "
     printf "^  Kernel headers\\\\\\\\ version  ^"
     printf "^  binutils\\\\\\\\ version  "
     printf "^  C compiler\\\\\\\\ version  ^"
-- 
cgit v0.10.2-6-g49f6