From 0c6375595702e370b3e5784eabdc87f0f5282fed Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Sep 2009 18:38:06 +0200 Subject: scripts: add new version at top of choice Add new versions at the top of the choice menu, not at the bottom. --- scripts/addToolVersion.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/addToolVersion.sh') diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 255b8fe5..c2265218 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -78,34 +78,34 @@ addToolVersion() { case "${EXP},${OBS}" in ,) ;; ,*) exp_obs_prompt=" (OBSOLETE)" - deps=" depends on OBSOLETE\n" + deps=" depends on OBSOLETE" ;; *,) exp_obs_prompt=" (EXPERIMENTAL)" - deps=" depends on EXPERIMENTAL\n" + deps=" depends on EXPERIMENTAL" ;; *) exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)" - deps=" depends on EXPERIMENTAL && OBSOLETE\n" + deps=" depends on EXPERIMENTAL \\&\\& OBSOLETE" ;; esac [ -n "${exp_obs_prompt}" ] && SedExpr1="${SedExpr1}${exp_obs_prompt}" - SedExpr1="${SedExpr1}\"\n" - [ -n "${deps}" ] && SedExpr1="${SedExpr1}${deps}" + SedExpr1="${SedExpr1}\"" + [ -n "${deps}" ] && SedExpr1="${SedExpr1}\n${deps}" if [ "${tool}" = "gcc" ]; then # Extract 'M'ajor and 'm'inor from version string ver_M=$(echo "${version}...." |cut -d . -f 1) ver_m=$(echo "${version}...." |cut -d . -f 2) if [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then - SedExpr1="${SedExpr1} select CC_GCC_4_3_or_later\n" + SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" fi if [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then - SedExpr1="${SedExpr1} select CC_GCC_4_4_or_later\n" + SedExpr1="${SedExpr1}\n select CC_GCC_4_4_or_later" fi fi SedExpr2=" default \"${version}\" if ${cat}_V_${v}" - "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${SedExpr1}"'\n\1/;' "${file}" - "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${SedExpr2}"'\n\1/;' "${file}" + "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n'"${SedExpr1}"'/;' "${file}" + "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}" } cat= -- cgit v1.2.3 From b6568d675b4da948cc9b965d88203f8f52bd05c9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Sep 2009 18:44:17 +0200 Subject: config: fix indentation for options marked EXPERIMENTAL or OBSOLETE Change the 2-space separation into a 1-space separation, for the sake of homogeneity. --- config/binutils/binutils.in | 4 ++-- config/cc/gcc.in | 2 +- config/debug/ltrace.in | 2 +- scripts/addToolVersion.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/addToolVersion.sh') diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 904dad2e..9d506b5d 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -13,12 +13,12 @@ choice config BINUTILS_V_2_19_51_0_2 bool - prompt "2.19.51.0.2 (EXPERIMENTAL)" + prompt "2.19.51.0.2 (EXPERIMENTAL)" depends on EXPERIMENTAL config BINUTILS_V_2_19_51_0_1 bool - prompt "2.19.51.0.1 (EXPERIMENTAL)" + prompt "2.19.51.0.1 (EXPERIMENTAL)" depends on EXPERIMENTAL config BINUTILS_V_2_19_50_0_1 diff --git a/config/cc/gcc.in b/config/cc/gcc.in index d0ff4ab7..d4792723 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -21,7 +21,7 @@ choice config CC_V_4_4_1 bool - prompt "4.4.1 (EXPERIMENTAL)" + prompt "4.4.1 (EXPERIMENTAL)" depends on EXPERIMENTAL select CC_GCC_4_3_or_later select CC_GCC_4_4_or_later diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 58579c3b..50d365d1 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -20,7 +20,7 @@ config LTRACE_V_0_5_2 config LTRACE_V_0_5_1 bool - prompt "0.5.1 (EXPERIMENTAL)" + prompt "0.5.1 (EXPERIMENTAL)" depends on EXPERIMENTAL config LTRACE_V_0_5 diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index c2265218..a4d7343a 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -77,13 +77,13 @@ addToolVersion() { SedExpr1="${SedExpr1} prompt \"${version}" case "${EXP},${OBS}" in ,) ;; - ,*) exp_obs_prompt=" (OBSOLETE)" + ,*) exp_obs_prompt=" (OBSOLETE)" deps=" depends on OBSOLETE" ;; - *,) exp_obs_prompt=" (EXPERIMENTAL)" + *,) exp_obs_prompt=" (EXPERIMENTAL)" deps=" depends on EXPERIMENTAL" ;; - *) exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)" + *) exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)" deps=" depends on EXPERIMENTAL \\&\\& OBSOLETE" ;; esac -- cgit v1.2.3 From 5fea8b3826022e14828c27d67b20918e452c03f0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 26 Sep 2009 12:45:07 +0200 Subject: Insert an empty line bwetween added new versions. --- scripts/addToolVersion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/addToolVersion.sh') diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index a4d7343a..c9102ca3 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -104,7 +104,7 @@ addToolVersion() { fi fi SedExpr2=" default \"${version}\" if ${cat}_V_${v}" - "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n'"${SedExpr1}"'/;' "${file}" + "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n\n'"${SedExpr1}"'/;' "${file}" "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}" } -- cgit v1.2.3