4 files changed, 31 insertions, 101 deletions

diff --git a/tools/release/bins.pl b/tools/release/bins.pl
index 9dc282410c..5cc92b1e94 100755
--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@@ -73,7 +73,7 @@ sub fonts {
     chdir "build-$dir";
     print "Build fonts in build-$dir\n" if($verbose);
 
-    # build the manual(s)
+    # build the fonts
     $a = buildfonts($dir, $confnum, $newl);
 
     chdir "..";
@@ -98,8 +98,8 @@ sub buildit {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure',
-                    $confnum, $extra);
+    my $ram = $extra ? $extra : -1;
+    my $c = "../tools/configure --type=n --target=$confnum --ram=$ram";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -119,8 +119,8 @@ sub buildfonts {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure",
-                    $confnum, $newl?'\n':'');
+    my $ram = $extra ? $extra : -1;
+    my $c = "../tools/configure --type=n --target=$confnum --ram=$ram";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -133,37 +133,10 @@ sub buildfonts {
 print "cd tools && make\n" if($verbose);
 `(cd tools && make ) >/dev/null 2>&1`;
 
-runone("player", "player", '\n');
-runone("recorder", "recorder", '\n');
-runone("recorder8mb", "recorder", '8\n');
-runone("fmrecorder", "fmrecorder", '\n');
-runone("fmrecorder8mb", "fmrecorder", '8\n');
-runone("recorderv2", "recorderv2", '\n');
-runone("ondiosp", "ondiosp", '\n');
-runone("ondiofm", "ondiofm", '\n');
-runone("h100", "h100");
-runone("h120", "h120");
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", '32\n');
-runone("ipodvideo64mb", "ipodvideo", '64\n');
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("iaudiom3", "m3");
-runone("ipodmini1g", "ipodmini");
-runone("ipodmini2g", "ipodmini2g");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-#runone("mrobe500", "mrobe500");
-runone("mrobe100", "mrobe100");
-runone("cowond2", "cowond2");
-fonts("fonts", "x5");
+for my $b (&stablebuilds) {
+    my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b;
+    runone($b, $configname, $builds{b}{ram});
+}
 
+fonts("fonts", "iaudiox5");
 
diff --git a/tools/release/manuals.pl b/tools/release/manuals.pl
index b3c6976da8..368d31ac0b 100755
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@@ -16,7 +16,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $conf, $nl)=@_;
+    my ($dir)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -28,7 +28,7 @@ sub runone {
     print "Build in buildm-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir, $conf, $nl);
+    $a = buildit($dir);
 
     chdir "..";
 
@@ -53,12 +53,11 @@ sub runone {
 };
 
 sub buildit {
-    my ($target, $confnum, $newl)=@_;
+    my ($target)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure',
-                    $confnum, $newl?'\n':'');
+    my $c = "../tools/configure --target=$target --type=m";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -73,27 +72,8 @@ sub buildit {
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-runone("player", "player", 1);
-runone("recorder", "recorder", 1);
-runone("fmrecorder", "fmrecorder", 1);
-runone("recorderv2", "recorderv2", 1);
-runone("ondiosp", "ondiosp", 1);
-runone("ondiofm", "ondiofm", 1);
-runone("h100", "h100");
-#runone("h120", 9);
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", 1);
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("ipodmini2g", "ipodmini2g");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-runone("mrobe100", "mrobe100");
+for my $b (&stablebuilds) {
+    next if ($builds{$b}{configname} < 3); # no variants
+
+    runone($b);
+}
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index 80e3bc2e74..abf652b312 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -4,6 +4,8 @@ use File::Basename;
 use File::Path;
 use Cwd;
 
+require "../builds.pm";
+
 my $verbose, $strip, $update, $doonly, $version;
 my @doonly;
 
@@ -92,7 +94,7 @@ if (!defined($version)) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $confnum, $extra)=@_;
+    my ($dir)=@_;
     my $a;
 
     if(@doonly > 0 && !grep(/^$dir$/, @doonly)) {
@@ -104,7 +106,7 @@ sub runone {
     print "Build in build-$dir\n" if($verbose);
 
     # build the target
-    $a = buildit($dir, $confnum, $extra);
+    $a = buildit($dir);
 
     # Do not continue if the rockboxui executable is not created. This will
     #    prevent a good build getting overwritten by a bad build when
diff --git a/tools/release/voices.pl b/tools/release/voices.pl
index 8ad3b2aa88..a5349618bb 100755
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@@ -16,7 +16,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $select, $newl)=@_;
+    my ($dir)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -28,7 +28,7 @@ sub runone {
     print "Build in buildv-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir, $select, $newl);
+    $a = buildit($dir);
 
     chdir "..";
 
@@ -50,13 +50,11 @@ sub runone {
 };
 
 sub buildit {
-    my ($dir, $select, $newl)=@_;
+    my ($model)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    # V (voice), F (festival), L (lame), [blank] (English)
-    my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure',
-                    $select, $newl?'\n':"");
+    my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -75,31 +73,8 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
 `rm -f $pool/*`;
 $ENV{'POOL'}="$pool";
 
-runone("player", "player", 1);
-runone("recorder", "recorder", 1);
-runone("fmrecorder", "fmrecorder", 1);
-runone("recorderv2", "recorderv2", 1);
-runone("ondiosp", "ondiosp", 1);
-runone("ondiofm", "ondiofm", 1);
-runone("h100", "h100");
-runone("h120", "h120");
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", 1);
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("iaudiom3", "m3");
-runone("ipodmini2g", "ipodmini2g");
-runone("ipodmini1g", "ipodmini");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-runone("mrobe100", "mrobe100");
-#runone("cowond2", "cowond2");
+for my $b (&stablebuilds) {
+    next if ($builds{$b}{configname} < 3); # no variants
 
+    runone($b);
+}