devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix several flaws in argument handling and reconfiguring, mainly related to voice building: (1) Properly retain arguments containing spaces by re-quoting them. (2) Properly retain --tts when the default is selected by just pressing return. (3) Only append --tts and --language if they weren't already specified on the commandline, preventing duplication on 'make reconf'. (4) Never append --ttsopts and --encopts for the same reason. These are commandline only anyway.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31637 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2012-01-08 13:59:15 +00:00
parent 3d9f3f47d9
commit 334e61293e
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tools/configure vendored
View file

@ -29,7 +29,16 @@ thread_support="ASSEMBLER_THREADS"
app_lcd_width=
app_lcd_height=
app_lcd_orientation=
cmdline="$@"
# Properly retain command line arguments containing spaces
cmdline=
for arg in "$@"; do
case "$arg" in
*\ *) cmdline="$cmdline \"$arg\"";;
*) cmdline="$cmdline $arg";;
esac
done
#
# Begin Function Definitions
#
@ -878,7 +887,7 @@ voiceconfig () {
DEFAULT_TTS="flite"
DEFAULT_TTS_OPTS=$FLITE_OPTS
DEFAULT_NOISEFLOOR="500"
DEFAULT_CHOICE="L"
DEFAULT_CHOICE="l"
fi
if [ -n "`findtool espeak`" ]; then
ESPEAK="(e)Speak "
@ -910,7 +919,7 @@ voiceconfig () {
DEFAULT_TTS="festival"
DEFAULT_TTS_OPTS=$FESTIVAL_OPTS
DEFAULT_NOISEFLOOR="500"
DEFAULT_CHOICE="F"
DEFAULT_CHOICE="f"
fi
if [ -n "`findtool swift`" ]; then
SWIFT="S(w)ift "
@ -927,7 +936,7 @@ voiceconfig () {
DEFAULT_TTS="sapi"
DEFAULT_TTS_OPTS=$SAPI_OPTS
DEFAULT_NOISEFLOOR="500"
DEFAULT_CHOICE="S"
DEFAULT_CHOICE="s"
fi
if [ "$FESTIVAL" = "$FLITE" ] && [ "$FLITE" = "$ESPEAK" ] && [ "$ESPEAK" = "$SAPI" ] && [ "$SAPI" = "$SWIFT" ]; then
@ -940,8 +949,9 @@ voiceconfig () {
else
echo "TTS engine to use: ${FLITE}${FESTIVAL}${ESPEAK}${SAPI}${SWIFT}(${DEFAULT_CHOICE})?"
option=`input`
if [ -z "$option" ]; then option=${DEFAULT_CHOICE}; fi
advopts="$advopts --tts=$option"
fi
advopts="$advopts --tts=$option"
case "$option" in
[Ll])
TTS_ENGINE="flite"
@ -1008,7 +1018,6 @@ voiceconfig () {
# Read custom tts options from command line
if [ "$ARG_TTSOPTS" ]; then
TTS_OPTS="$ARG_TTSOPTS"
advopts="$advopts --ttsopts='$TTS_OPTS'"
echo "$TTS_ENGINE options set to $TTS_OPTS"
fi
@ -1031,7 +1040,6 @@ voiceconfig () {
# Read custom encoder options from command line
if [ "$ARG_ENCOPTS" ]; then
ENC_OPTS="$ARG_ENCOPTS"
advopts="$advopts --encopts='$ENC_OPTS'"
echo "$ENCODER options set to $ENC_OPTS"
fi
@ -1061,8 +1069,8 @@ picklang() {
num=`expr $num + 1`
done
pick=`input`
advopts="$advopts --language=$pick"
fi
advopts="$advopts --language=$pick"
}
whichlang() {