diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 70 | ||||
-rw-r--r-- | tools/voicecommon.sh | 2 |
2 files changed, 38 insertions, 34 deletions
diff --git a/tools/configure b/tools/configure index c06ebdad9f..b2d2be2508 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -215,7 +215,7 @@ whichadvanced () { | |||
215 | # | 215 | # |
216 | echo "" | 216 | echo "" |
217 | echo "Enter your developer options (press enter when done)" | 217 | echo "Enter your developer options (press enter when done)" |
218 | echo -n "(D)EBUG, (L)ogf, (S)imulator, (P)rofiling" | 218 | echo -n "(D)EBUG, (L)ogf, (S)imulator, (P)rofiling, (V)oice" |
219 | if [ "$memory" = "2" ]; then | 219 | if [ "$memory" = "2" ]; then |
220 | echo -n ", (8)MB MOD" | 220 | echo -n ", (8)MB MOD" |
221 | fi | 221 | fi |
@@ -255,6 +255,10 @@ whichadvanced () { | |||
255 | profile="yes" | 255 | profile="yes" |
256 | fi | 256 | fi |
257 | ;; | 257 | ;; |
258 | [Vv]) | ||
259 | echo "Voice build selected" | ||
260 | voice="yes" | ||
261 | ;; | ||
258 | 8) | 262 | 8) |
259 | if [ "$memory" = "2" ]; then | 263 | if [ "$memory" = "2" ]; then |
260 | memory="8" | 264 | memory="8" |
@@ -279,6 +283,10 @@ whichadvanced () { | |||
279 | done | 283 | done |
280 | echo "done" | 284 | echo "done" |
281 | 285 | ||
286 | if [ "yes" = "$voice" ]; then | ||
287 | voiceconfig | ||
288 | toolset="${toolset} voicefont wavtrim" | ||
289 | fi | ||
282 | if [ "yes" = "$use_debug" ]; then | 290 | if [ "yes" = "$use_debug" ]; then |
283 | debug="-DDEBUG" | 291 | debug="-DDEBUG" |
284 | GCCOPTS="$GCCOPTS -g -DDEBUG" | 292 | GCCOPTS="$GCCOPTS -g -DDEBUG" |
@@ -308,7 +316,7 @@ voiceconfig () { | |||
308 | DEFAULT_NOISEFLOOR="500" | 316 | DEFAULT_NOISEFLOOR="500" |
309 | DEFAULT_CHOICE="L" | 317 | DEFAULT_CHOICE="L" |
310 | fi | 318 | fi |
311 | if [ `which speak` ]; then | 319 | if [ `which espeak` ]; then |
312 | ESPEAK="(e)Speak " | 320 | ESPEAK="(e)Speak " |
313 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" | 321 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" |
314 | DEFAULT_TTS="espeak" | 322 | DEFAULT_TTS="espeak" |
@@ -383,27 +391,27 @@ voiceconfig () { | |||
383 | echo "You need to have Lame installed to build voice files" | 391 | echo "You need to have Lame installed to build voice files" |
384 | fi | 392 | fi |
385 | 393 | ||
386 | echo "Encoder to use: ${LAME}${OGGENC}${SPEEXENC}(${DEFAULT_CHOICE})?" | 394 | # echo "Encoder to use: ${LAME}${OGGENC}${SPEEXENC}(${DEFAULT_CHOICE})?" |
387 | echo "" | 395 | # echo "" |
388 | echo "Note: Use Lame - the other options won't work" | 396 | # echo "Note: Use Lame - the other options won't work" |
389 | option=`input` | 397 | # option=`input` |
390 | case "$option" in | 398 | # case "$option" in |
391 | [Oo]) | 399 | # [Oo]) |
392 | ENCODER="oggenc" | 400 | # ENCODER="oggenc" |
393 | ENC_OPTS=$VORBIS_OPTS | 401 | # ENC_OPTS=$VORBIS_OPTS |
394 | ;; | 402 | # ;; |
395 | [Ss]) | 403 | # [Ss]) |
396 | ENCODER="speexenc" | 404 | # ENCODER="speexenc" |
397 | ENC_OPTS=$SPEEX_OPTS | 405 | # ENC_OPTS=$SPEEX_OPTS |
398 | ;; | 406 | # ;; |
399 | [Ll]) | 407 | # [Ll]) |
400 | ENCODER="lame" | 408 | ENCODER="lame" |
401 | ENC_OPTS=$LAME_OPTS | 409 | ENC_OPTS=$LAME_OPTS |
402 | ;; | 410 | # ;; |
403 | *) | 411 | # *) |
404 | ENCODER=$DEFAULT_ENC | 412 | # ENCODER=$DEFAULT_ENC |
405 | ENC_OPTS=$DEFAULT_ENC_OPTS | 413 | # ENC_OPTS=$DEFAULT_ENC_OPTS |
406 | esac | 414 | # esac |
407 | echo "Using $ENCODER for encoding voice clips" | 415 | echo "Using $ENCODER for encoding voice clips" |
408 | 416 | ||
409 | cat > voicesettings.sh <<EOF | 417 | cat > voicesettings.sh <<EOF |
@@ -1312,7 +1320,7 @@ fi | |||
1312 | esac | 1320 | esac |
1313 | 1321 | ||
1314 | echo "" | 1322 | echo "" |
1315 | echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, $gdbstub(M)anual, (V)oice? (N)" | 1323 | echo "Build (N)ormal, (A)dvanced, (S)imulator, (B)ootloader, $gdbstub(M)anual (N)" |
1316 | 1324 | ||
1317 | option=`input`; | 1325 | option=`input`; |
1318 | 1326 | ||
@@ -1369,12 +1377,6 @@ fi | |||
1369 | apps="manual" | 1377 | apps="manual" |
1370 | echo "Manual build selected" | 1378 | echo "Manual build selected" |
1371 | ;; | 1379 | ;; |
1372 | [Vv]) | ||
1373 | echo "Voice build selected" | ||
1374 | voiceconfig | ||
1375 | toolset="${toolset} voicefont wavtrim" | ||
1376 | voice="yes" | ||
1377 | ;; | ||
1378 | *) | 1380 | *) |
1379 | debug="" | 1381 | debug="" |
1380 | echo "Normal build selected" | 1382 | echo "Normal build selected" |
@@ -1414,13 +1416,13 @@ if [ "yes" = "$voice" ]; then | |||
1414 | echo "Select a number for the language to use (default is english)" | 1416 | echo "Select a number for the language to use (default is english)" |
1415 | 1417 | ||
1416 | picklang | 1418 | picklang |
1417 | language=`whichlang` | 1419 | voicelanguage=`whichlang` |
1418 | 1420 | ||
1419 | if [ -z "$language" ]; then | 1421 | if [ -z "$voicelanguage" ]; then |
1420 | # pick a default | 1422 | # pick a default |
1421 | language="english" | 1423 | voicelanguage="english" |
1422 | fi | 1424 | fi |
1423 | echo "Language set to $language" | 1425 | echo "Voice language set to $voicelanguage" |
1424 | fi | 1426 | fi |
1425 | 1427 | ||
1426 | uname=`uname` | 1428 | uname=`uname` |
@@ -1573,6 +1575,7 @@ sed > Makefile \ | |||
1573 | -e "s,@MANUFACTURER@,${t_manufacturer},g" \ | 1575 | -e "s,@MANUFACTURER@,${t_manufacturer},g" \ |
1574 | -e "s,@ARCHOS@,${archos},g" \ | 1576 | -e "s,@ARCHOS@,${archos},g" \ |
1575 | -e "s,@LANGUAGE@,${language},g" \ | 1577 | -e "s,@LANGUAGE@,${language},g" \ |
1578 | -e "s,@VOICELANGUAGE@,${voicelanguage},g" \ | ||
1576 | -e "s,@PWD@,${pwd},g" \ | 1579 | -e "s,@PWD@,${pwd},g" \ |
1577 | -e "s,@CC@,${CC},g" \ | 1580 | -e "s,@CC@,${CC},g" \ |
1578 | -e "s,@LD@,${LD},g" \ | 1581 | -e "s,@LD@,${LD},g" \ |
@@ -1646,6 +1649,7 @@ export MANUFACTURER=@MANUFACTURER@ | |||
1646 | export OBJDIR=@PWD@ | 1649 | export OBJDIR=@PWD@ |
1647 | export BUILDDIR=@PWD@ | 1650 | export BUILDDIR=@PWD@ |
1648 | export LANGUAGE=@LANGUAGE@ | 1651 | export LANGUAGE=@LANGUAGE@ |
1652 | export VOICELANGUAGE=@VOICELANGUAGE@ | ||
1649 | export MEMORYSIZE=@MEMORY@ | 1653 | export MEMORYSIZE=@MEMORY@ |
1650 | export VERSION=\$(shell \$(ROOTDIR)/tools/svnversion.sh \$(ROOTDIR)) | 1654 | export VERSION=\$(shell \$(ROOTDIR)/tools/svnversion.sh \$(ROOTDIR)) |
1651 | export BUILDDATE=\$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d') | 1655 | export BUILDDATE=\$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d') |
@@ -1723,7 +1727,7 @@ clean: | |||
1723 | voice: tools | 1727 | voice: tools |
1724 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ features | 1728 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ features |
1725 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ | 1729 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ |
1726 | \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$(LANGUAGE) \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings.sh | 1730 | \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$(VOICELANGUAGE) \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings.sh |
1727 | 1731 | ||
1728 | tools: | 1732 | tools: |
1729 | \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@ | 1733 | \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@ |
diff --git a/tools/voicecommon.sh b/tools/voicecommon.sh index a21bf49efa..13df3e9739 100644 --- a/tools/voicecommon.sh +++ b/tools/voicecommon.sh | |||
@@ -35,7 +35,7 @@ FESTIVAL_CLIENT=festival_client | |||
35 | FLITE_BIN=flite | 35 | FLITE_BIN=flite |
36 | 36 | ||
37 | # The eSpeak executable | 37 | # The eSpeak executable |
38 | ESPEAK_BIN=speak | 38 | ESPEAK_BIN=espeak |
39 | 39 | ||
40 | # The lame executable | 40 | # The lame executable |
41 | LAME_BIN=lame | 41 | LAME_BIN=lame |