scripts/addToolsVersion: properly handle .in vs. .in.2
While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).
Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.
So, for each tool, we need to explicitly know what file to munge.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1.1 --- a/scripts/addToolVersion.sh Thu Dec 27 00:57:26 2012 +0100
1.2 +++ b/scripts/addToolVersion.sh Thu Dec 27 12:45:22 2012 +0100
1.3 @@ -187,24 +187,24 @@
1.4 while [ $# -gt 0 ]; do
1.5 case "$1" in
1.6 # Tools:
1.7 - --gcc) EXP=; OBS=; cat=CC; tool=gcc; tool_prefix=cc;;
1.8 - --binutils) EXP=; OBS=; cat=BINUTILS; tool=binutils; tool_prefix=binutils;;
1.9 - --glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc;;
1.10 - --eglibc) EXP=; OBS=; cat=LIBC_EGLIBC; tool=eglibc; tool_prefix=libc;;
1.11 - --uClibc) EXP=; OBS=; cat=LIBC_UCLIBC; tool=uClibc; tool_prefix=libc;;
1.12 - --newlib) EXP=; OBS=; cat=LIBC_NEWLIB; tool=newlib; tool_prefix=libc;;
1.13 - --linux) EXP=; OBS=; cat=KERNEL; tool=linux; tool_prefix=kernel;;
1.14 - --gdb) EXP=; OBS=; cat=GDB; tool=gdb; tool_prefix=debug;;
1.15 - --dmalloc) EXP=; OBS=; cat=DMALLOC; tool=dmalloc; tool_prefix=debug;;
1.16 - --duma) EXP=; OBS=; cat=DUMA; tool=duma; tool_prefix=debug;;
1.17 - --strace) EXP=; OBS=; cat=STRACE; tool=strace; tool_prefix=debug;;
1.18 - --ltrace) EXP=; OBS=; cat=LTRACE; tool=ltrace; tool_prefix=debug;;
1.19 - --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs;;
1.20 - --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs;;
1.21 - --ppl) EXP=; OBS=; cat=PPL; tool=ppl; tool_prefix=companion_libs;;
1.22 - --cloog) EXP=; OBS=; cat=CLOOG; tool=cloog; tool_prefix=companion_libs;;
1.23 - --mpc) EXP=; OBS=; cat=MPC; tool=mpc; tool_prefix=companion_libs;;
1.24 - --libelf) EXP=; OBS=; cat=LIBELF; tool=libelf; tool_prefix=companion_libs;;
1.25 + --gcc) EXP=; OBS=; cat=CC; tool=gcc; tool_prefix=cc; dot2suffix=;;
1.26 + --binutils) EXP=; OBS=; cat=BINUTILS; tool=binutils; tool_prefix=binutils; dot2suffix=;;
1.27 + --glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc; dot2suffix=;;
1.28 + --eglibc) EXP=; OBS=; cat=LIBC_EGLIBC; tool=eglibc; tool_prefix=libc; dot2suffix=;;
1.29 + --uClibc) EXP=; OBS=; cat=LIBC_UCLIBC; tool=uClibc; tool_prefix=libc; dot2suffix=;;
1.30 + --newlib) EXP=; OBS=; cat=LIBC_NEWLIB; tool=newlib; tool_prefix=libc; dot2suffix=;;
1.31 + --linux) EXP=; OBS=; cat=KERNEL; tool=linux; tool_prefix=kernel; dot2suffix=;;
1.32 + --gdb) EXP=; OBS=; cat=GDB; tool=gdb; tool_prefix=debug; dot2suffix=;;
1.33 + --dmalloc) EXP=; OBS=; cat=DMALLOC; tool=dmalloc; tool_prefix=debug; dot2suffix=;;
1.34 + --duma) EXP=; OBS=; cat=DUMA; tool=duma; tool_prefix=debug; dot2suffix=;;
1.35 + --strace) EXP=; OBS=; cat=STRACE; tool=strace; tool_prefix=debug; dot2suffix=;;
1.36 + --ltrace) EXP=; OBS=; cat=LTRACE; tool=ltrace; tool_prefix=debug; dot2suffix=;;
1.37 + --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs; dot2suffix=;;
1.38 + --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs; dot2suffix=;;
1.39 + --ppl) EXP=; OBS=; cat=PPL; tool=ppl; tool_prefix=companion_libs; dot2suffix=;;
1.40 + --cloog) EXP=; OBS=; cat=CLOOG; tool=cloog; tool_prefix=companion_libs; dot2suffix=;;
1.41 + --mpc) EXP=; OBS=; cat=MPC; tool=mpc; tool_prefix=companion_libs; dot2suffix=;;
1.42 + --libelf) EXP=; OBS=; cat=LIBELF; tool=libelf; tool_prefix=companion_libs; dot2suffix=;;
1.43
1.44 # Tools options:
1.45 -x|--experimental|+s) EXP=1;;
1.46 @@ -219,10 +219,7 @@
1.47 # Version string:
1.48 *) [ -n "${tool}" ] || { doHelp; exit 1; }
1.49 file_base="config/${tool_prefix}/${tool}.in"
1.50 - # Components have their version selection either
1.51 - # in the .in or the .in.2 file. Handle both.
1.52 - addToolVersion "$1" "${file_base}"
1.53 - addToolVersion "$1" "${file_base}.2"
1.54 + addToolVersion "$1" "${file_base}${dot2suffix}"
1.55 ;;
1.56 esac
1.57 shift