diff options
author | Björn Stenberg <bjorn@haxx.se> | 2009-12-07 12:19:08 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2009-12-07 12:19:08 +0000 |
commit | c0740440ac9c830f59e8b5c9b3a8aecc49766506 (patch) | |
tree | 5ad47d05a66c0a1048d8bd6b304a66a8489248cd /tools/release | |
parent | ee15637749e293139f31a32548850cb549d3533e (diff) | |
download | rockbox-c0740440ac9c830f59e8b5c9b3a8aecc49766506.tar.gz rockbox-c0740440ac9c830f59e8b5c9b3a8aecc49766506.zip |
Rename targets to be consistent in all places. (FS #10819). Take 2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23883 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/release')
-rwxr-xr-x | tools/release/bins.pl | 47 | ||||
-rwxr-xr-x | tools/release/manuals.pl | 38 | ||||
-rwxr-xr-x | tools/release/sims.pl | 6 | ||||
-rwxr-xr-x | tools/release/voices.pl | 41 |
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 { | |||
73 | chdir "build-$dir"; | 73 | chdir "build-$dir"; |
74 | print "Build fonts in build-$dir\n" if($verbose); | 74 | print "Build fonts in build-$dir\n" if($verbose); |
75 | 75 | ||
76 | # build the manual(s) | 76 | # build the fonts |
77 | $a = buildfonts($dir, $confnum, $newl); | 77 | $a = buildfonts($dir, $confnum, $newl); |
78 | 78 | ||
79 | chdir ".."; | 79 | chdir ".."; |
@@ -98,8 +98,8 @@ sub buildit { | |||
98 | 98 | ||
99 | `rm -rf * >/dev/null 2>&1`; | 99 | `rm -rf * >/dev/null 2>&1`; |
100 | 100 | ||
101 | my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure', | 101 | my $ram = $extra ? $extra : -1; |
102 | $confnum, $extra); | 102 | my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; |
103 | 103 | ||
104 | print "C: $c\n" if($verbose); | 104 | print "C: $c\n" if($verbose); |
105 | `$c`; | 105 | `$c`; |
@@ -119,8 +119,8 @@ sub buildfonts { | |||
119 | 119 | ||
120 | `rm -rf * >/dev/null 2>&1`; | 120 | `rm -rf * >/dev/null 2>&1`; |
121 | 121 | ||
122 | my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure", | 122 | my $ram = $extra ? $extra : -1; |
123 | $confnum, $newl?'\n':''); | 123 | my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; |
124 | 124 | ||
125 | print "C: $c\n" if($verbose); | 125 | print "C: $c\n" if($verbose); |
126 | `$c`; | 126 | `$c`; |
@@ -133,37 +133,10 @@ sub buildfonts { | |||
133 | print "cd tools && make\n" if($verbose); | 133 | print "cd tools && make\n" if($verbose); |
134 | `(cd tools && make ) >/dev/null 2>&1`; | 134 | `(cd tools && make ) >/dev/null 2>&1`; |
135 | 135 | ||
136 | runone("player", "player", '\n'); | 136 | for my $b (&stablebuilds) { |
137 | runone("recorder", "recorder", '\n'); | 137 | my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b; |
138 | runone("recorder8mb", "recorder", '8\n'); | 138 | runone($b, $configname, $builds{b}{ram}); |
139 | runone("fmrecorder", "fmrecorder", '\n'); | 139 | } |
140 | runone("fmrecorder8mb", "fmrecorder", '8\n'); | ||
141 | runone("recorderv2", "recorderv2", '\n'); | ||
142 | runone("ondiosp", "ondiosp", '\n'); | ||
143 | runone("ondiofm", "ondiofm", '\n'); | ||
144 | runone("h100", "h100"); | ||
145 | runone("h120", "h120"); | ||
146 | runone("h300", "h300"); | ||
147 | runone("ipodcolor", "ipodcolor"); | ||
148 | runone("ipodnano", "ipodnano"); | ||
149 | runone("ipod4gray", "ipod4g"); | ||
150 | runone("ipodvideo", "ipodvideo", '32\n'); | ||
151 | runone("ipodvideo64mb", "ipodvideo", '64\n'); | ||
152 | runone("ipod3g", "ipod3g"); | ||
153 | runone("ipod1g2g", "ipod1g2g"); | ||
154 | runone("iaudiox5", "x5"); | ||
155 | runone("iaudiom5", "m5"); | ||
156 | runone("iaudiom3", "m3"); | ||
157 | runone("ipodmini1g", "ipodmini"); | ||
158 | runone("ipodmini2g", "ipodmini2g"); | ||
159 | runone("h10", "h10"); | ||
160 | runone("h10_5gb", "h10_5gb"); | ||
161 | runone("gigabeatf", "gigabeatf"); | ||
162 | runone("sansae200", "e200"); | ||
163 | runone("sansac200", "c200"); | ||
164 | #runone("mrobe500", "mrobe500"); | ||
165 | runone("mrobe100", "mrobe100"); | ||
166 | runone("cowond2", "cowond2"); | ||
167 | fonts("fonts", "x5"); | ||
168 | 140 | ||
141 | fonts("fonts", "iaudiox5"); | ||
169 | 142 | ||
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]) { | |||
16 | 16 | ||
17 | # made once for all targets | 17 | # made once for all targets |
18 | sub runone { | 18 | sub runone { |
19 | my ($dir, $conf, $nl)=@_; | 19 | my ($dir)=@_; |
20 | my $a; | 20 | my $a; |
21 | 21 | ||
22 | if($doonly && ($doonly ne $dir)) { | 22 | if($doonly && ($doonly ne $dir)) { |
@@ -28,7 +28,7 @@ sub runone { | |||
28 | print "Build in buildm-$dir\n" if($verbose); | 28 | print "Build in buildm-$dir\n" if($verbose); |
29 | 29 | ||
30 | # build the manual(s) | 30 | # build the manual(s) |
31 | $a = buildit($dir, $conf, $nl); | 31 | $a = buildit($dir); |
32 | 32 | ||
33 | chdir ".."; | 33 | chdir ".."; |
34 | 34 | ||
@@ -53,12 +53,11 @@ sub runone { | |||
53 | }; | 53 | }; |
54 | 54 | ||
55 | sub buildit { | 55 | sub buildit { |
56 | my ($target, $confnum, $newl)=@_; | 56 | my ($target)=@_; |
57 | 57 | ||
58 | `rm -rf * >/dev/null 2>&1`; | 58 | `rm -rf * >/dev/null 2>&1`; |
59 | 59 | ||
60 | my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure', | 60 | my $c = "../tools/configure --target=$target --type=m"; |
61 | $confnum, $newl?'\n':''); | ||
62 | 61 | ||
63 | print "C: $c\n" if($verbose); | 62 | print "C: $c\n" if($verbose); |
64 | `$c`; | 63 | `$c`; |
@@ -73,27 +72,8 @@ sub buildit { | |||
73 | # run make in tools first to make sure they're up-to-date | 72 | # run make in tools first to make sure they're up-to-date |
74 | `(cd tools && make ) >/dev/null 2>&1`; | 73 | `(cd tools && make ) >/dev/null 2>&1`; |
75 | 74 | ||
76 | runone("player", "player", 1); | 75 | for my $b (&stablebuilds) { |
77 | runone("recorder", "recorder", 1); | 76 | next if ($builds{$b}{configname} < 3); # no variants |
78 | runone("fmrecorder", "fmrecorder", 1); | 77 | |
79 | runone("recorderv2", "recorderv2", 1); | 78 | runone($b); |
80 | runone("ondiosp", "ondiosp", 1); | 79 | } |
81 | runone("ondiofm", "ondiofm", 1); | ||
82 | runone("h100", "h100"); | ||
83 | #runone("h120", 9); | ||
84 | runone("h300", "h300"); | ||
85 | runone("ipodcolor", "ipodcolor"); | ||
86 | runone("ipodnano", "ipodnano"); | ||
87 | runone("ipod4gray", "ipod4g"); | ||
88 | runone("ipodvideo", "ipodvideo", 1); | ||
89 | runone("ipod3g", "ipod3g"); | ||
90 | runone("ipod1g2g", "ipod1g2g"); | ||
91 | runone("iaudiox5", "x5"); | ||
92 | runone("iaudiom5", "m5"); | ||
93 | runone("ipodmini2g", "ipodmini2g"); | ||
94 | runone("h10", "h10"); | ||
95 | runone("h10_5gb", "h10_5gb"); | ||
96 | runone("gigabeatf", "gigabeatf"); | ||
97 | runone("sansae200", "e200"); | ||
98 | runone("sansac200", "c200"); | ||
99 | runone("mrobe100", "mrobe100"); | ||
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; | |||
4 | use File::Path; | 4 | use File::Path; |
5 | use Cwd; | 5 | use Cwd; |
6 | 6 | ||
7 | require "../builds.pm"; | ||
8 | |||
7 | my $verbose, $strip, $update, $doonly, $version; | 9 | my $verbose, $strip, $update, $doonly, $version; |
8 | my @doonly; | 10 | my @doonly; |
9 | 11 | ||
@@ -92,7 +94,7 @@ if (!defined($version)) { | |||
92 | 94 | ||
93 | # made once for all targets | 95 | # made once for all targets |
94 | sub runone { | 96 | sub runone { |
95 | my ($dir, $confnum, $extra)=@_; | 97 | my ($dir)=@_; |
96 | my $a; | 98 | my $a; |
97 | 99 | ||
98 | if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { | 100 | if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { |
@@ -104,7 +106,7 @@ sub runone { | |||
104 | print "Build in build-$dir\n" if($verbose); | 106 | print "Build in build-$dir\n" if($verbose); |
105 | 107 | ||
106 | # build the target | 108 | # build the target |
107 | $a = buildit($dir, $confnum, $extra); | 109 | $a = buildit($dir); |
108 | 110 | ||
109 | # Do not continue if the rockboxui executable is not created. This will | 111 | # Do not continue if the rockboxui executable is not created. This will |
110 | # prevent a good build getting overwritten by a bad build when | 112 | # 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]) { | |||
16 | 16 | ||
17 | # made once for all targets | 17 | # made once for all targets |
18 | sub runone { | 18 | sub runone { |
19 | my ($dir, $select, $newl)=@_; | 19 | my ($dir)=@_; |
20 | my $a; | 20 | my $a; |
21 | 21 | ||
22 | if($doonly && ($doonly ne $dir)) { | 22 | if($doonly && ($doonly ne $dir)) { |
@@ -28,7 +28,7 @@ sub runone { | |||
28 | print "Build in buildv-$dir\n" if($verbose); | 28 | print "Build in buildv-$dir\n" if($verbose); |
29 | 29 | ||
30 | # build the manual(s) | 30 | # build the manual(s) |
31 | $a = buildit($dir, $select, $newl); | 31 | $a = buildit($dir); |
32 | 32 | ||
33 | chdir ".."; | 33 | chdir ".."; |
34 | 34 | ||
@@ -50,13 +50,11 @@ sub runone { | |||
50 | }; | 50 | }; |
51 | 51 | ||
52 | sub buildit { | 52 | sub buildit { |
53 | my ($dir, $select, $newl)=@_; | 53 | my ($model)=@_; |
54 | 54 | ||
55 | `rm -rf * >/dev/null 2>&1`; | 55 | `rm -rf * >/dev/null 2>&1`; |
56 | 56 | ||
57 | # V (voice), F (festival), L (lame), [blank] (English) | 57 | my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f"; |
58 | my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure', | ||
59 | $select, $newl?'\n':""); | ||
60 | 58 | ||
61 | print "C: $c\n" if($verbose); | 59 | print "C: $c\n" if($verbose); |
62 | `$c`; | 60 | `$c`; |
@@ -75,31 +73,8 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool"; | |||
75 | `rm -f $pool/*`; | 73 | `rm -f $pool/*`; |
76 | $ENV{'POOL'}="$pool"; | 74 | $ENV{'POOL'}="$pool"; |
77 | 75 | ||
78 | runone("player", "player", 1); | 76 | for my $b (&stablebuilds) { |
79 | runone("recorder", "recorder", 1); | 77 | next if ($builds{$b}{configname} < 3); # no variants |
80 | runone("fmrecorder", "fmrecorder", 1); | ||
81 | runone("recorderv2", "recorderv2", 1); | ||
82 | runone("ondiosp", "ondiosp", 1); | ||
83 | runone("ondiofm", "ondiofm", 1); | ||
84 | runone("h100", "h100"); | ||
85 | runone("h120", "h120"); | ||
86 | runone("h300", "h300"); | ||
87 | runone("ipodcolor", "ipodcolor"); | ||
88 | runone("ipodnano", "ipodnano"); | ||
89 | runone("ipod4gray", "ipod4g"); | ||
90 | runone("ipodvideo", "ipodvideo", 1); | ||
91 | runone("ipod3g", "ipod3g"); | ||
92 | runone("ipod1g2g", "ipod1g2g"); | ||
93 | runone("iaudiox5", "x5"); | ||
94 | runone("iaudiom5", "m5"); | ||
95 | runone("iaudiom3", "m3"); | ||
96 | runone("ipodmini2g", "ipodmini2g"); | ||
97 | runone("ipodmini1g", "ipodmini"); | ||
98 | runone("h10", "h10"); | ||
99 | runone("h10_5gb", "h10_5gb"); | ||
100 | runone("gigabeatf", "gigabeatf"); | ||
101 | runone("sansae200", "e200"); | ||
102 | runone("sansac200", "c200"); | ||
103 | runone("mrobe100", "mrobe100"); | ||
104 | #runone("cowond2", "cowond2"); | ||
105 | 78 | ||
79 | runone($b); | ||
80 | } | ||