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/builds.pm | 313 --------------------------------------------- tools/checkwps/targets.txt | 52 ++++---- tools/configure | 208 +++++++++++++++--------------- tools/release/bins.pl | 51 ++++++-- tools/release/manuals.pl | 41 ++++-- tools/release/sims.pl | 66 ++++++++-- tools/release/voices.pl | 44 +++++-- 7 files changed, 286 insertions(+), 489 deletions(-) delete mode 100644 tools/builds.pm (limited to 'tools') diff --git a/tools/builds.pm b/tools/builds.pm deleted file mode 100644 index 634ffd0d12..0000000000 --- a/tools/builds.pm +++ /dev/null @@ -1,313 +0,0 @@ -$publicrelease="3.4"; -$releasedate="September 24, 2009"; -$releasenotes="/wiki/ReleaseNotes34"; - -%builds = ( - 'archosav300' => { - name => 'Archos AV300', - status => 1, # 3=stable, 2=unstable, 1=unusable - }, - 'archosfmrecorder' => { - name => 'Archos FM Recorder', - status => 3, - }, - 'archosondiofm' => { - name => 'Archos Ondio FM', - status => 3, - }, - 'archosondiosp' => { - name => 'Archos Ondio SP', - status => 3, - }, - 'archosplayer' => { - name => 'Archos Player/Studio', - status => 3, - }, - 'archosrecorder' => { - name => 'Archos Recorder v1', - status => 3, - }, - 'archosrecorderv2' => { - name => 'Archos Recorder v2', - status => 3, - }, - 'cowond2' => { - name => 'Cowon D2', - status => 2, - }, - 'gigabeatfx' => { - name => 'Toshiba Gigabeat F/X', - status => 3, - }, - 'gigabeats' => { - name => 'Toshiba Gigabeat S', - status => 2, - }, - 'gogearhdd1630' => { - name => 'Philips GoGear HDD1630', - status => 1, - }, - 'gogearsa9200' => { - name => 'Philips GoGear SA9200', - status => 1, - }, - 'iaudio7' => { - name => 'iAudio 7', - status => 1, - }, - 'iaudiom3' => { - name => 'iAudio M3', - status => 3, - }, - 'iaudiom5' => { - name => 'iAudio M5', - status => 3, - }, - 'iaudiox5' => { - name => 'iAudio X5', - status => 3, - }, - 'ipod1g2g' => { - name => 'iPod 1st and 2nd gen', - status => 3, - }, - 'ipod3g' => { - name => 'iPod 3rd gen', - status => 3, - }, - 'ipod4g' => { - name => 'iPod 4th gen Grayscale', - status => 3, - }, - 'ipodcolor' => { - name => 'iPod color/Photo', - status => 3, - }, - 'ipodmini1g' => { - name => 'iPod Mini 1st gen', - status => 3, - manual => 'ipodmini2g', - }, - 'ipodmini2g' => { - name => 'iPod Mini 2nd gen', - status => 3, - icon => 'ipodmini1g', - }, - 'ipodnano1g' => { - name => 'iPod Nano 1st gen', - status => 3, - }, - 'ipodnano2g' => { - name => 'iPod Nano 2nd gen', - status => 3, - }, - 'ipodvideo' => { - name => 'iPod Video 30GB', - status => 3, - }, - 'ipodvideo64mb' => { - name => 'iPod Video 60/80GB', - status => 3, - icon => 'ipodvideo', - manual => 'ipodvideo', - voice => 'ipodvideo', - configname => 'ipodvideo', - ram => 64 - }, - 'iriverh10' => { - name => 'iriver H10 20GB', - status => 3, - }, - 'iriverh10_5gb' => { - name => 'iriver H10 5GB', - status => 3, - manual => 'iriverh10', - }, - 'iriverh100' => { - name => 'iriver H100/115', - status => 3, - }, - 'iriverh120' => { - name => 'iriver H120/140', - status => 3, - icon => 'iriverh100', - manual => 'iriverh100', - }, - 'iriverh300' => { - name => 'iriver H320/340', - status => 3, - }, - 'iriverifp7xx' => { - name => 'iriver iFP-7xx', - status => 1, - }, - 'logikdax' => { - name => 'Logik DAX', - status => 1, - }, - 'lyreproto1' => { - name => 'Lyre Prototype 1', - status => 1, - }, - 'mini2440' => { - name => 'Mini 2440', - status => 1, - }, - 'meizum3' => { - name => 'Meizu M3', - status => 1, - }, - 'meizum6sl' => { - name => 'Meizu M6SL', - status => 1, - }, - 'meizum6sp' => { - name => 'Meizu M6SP', - status => 1, - }, - 'mrobe100' => { - name => 'Olympus M-Robe 100', - status => 3, - }, - 'mrobe500' => { - name => 'Olympus M-Robe 500', - status => 2, - }, - 'ondavx747' => { - name => 'Onda VX747', - status => 1, - }, - 'ondavx747p' => { - name => 'Onda VX747+', - status => 1, - }, - 'ondavx767' => { - name => 'Onda VX767', - status => 1, - }, - 'ondavx777' => { - name => 'Onda VX777', - status => 1, - }, - 'samsungyh820' => { - name => 'Samsung YH-820', - status => 2, - }, - 'samsungyh920' => { - name => 'Samsung YH-920', - status => 2, - }, - 'samsungyh925' => { - name => 'Samsung YH-925', - status => 2, - }, - 'samsungyps3' => { - name => 'Samsung YP-S3', - status => 1, - }, - 'sansac100' => { - name => 'SanDisk Sansa c100', - status => 1, - }, - 'sansac200' => { - name => 'SanDisk Sansa c200', - status => 3, - }, - 'sansac200v2' => { - name => 'SanDisk Sansa c200 v2', - status => 1, - icon => 'sansac200', - }, - 'sansaclip' => { - name => 'SanDisk Sansa Clip', - status => 2, - }, - 'sansaclipv2' => { - name => 'SanDisk Sansa Clip v2', - status => 1, - }, - 'sansae200' => { - name => 'SanDisk Sansa e200', - status => 3, - }, - 'sansae200r' => { - name => 'SanDisk Sansa e200R', - status => 3, - icon => 'sansae200', - }, - 'sansae200v2' => { - name => 'SanDisk Sansa e200 v2', - status => 3, - icon => 'sansae200', - }, - 'sansafuze' => { - name => 'SanDisk Sansa Fuze', - status => 2, - }, - 'sansam200' => { - name => 'SanDisk Sansa m200', - status => 1, - }, - 'sansam200v4' => { - name => 'SanDisk Sansa m200 v4', - status => 1, - }, - 'sansaview' => { - name => 'SanDisk Sansa View', - status => 1, - }, - 'tatungtpj1022' => { - name => 'Tatung Elio TPJ-1022', - status => 1, - }, - 'zenvision' => { - name => 'Creative Zen Vision', - status => 1, - }, - 'zenvisionm30gb' => { - name => 'Creative Zen Vision:M 30GB', - status => 1, - }, - 'zenvisionm60gb' => { - name => 'Creative Zen Vision:M 60GB', - status => 1, - }, -); - -sub manualname { - my $m = shift @_; - - return $builds{$m}{manual} ? "$builds{$m}{manual}" : $m; -} - -sub voicename { - my $m = shift @_; - - return $builds{$m}{voice} ? "$builds{$m}{voice}" : $m; -} - -sub byname { - return $builds{$a}{name} cmp $builds{$b}{name}; -} - -sub usablebuilds { - my @list; - - for my $b (sort byname keys %builds) { - push @list, $b if ($builds{$b}{status} >= 2); - } - - return @list; -} - -sub stablebuilds { - my @list; - - for my $b (sort byname keys %builds) { - push @list, $b if ($builds{$b}{status} >= 3); - } - - return @list; -} - -1; diff --git a/tools/checkwps/targets.txt b/tools/checkwps/targets.txt index 711d6784fa..33684b75a7 100644 --- a/tools/checkwps/targets.txt +++ b/tools/checkwps/targets.txt @@ -1,39 +1,39 @@ -ARCHOS_RECORDER archosrecorder -ARCHOS_FMRECORDER archosfmrecorder -ARCHOS_RECORDERV2 archosrecorderv2 -ARCHOS_ONDIOSP archosondiosp -ARCHOS_ONDIOFM archosondiofm -IRIVER_H120 iriverh120 -IRIVER_H300 iriverh300 -IRIVER_H100 iriverh100 -IRIVER_IFP7XX iriverifp7xx -IRIVER_H10 iriverh10 -IRIVER_H10_5GB iriverh10_5gb +ARCHOS_RECORDER recorder +ARCHOS_FMRECORDER fmrecorder +ARCHOS_RECORDERV2 recorderv2 +ARCHOS_ONDIOSP ondiosp +ARCHOS_ONDIOFM ondiofm +IRIVER_H120 h120 +IRIVER_H300 h300 +IRIVER_H100 h100 +IRIVER_IFP7XX ifp7xx +IRIVER_H10 h10 +IRIVER_H10_5GB h10_5gb IPOD_COLOR ipodcolor -IPOD_NANO ipodnano1g +IPOD_NANO ipodnano IPOD_VIDEO ipodvideo IPOD_3G ipod3g IPOD_4G ipod4g -IPOD_MINI ipodmini1g +IPOD_MINI ipodmini IPOD_MINI2G ipodmini2g IPOD_1G2G ipod1g2g -IAUDIO_X5 iaudiox5 -IAUDIO_M5 iaudiom5 +IAUDIO_X5 x5 +IAUDIO_M5 m5 COWON_D2 cowond2 -IAUDIO_M3 iaudiom3 -GIGABEAT_F gigabeatfx +IAUDIO_M3 m3 +GIGABEAT_F gigabeatf GIGABEAT_S gigabeats MROBE_500 mrobe500 MROBE_100 mrobe100 LOGIK_DAX logikdax -CREATIVE_ZVM zenvisionm30gb -CREATIVE_ZVM60GB zenvisionm60gb -CREATIVE_ZV zenvision -SANSA_E200 sansae200 -SANSA_E200 sansae200r -SANSA_C200 sansac200 -SANSA_M200 sansam200 -SANSA_C100 sansac100 -ELIO_TPJ1022 tatungtpj1022 +CREATIVE_ZVM creativezvm30gb +CREATIVE_ZVM60GB creativezvm60gb +CREATIVE_ZV creativezenvision +SANSA_E200 e200 +SANSA_E200 e200r +SANSA_C200 c200 +SANSA_M200 m200 +SANSA_C100 c100 +ELIO_TPJ1022 tpj1022 ONDA_VX747 ondavx747 ONDA_VX777 ondavx777 diff --git a/tools/configure b/tools/configure index 9745ae2a53..693113e19f 100755 --- a/tools/configure +++ b/tools/configure @@ -315,16 +315,16 @@ whichadvanced () { if [ "$memory" = "2" ]; then printf ", (8)MB MOD" fi - if [ "$modelname" = "archosplayer" ]; then + if [ "$modelname" = "player" ]; then printf ", Use (A)TA poweroff" fi if [ "$t_model" = "ondio" ]; then printf ", (B)acklight MOD" fi - if [ "$modelname" = "iaudiom5" ]; then + if [ "$modelname" = "m5" ]; then printf ", (F)M radio MOD" fi - if [ "$modelname" = "iriverh120" ]; then + if [ "$modelname" = "h120" ]; then printf ", (R)TC MOD" fi echo "" @@ -375,7 +375,7 @@ whichadvanced () { fi ;; [Aa]) - if [ "$modelname" = "archosplayer" ]; then + if [ "$modelname" = "player" ]; then have_ata_poweroff="#define HAVE_ATA_POWEROFF" echo "ATA poweroff enabled" fi @@ -387,13 +387,13 @@ whichadvanced () { fi ;; [Ff]) - if [ "$modelname" = "iaudiom5" ]; then + if [ "$modelname" = "m5" ]; then have_fmradio_in="#define HAVE_FMRADIO_IN" echo "FM radio functions enabled" fi ;; [Rr]) - if [ "$modelname" = "iriverh120" ]; then + if [ "$modelname" = "h120" ]; then config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" have_rtc_alarm="#define HAVE_RTC_ALARM" echo "RTC functions enabled (DS1339/DS3231)" @@ -839,7 +839,7 @@ else cat </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