From ff1d30c4a3c619bf6e451634c35c23ffce835001 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 2 May 2008 21:59:14 +0000 Subject: [PATCH] For tools/ and debug/ build scripts, annd a numeric prefix, so that they always get built in the same order, in case of library dependencies. /trunk/scripts/build/debug.sh | 2 1 1 0 +- /trunk/scripts/build/tools.sh | 2 1 1 0 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- scripts/build/debug.sh | 2 +- scripts/build/debug/{template.sh => 000-template.sh} | 0 scripts/build/debug/{dmalloc.sh => 100-dmalloc.sh} | 0 scripts/build/debug/{duma.sh => 200-duma.sh} | 0 scripts/build/debug/{gdb.sh => 300-gdb.sh} | 0 scripts/build/debug/{ltrace.sh => 400-ltrace.sh} | 0 scripts/build/debug/{strace.sh => 500-strace.sh} | 0 scripts/build/tools.sh | 2 +- scripts/build/tools/{template.sh => 000-template.sh} | 0 scripts/build/tools/{libelf.sh => 100-libelf.sh} | 0 scripts/build/tools/{sstrip.sh => 200-sstrip.sh} | 0 11 files changed, 2 insertions(+), 2 deletions(-) rename scripts/build/debug/{template.sh => 000-template.sh} (100%) rename scripts/build/debug/{dmalloc.sh => 100-dmalloc.sh} (100%) rename scripts/build/debug/{duma.sh => 200-duma.sh} (100%) rename scripts/build/debug/{gdb.sh => 300-gdb.sh} (100%) rename scripts/build/debug/{ltrace.sh => 400-ltrace.sh} (100%) rename scripts/build/debug/{strace.sh => 500-strace.sh} (100%) rename scripts/build/tools/{template.sh => 000-template.sh} (100%) rename scripts/build/tools/{libelf.sh => 100-libelf.sh} (100%) rename scripts/build/tools/{sstrip.sh => 200-sstrip.sh} (100%) diff --git a/scripts/build/debug.sh b/scripts/build/debug.sh index d2cca62f..84dbd75c 100644 --- a/scripts/build/debug.sh +++ b/scripts/build/debug.sh @@ -5,7 +5,7 @@ CT_DEBUG_FACILITY_LIST= for f in "${CT_LIB_DIR}/scripts/build/debug/"*.sh; do is_enabled= . "${f}" - f=`basename "${f}" .sh` + f=$(basename "${f#???-}" .sh) if [ "${is_enabled}" = "y" ]; then CT_DEBUG_FACILITY_LIST="${CT_DEBUG_FACILITY_LIST} ${f}" fi diff --git a/scripts/build/debug/template.sh b/scripts/build/debug/000-template.sh similarity index 100% rename from scripts/build/debug/template.sh rename to scripts/build/debug/000-template.sh diff --git a/scripts/build/debug/dmalloc.sh b/scripts/build/debug/100-dmalloc.sh similarity index 100% rename from scripts/build/debug/dmalloc.sh rename to scripts/build/debug/100-dmalloc.sh diff --git a/scripts/build/debug/duma.sh b/scripts/build/debug/200-duma.sh similarity index 100% rename from scripts/build/debug/duma.sh rename to scripts/build/debug/200-duma.sh diff --git a/scripts/build/debug/gdb.sh b/scripts/build/debug/300-gdb.sh similarity index 100% rename from scripts/build/debug/gdb.sh rename to scripts/build/debug/300-gdb.sh diff --git a/scripts/build/debug/ltrace.sh b/scripts/build/debug/400-ltrace.sh similarity index 100% rename from scripts/build/debug/ltrace.sh rename to scripts/build/debug/400-ltrace.sh diff --git a/scripts/build/debug/strace.sh b/scripts/build/debug/500-strace.sh similarity index 100% rename from scripts/build/debug/strace.sh rename to scripts/build/debug/500-strace.sh diff --git a/scripts/build/tools.sh b/scripts/build/tools.sh index e61b16f8..55869c4a 100644 --- a/scripts/build/tools.sh +++ b/scripts/build/tools.sh @@ -5,7 +5,7 @@ CT_TOOLS_FACILITY_LIST= for f in "${CT_LIB_DIR}/scripts/build/tools/"*.sh; do is_enabled= . "${f}" - f=`basename "${f}" .sh` + f=$(basename "${f#???-}" .sh) if [ "${is_enabled}" = "y" ]; then CT_TOOLS_FACILITY_LIST="${CT_TOOLS_FACILITY_LIST} ${f}" fi diff --git a/scripts/build/tools/template.sh b/scripts/build/tools/000-template.sh similarity index 100% rename from scripts/build/tools/template.sh rename to scripts/build/tools/000-template.sh diff --git a/scripts/build/tools/libelf.sh b/scripts/build/tools/100-libelf.sh similarity index 100% rename from scripts/build/tools/libelf.sh rename to scripts/build/tools/100-libelf.sh diff --git a/scripts/build/tools/sstrip.sh b/scripts/build/tools/200-sstrip.sh similarity index 100% rename from scripts/build/tools/sstrip.sh rename to scripts/build/tools/200-sstrip.sh