1.1 --- a/tools/addToolVersion.sh Wed Sep 12 17:35:07 2007 +0000
1.2 +++ b/tools/addToolVersion.sh Sun Apr 13 18:16:58 2008 +0000
1.3 @@ -17,9 +17,6 @@
1.4 --obsolete, -o
1.5 mark the version as being obsolete
1.6
1.7 - Valid mandatory 'option' for tool==gcc is one and only one of:
1.8 - --core, --final
1.9 -
1.10 Valid mandatory 'option' for tool==linux is one and only one of:
1.11 --install, --sanitised, --copy
1.12
1.13 @@ -38,8 +35,6 @@
1.14 tool=
1.15 tool_prefix=
1.16 tool_suffix=
1.17 -CORE=
1.18 -FINAL=
1.19 VERSION=
1.20 EXP=
1.21 OBS=
1.22 @@ -63,8 +58,6 @@
1.23 # Tools options:
1.24 -x|--experimental) EXP=1; OBS=; prompt_suffix=" (EXPERIMENTAL)";;
1.25 -o|--obsolete) OBS=1; EXP=; prompt_suffix=" (OBSOLETE)";;
1.26 - --core) CORE=1; FINAL=;;
1.27 - --final) FINAL=1; CORE=;;
1.28 --install) tool_suffix=install;;
1.29 --sanitised) tool_suffix=sanitised;;
1.30 --copy) tool_suffix=copy;;
1.31 @@ -79,15 +72,10 @@
1.32 [ -n "${tool}" -o -n "${VERSION}" ] || { doHelp; exit 1; }
1.33
1.34 case "${cat}" in
1.35 - CC) [ -z "${CORE}" -a -z "${FINAL}" ] && { doHelp; exit 1; };;
1.36 - KERNEL) unset FINAL CORE
1.37 - [ -z "${tool_suffix}" ] && { doHelp; exit 1; }
1.38 - ;;
1.39 - *) CORE=; FINAL=;;
1.40 + KERNEL) [ -z "${tool_suffix}" ] && { doHelp; exit 1; } ;;
1.41 + *) ;;
1.42 esac
1.43
1.44 -MIDDLE_V=; MIDDLE_F=
1.45 -[ -n "${CORE}" ] && MIDDLE_V="_CORE" && MIDDLE_F="core_"
1.46 for ver in ${VERSION}; do
1.47 unset DEP L1 L2 L3 L4 L5 FILE
1.48 v=`echo "${ver}" |sed -r -e 's/-/_/g; s/\./_/g;'`
1.49 @@ -104,11 +92,11 @@
1.50 L5=" default \"${ver}\" if ${cat}_${TOOL_SUFFIX}_V_${v}"
1.51 FILE="config/${tool_prefix}${tool}_headers_${tool_suffix}.in"
1.52 else
1.53 - L1="config ${cat}${MIDDLE_V}_V_${v}\n"
1.54 + L1="config ${cat}_V_${v}\n"
1.55 L2=" bool\n"
1.56 L3=" prompt \"${ver}${prompt_suffix}\"\n"
1.57 - L5=" default \"${ver}\" if ${cat}${MIDDLE_V}_V_${v}"
1.58 - FILE="config/${tool_prefix}${MIDDLE_F}${tool}.in"
1.59 + L5=" default \"${ver}\" if ${cat}_V_${v}"
1.60 + FILE="config/${tool_prefix}${tool}.in"
1.61 fi
1.62 [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
1.63 [ -n "${OBS}" ] && DEP="${DEP} && OBSOLETE"