From 57db77a46d1f02caae4548bb88391122d0089d25 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 5 Sep 2008 11:20:38 +0000 Subject: [PATCH] Backport #975 from trunk: Warn the user if he/she recalls a sample with EXPERIMENTAL features. Also, print the EXPERIMENTAL status when listing the samples. NB: even it is not purely a fix backport, it is still very important that the user gets warned about the EXPERIMENTAL status of the samples. /branches/1.2/scripts/showSamples.sh | 17 14 3 0 ++++++++++++++--- /branches/1.2/samples/samples.mk | 12 12 0 0 ++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) --- samples/samples.mk | 12 ++++++++++++ scripts/showSamples.sh | 17 ++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/samples/samples.mk b/samples/samples.mk index a3f88816..40db58f8 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -35,6 +35,18 @@ PHONY += $(CT_SAMPLES) $(CT_SAMPLES): @echo 'Configuring for "$@"' @$(CT_NG) $(patsubst %,copy_config_%,$(@)) oldconfig + @if grep -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \ + echo ''; \ + echo '***********************************************************'; \ + echo ''; \ + echo 'WARNING! This sample may enable experimental features.'; \ + echo ' Please be sure to review the configuration prior'; \ + echo ' to building and using your toolchain!'; \ + echo 'Now, you have been warned!'; \ + echo ''; \ + echo '***********************************************************'; \ + echo ''; \ + fi @echo 'Execute "$(CT_NG) build" to build your toolchain' $(patsubst %,copy_config_%,$(CT_SAMPLES)): diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 33bfba84..8bed5a8e 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -18,15 +18,16 @@ dump_single_sample() { local sample="$2" if [ -f "${CT_TOP_DIR}/samples/${sample}/crosstool.config" ]; then sample_top="${CT_TOP_DIR}" - sample_type="local" + sample_type="l" else sample_top="${CT_LIB_DIR}" - sample_type="global" + sample_type="g" fi . "${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" + [ -f "${sample_top}/samples/${sample}/broken" ] && printf ",B" + [ "${CT_EXPERIMENTAL}" = "y" ] && printf ",X" echo ")" if [ ${verbose} -ne 0 ]; then echo " OS : ${CT_KERNEL}-${CT_KERNEL_VERSION}" @@ -108,3 +109,13 @@ fi for sample in "${@}"; do ( dump_single_sample ${opt} ${width} "${sample}" ) done + +if [ "${opt}" = -w ]; then + printf "^ Total: ${#@} samples | ||||||||||||" + echo "" +elif [ -z "${opt}" ]; then + echo ' l (local) : sample was found in current directory' + echo ' g (global) : sample was installed with crosstool-NG' + echo ' X (EXPERIMENTAL): sample may use EXPERIMENTAL features' + echo ' B (BORKEN) : sample is currently broken' +fi