From 36a81eb9b98ac7b1dff0d6658dba0255dd579f5f Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 7 Dec 2009 09:17:48 +0000 Subject: Reverted r23881 mistakenly committed to branch. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657 --- tools/release/bins.pl | 51 +++++++++++++++++++++++++++---------- tools/release/manuals.pl | 41 ++++++++++++++++++++++-------- tools/release/sims.pl | 66 +++++++++++++++++++++++++++++++++++++++--------- tools/release/voices.pl | 44 ++++++++++++++++++++++++-------- 4 files changed, 156 insertions(+), 46 deletions(-) (limited to 'tools/release') diff --git a/tools/release/bins.pl b/tools/release/bins.pl index 343315808b..b96c7d863c 100755 --- a/tools/release/bins.pl +++ b/tools/release/bins.pl @@ -1,8 +1,6 @@ #!/usr/bin/perl -require "../builds.pm"; - -$version=$publicrelease; +$version="3.4"; my $verbose; if($ARGV[0] eq "-v") { @@ -75,7 +73,7 @@ sub fonts { chdir "build-$dir"; print "Build fonts in build-$dir\n" if($verbose); - # build the fonts + # build the manual(s) $a = buildfonts($dir, $confnum, $newl); chdir ".."; @@ -100,8 +98,8 @@ sub buildit { `rm -rf * >/dev/null 2>&1`; - my $ram = $extra ? $extra : -1; - my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; + my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure', + $confnum, $extra); print "C: $c\n" if($verbose); `$c`; @@ -121,8 +119,8 @@ sub buildfonts { `rm -rf * >/dev/null 2>&1`; - my $ram = $extra ? $extra : -1; - my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; + my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure", + $confnum, $newl?'\n':''); print "C: $c\n" if($verbose); `$c`; @@ -135,10 +133,37 @@ sub buildfonts { print "cd tools && make\n" if($verbose); `(cd tools && make ) >/dev/null 2>&1`; -for my $b (&stablebuilds) { - my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b; - runone($b, $configname, $builds{b}{ram}); -} +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"); -fonts("fonts", "iaudiox5"); diff --git a/tools/release/manuals.pl b/tools/release/manuals.pl index 7b24ea4880..02783d356b 100755 --- a/tools/release/manuals.pl +++ b/tools/release/manuals.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -require "../builds.pm"; -my $version = $publicrelease; +$version="3.4"; my $verbose; if($ARGV[0] eq "-v") { @@ -17,7 +16,7 @@ if($ARGV[0]) { # made once for all targets sub runone { - my ($dir)=@_; + my ($dir, $conf, $nl)=@_; my $a; if($doonly && ($doonly ne $dir)) { @@ -29,7 +28,7 @@ sub runone { print "Build in buildm-$dir\n" if($verbose); # build the manual(s) - $a = buildit($dir); + $a = buildit($dir, $conf, $nl); chdir ".."; @@ -54,11 +53,12 @@ sub runone { }; sub buildit { - my ($target)=@_; + my ($target, $confnum, $newl)=@_; `rm -rf * >/dev/null 2>&1`; - my $c = "../tools/configure --target=$target --type=m"; + my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure', + $confnum, $newl?'\n':''); print "C: $c\n" if($verbose); `$c`; @@ -73,8 +73,27 @@ sub buildit { # run make in tools first to make sure they're up-to-date `(cd tools && make ) >/dev/null 2>&1`; -for my $b (&stablebuilds) { - next if ($builds{$b}{configname} < 3); # no variants - - runone($b); -} +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"); diff --git a/tools/release/sims.pl b/tools/release/sims.pl index 79eeb5652a..0481234189 100755 --- a/tools/release/sims.pl +++ b/tools/release/sims.pl @@ -4,8 +4,6 @@ use File::Basename; use File::Path; use Cwd; -require "../builds.pm"; - my $verbose, $strip, $update, $doonly, $version; my @doonly; @@ -90,7 +88,7 @@ if (!defined($version)) { # made once for all targets sub runone { - my ($dir)=@_; + my ($dir, $confnum, $extra)=@_; my $a; if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { @@ -102,7 +100,7 @@ sub runone { print "Build in build-$dir\n" if($verbose); # build the target - $a = buildit($dir); + $a = buildit($dir, $confnum, $extra); if ($strip) { print "Stripping binaries\n" if ($verbose); @@ -151,11 +149,12 @@ sub runone { }; sub buildit { - my ($target)=@_; + my ($target, $confnum, $extra)=@_; `rm -rf * >/dev/null 2>&1`; - my $c = "../tools/configure --type=s --target=$target"; + my $c = sprintf('printf "%s\n%ss\n" | ../tools/configure', + $confnum, $extra); print "C: $c\n" if($verbose); `$c`; @@ -167,9 +166,52 @@ sub buildit { `make install 2>/dev/null`; } -for my $b (keys %builds) { - next if ($builds{$b}{status} < 3); # only stable builds - next if ($builds{$b}{configname} < 3); # no memsize variants - - runone($b); -} +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("gigabeats", "gigabeats"); +runone("sansae200", "e200"); +runone("sansae200v2", "e200v2"); +runone("sansac200", "c200"); +runone("mrobe500", "mrobe500"); +runone("mrobe100", "mrobe100"); +runone("cowond2", "cowond2"); +runone("clip", "clip"); +runone("zvm30gb", "creativezvm30gb"); +runone("zvm60gb", "creativezvm60gb"); +runone("zenvision", "creativezenvision"); +runone("hdd1630", "hdd1630"); +runone("fuze", "fuze"); +runone("m200v4", "m200v4"); +runone("sa9200", "sa9200"); +runone("sansac200v2", "c200v2"); +runone("yh820", "yh_820"); +runone("yh920", "yh_920"); +runone("yh925", "yh_925"); +runone("ondavx747", "ondavx747"); +runone("ondavx747p", "ondavx747p"); +runone("ondavx777", "ondavx777"); +runone("ifp7xx", "ifp7xx"); diff --git a/tools/release/voices.pl b/tools/release/voices.pl index d51c3208df..056f6d06a9 100755 --- a/tools/release/voices.pl +++ b/tools/release/voices.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -require "../builds.pm"; -my $version = $publicrelease; +$version="3.4"; my $verbose; if($ARGV[0] eq "-v") { @@ -17,7 +16,7 @@ if($ARGV[0]) { # made once for all targets sub runone { - my ($dir)=@_; + my ($dir, $select, $newl)=@_; my $a; if($doonly && ($doonly ne $dir)) { @@ -29,7 +28,7 @@ sub runone { print "Build in buildv-$dir\n" if($verbose); # build the manual(s) - $a = buildit($dir); + $a = buildit($dir, $select, $newl); chdir ".."; @@ -51,11 +50,13 @@ sub runone { }; sub buildit { - my ($model)=@_; + my ($dir, $select, $newl)=@_; `rm -rf * >/dev/null 2>&1`; - my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f"; + # 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':""); print "C: $c\n" if($verbose); `$c`; @@ -74,8 +75,31 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool"; `rm -f $pool/*`; $ENV{'POOL'}="$pool"; -for my $b (&stablebuilds) { - next if ($builds{$b}{configname} < 3); # no variants +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"); - runone($b); -} -- cgit v1.2.3