5 files changed, 61 insertions, 29 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 8c78b82170..c3f6ccc3d4 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -37,6 +37,12 @@ while(1) {
         shift @ARGV;
         shift @ARGV;    
     }
+    elsif($ARGV[0] eq "-i") {
+        # The target id name as used in TARGET_ID in the root makefile
+        $target_id=$ARGV[1];
+        shift @ARGV;
+        shift @ARGV;    
+    }
     elsif($ARGV[0] eq "-o") {
         $output=$ARGV[1];
         shift @ARGV;
@@ -158,8 +164,8 @@ sub buildlangs {
     for(@files) {
         my $output = $_;
         $output =~ s/(.*)\.lang/$1.lng/;
-        print "$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -b=$outputlang/$output $dir/$_\n" if($verbose);
-        system ("$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -b=$outputlang/$output $dir/$_ >/dev/null 2>&1");
+        print "$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_\n" if($verbose);
+        system ("$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_ >/dev/null 2>&1");
     }
 }
 
diff --git a/tools/configure b/tools/configure
index 14cf697891..f162b66842 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1717,10 +1717,13 @@ clean:
         \$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.[ch]\
                   manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
                   @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
-                  html txt rockbox-manual*.zip sysfont.h rockbox-info.txt
+                  html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
+                  voicefontids
 
 voice: tools
-        \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$(LANGUAGE) \$(ARCHOS) voicesettings.sh
+        \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ features
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\
+        \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$(LANGUAGE) \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings.sh
 
 tools:
         \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
@@ -1736,20 +1739,24 @@ fontzip:
         \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 1 -o rockbox-fonts.zip \$(TARGET) \$(BINARY)
 
 zip:
-        \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\
+        \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 mapzip:
         \$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip
 
 fullzip:
-        \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY)
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+        \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY)
 
 7zip:
-        \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+        \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 tar:
         \$(SILENT)rm -f rockbox.tar
-        \$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+        \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+        \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 bzip2: tar
         \$(SILENT)bzip2 -f9 rockbox.tar
diff --git a/tools/genlang b/tools/genlang
index 621ec37a58..aa7e090c35 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -11,7 +11,7 @@
 #
 
 # binary version for the binary lang file
-my $langversion = 3; # 3 was the latest one used in the v1 format
+my $langversion = 4; # 3 was the latest one used in the v1 format
 
 # A note for future users and readers: The original v1 language system allowed
 # the build to create and use a different language than english built-in. We
@@ -28,8 +28,8 @@ Usage: genlang [options] <langv2 file>
     Make the tool create a [prefix].c and [prefix].h file.
 
  -b=<outfile>
-    Make the tool create a binary language (.lng) file namaed [outfile].
-    The use of this option requires that you also use -e.
+    Make the tool create a binary language (.lng) file named [outfile].
+    The use of this option requires that you also use -e, -t and -i.
 
  -u
     Update language file. Given the translated file and the most recent english
@@ -48,6 +48,9 @@ Usage: genlang [options] <langv2 file>
     separated with colons. This will make genlang to use all the specified
     strings when searching for a matching phrase.
 
+ -i=<target id>
+    The target id number, needed for -b.
+
  -o
     Voice mode output. Outputs all id: and voice: lines for the given target!
 
@@ -88,11 +91,18 @@ if(!$check) {
     print "Please use at least one of -p, -u, -o and -b\n";
     exit;
 }
+
 if(($binary || $update || $voiceout) && !$english) {
     print "Please use -e too when you use -b, -o or -u\n";
     exit;
 }
 
+my $target_id = $i;
+if($binary && !$target_id) {
+    print "Please specify a target id number (with -i)!\n";
+    exit;
+}
+
 my $target = $t;
 if(!$target && !$update) {
     print "Please specify a target (with -t)!\n";
@@ -586,7 +596,7 @@ elsif($binary) {
 
     open(OUTF, ">$binary") or die "Can't create $binary";
     binmode OUTF;
-    printf OUTF ("\x1a%c", $langversion); # magic lang file header
+    printf OUTF ("\x1a%c%c", $langversion, $target_id); # magic lang file header
 
     # loop over the target phrases
     for $i (1 .. $idcount) {
diff --git a/tools/genvoice.sh b/tools/genvoice.sh
index f32ab9476a..15028e3bd1 100755
--- a/tools/genvoice.sh
+++ b/tools/genvoice.sh
@@ -34,13 +34,17 @@ TTS_ENGINE=festival
 ENCODER=lame
 # Where to save temporary files
 TEMPDIR=/tmp
+# List of IDs to send to voicefont
+VOICEFONTIDS=voicefontids
 
 ###################
 # End of settings #
 ###################
 
+TARGET_ID="$4"
 createvoicefile() {
-    $VOICEFONT "$LANG_FILE" "$TEMPDIR/" "./$RLANG.voice"
+    $GENLANG -e=$ENGLISH -o -t=$TARGET $LANG_FILE > $VOICEFONTIDS
+    $VOICEFONT "$VOICEFONTIDS" "$TARGET_ID" "$TEMPDIR/" "./$RLANG.voice"
 }
 
 deletefiles() {
@@ -106,7 +110,7 @@ generateclips() {
 }
 
 if [ -z "$3" ]; then
-    echo "Usage: $0 rockboxdirectory language target [settingsfile]";
+    echo "Usage: $0 rockboxdirectory language target targetid [settingsfile]";
     exit 32
 else
     if [ ! -d "$1" ] || [ ! -f "$1/tools/genlang" ]; then
@@ -117,12 +121,12 @@ else
         echo "Error: $2 is not a valid language"
         exit 34
     fi
-    if [ ! -z "$4" ]; then
-        if [ -f "$4" ]; then
+    if [ ! -z "$5" ]; then
+        if [ -f "$5" ]; then
             # Read settings from file
-            source "$4"
+            source "$5"
         else
-            echo "Error: $4 does not exist"
+            echo "Error: $5 does not exist"
             exit 36
         fi
     fi
diff --git a/tools/voicefont.c b/tools/voicefont.c
index 0a6d0a2121..a5e72af567 100644
--- a/tools/voicefont.c
+++ b/tools/voicefont.c
@@ -90,10 +90,10 @@ int main (int argc, char** argv)
     if (argc < 2)
     {
         printf("Makes a Rockbox voicefont from a collection of mp3 clips.\n");
-        printf("Usage: voicefont <language file> <mp3 path> <output file>\n");
+        printf("Usage: voicefont <string id list file> <target id> <mp3 path> <output file>\n");
         printf("\n");
         printf("Example: \n");
-        printf("voicefont english.lang voice\\ voicefont.bin\n");
+        printf("voicefont voicefontids.txt 2 voice\\ voicefont.bin\n");
         return -1;
     }
     
@@ -123,10 +123,10 @@ int main (int argc, char** argv)
     }
     fclose(pFile);
 
-    pFile = fopen(argv[3], "wb");
+    pFile = fopen(argv[4], "wb");
     if (pFile == NULL)
     {
-        printf("Error opening output file %s\n", argv[3]);
+        printf("Error opening output file %s\n", argv[4]);
         return -2;
     }
     fseek(pFile, 16 + count*8, SEEK_SET); /* space for header */
@@ -137,8 +137,8 @@ int main (int argc, char** argv)
             count_voiceonly++;
         
         pos[i] = ftell(pFile);
-        sprintf(mp3filename1, "%s%s.mp3", argv[2], names[i]);
-        sprintf(mp3filename2, "%s%s.wav.mp3", argv[2], names[i]);
+        sprintf(mp3filename1, "%s%s.mp3", argv[3], names[i]);
+        sprintf(mp3filename2, "%s%s.wav.mp3", argv[3], names[i]);
         mp3filename = mp3filename1;
         pMp3File = fopen(mp3filename, "rb");
         if (pMp3File == NULL)
@@ -168,18 +168,23 @@ int main (int argc, char** argv)
     /* Create the file format: */
 
     /* 1st 32 bit value in the file is the version number    */
-    value = SWAP4(200); /* 2.00 */
+    value = SWAP4(300); /* 3.00 */
     fwrite(&value, sizeof(value), 1, pFile);
 
-    /* 2nd 32 bit value in the file is the header size (= 1st table position) */
-    value = SWAP4(16); /* 16 bytes: for version, header size, number1, number2 */
+    /* 2nd 32 bit value in the file is the id number for the target
+       we made the voce file for */
+    value = SWAP4(atoi(argv[2]));
     fwrite(&value, sizeof(value), 1, pFile);
 
-    /* 3rd 32 bit value in the file is the number of clips in 1st table   */
+    /* 3rd 32 bit value in the file is the header size (= 1st table position) */
+    value = SWAP4(20); /* 20 bytes: for version, target id, header size, number1, number2 */
+    fwrite(&value, sizeof(value), 1, pFile);
+
+    /* 4th 32 bit value in the file is the number of clips in 1st table   */
     value = SWAP4(count-count_voiceonly);
     fwrite(&value, sizeof(value), 1, pFile);
 
-    /*  4th bit value in the file is the number of clips in 2nd table */
+    /* 5th bit value in the file is the number of clips in 2nd table */
     value = SWAP4(count_voiceonly);
     fwrite(&value, sizeof(value), 1, pFile);