From 66fa5b578904f7df61293d6ce5c08966b5db13db Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 7 Dec 2009 09:03:11 +0000 Subject: Rename targets to be consistent in all places. (FS #10819) git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23881 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, 46 insertions(+), 156 deletions(-) (limited to 'tools/release') diff --git a/tools/release/bins.pl b/tools/release/bins.pl index b96c7d863c..343315808b 100755 --- a/tools/release/bins.pl +++ b/tools/release/bins.pl @@ -1,6 +1,8 @@ #!/usr/bin/perl -$version="3.4"; +require "../builds.pm"; + +$version=$publicrelease; my $verbose; if($ARGV[0] eq "-v") { @@ -73,7 +75,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 +100,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 +121,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 +135,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 02783d356b..7b24ea4880 100755 --- a/tools/release/manuals.pl +++ b/tools/release/manuals.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl -$version="3.4"; +require "../builds.pm"; +my $version = $publicrelease; my $verbose; if($ARGV[0] eq "-v") { @@ -16,7 +17,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 +29,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 +54,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 +73,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 0481234189..79eeb5652a 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; @@ -88,7 +90,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)) { @@ -100,7 +102,7 @@ sub runone { print "Build in build-$dir\n" if($verbose); # build the target - $a = buildit($dir, $confnum, $extra); + $a = buildit($dir); if ($strip) { print "Stripping binaries\n" if ($verbose); @@ -149,12 +151,11 @@ sub runone { }; sub buildit { - my ($target, $confnum, $extra)=@_; + my ($target)=@_; `rm -rf * >/dev/null 2>&1`; - my $c = sprintf('printf "%s\n%ss\n" | ../tools/configure', - $confnum, $extra); + my $c = "../tools/configure --type=s --target=$target"; print "C: $c\n" if($verbose); `$c`; @@ -166,52 +167,9 @@ sub buildit { `make install 2>/dev/null`; } -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"); +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); +} diff --git a/tools/release/voices.pl b/tools/release/voices.pl index 056f6d06a9..d51c3208df 100755 --- a/tools/release/voices.pl +++ b/tools/release/voices.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl -$version="3.4"; +require "../builds.pm"; +my $version = $publicrelease; my $verbose; if($ARGV[0] eq "-v") { @@ -16,7 +17,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 +29,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 +51,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 +74,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); +} -- cgit v1.2.3