diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-03 17:33:23 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-03 17:33:23 (GMT) |
| commit | 75cb688486da3ea2326d9a9f7f84031df719811b (patch) | |
| tree | 12dce53ac2f164c4bc5a5da9924480dba4d20db4 | |
| parent | 24711bbfbe462b49724b5d0ff17c4dc919859efc (diff) | |
samples: fix displaying samples
| -rw-r--r-- | samples/samples.mk | 9 | ||||
| -rwxr-xr-x | scripts/showSamples.sh | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/samples/samples.mk b/samples/samples.mk index 18b126a..4447246 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -4,7 +4,12 @@ # Build the list of available samples CT_TOP_SAMPLES := $(patsubst $(CT_TOP_DIR)/samples/%/crosstool.config,%,$(wildcard $(CT_TOP_DIR)/samples/*/crosstool.config)) CT_LIB_SAMPLES := $(filter-out $(CT_TOP_SAMPLES),$(patsubst $(CT_LIB_DIR)/samples/%/crosstool.config,%,$(wildcard $(CT_LIB_DIR)/samples/*/crosstool.config))) -CT_SAMPLES := $(sort $(CT_TOP_SAMPLES) $(CT_LIB_SAMPLES)) +CT_SAMPLES := $(shell echo $(sort $(CT_TOP_SAMPLES) $(CT_LIB_SAMPLES)) \ + |sed -r -e 's/ /\n/g;' \ + |sed -r -e 's/(.*),(.*)/\2,\1/;' \ + |LC_ALL=C sort \ + |sed -r -e 's/(.*),(.*)/\2,\1/;' \ + ) # ---------------------------------------------------------- # This part deals with the samples help entries @@ -39,7 +44,7 @@ $(patsubst %,show-%,$(CT_SAMPLES)): # print the list of all available samples PHONY += list-samples list-samples: FORCE - @echo $(CT_SAMPLES) |$(sed) -r -e 's/ /\n/g;' |sort + @echo $(CT_SAMPLES) |$(sed) -r -e 's/ /\n/g;' wiki-samples: $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w $(CT_SAMPLES) diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 002b4c4..33e3081 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -30,7 +30,7 @@ dump_single_sample() { . "${sample_top}/samples/${sample}/crosstool.config" if [ -z "${wiki}" ]; then t_width=13 - printf " %-*s [%s" ${width} "${sample}" "${sample_type}" + printf "%-*s [%s" ${width} "${sample}" "${sample_type}" [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " " [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " " echo "]" @@ -152,7 +152,7 @@ fi for sample in "${@}"; do ( dump_single_sample ${opt} ${width} "${sample}" ) -done |LC_ALL=C sort -k2 +done if [ "${opt}" = -w ]; then printf "^ Total: ${#@} samples || **X**: sample uses features marked as being EXPERIMENTAL.\\\\\\\\ **B**: sample is curently BROKEN. |||||||||||||" |