diff options
author | Michael Chicoine <mc2739@gmail.com> | 2009-12-10 19:50:25 +0000 |
---|---|---|
committer | Michael Chicoine <mc2739@gmail.com> | 2009-12-10 19:50:25 +0000 |
commit | f5c705264fc279acabd4deb19b74f70baf0f450e (patch) | |
tree | a17cd1fd872ad407413e27a02ae0da98a8f706b3 /tools | |
parent | ec64954c667628ab856b8c60b666e2b1eda50824 (diff) | |
download | rockbox-f5c705264fc279acabd4deb19b74f70baf0f450e.tar.gz rockbox-f5c705264fc279acabd4deb19b74f70baf0f450e.zip |
Get sims.pl working again after target rename
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23923 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r-- | tools/builds.pm | 9 | ||||
-rwxr-xr-x | tools/release/sims.pl | 92 |
2 files changed, 45 insertions, 56 deletions
diff --git a/tools/builds.pm b/tools/builds.pm index ef713b9191..de54f5871b 100644 --- a/tools/builds.pm +++ b/tools/builds.pm | |||
@@ -10,26 +10,32 @@ $releasenotes="/wiki/ReleaseNotes34"; | |||
10 | 'archosfmrecorder' => { | 10 | 'archosfmrecorder' => { |
11 | name => 'Archos FM Recorder', | 11 | name => 'Archos FM Recorder', |
12 | status => 3, | 12 | status => 3, |
13 | ram => 2, | ||
13 | }, | 14 | }, |
14 | 'archosondiofm' => { | 15 | 'archosondiofm' => { |
15 | name => 'Archos Ondio FM', | 16 | name => 'Archos Ondio FM', |
16 | status => 3, | 17 | status => 3, |
18 | ram => 2, | ||
17 | }, | 19 | }, |
18 | 'archosondiosp' => { | 20 | 'archosondiosp' => { |
19 | name => 'Archos Ondio SP', | 21 | name => 'Archos Ondio SP', |
20 | status => 3, | 22 | status => 3, |
23 | ram => 2, | ||
21 | }, | 24 | }, |
22 | 'archosplayer' => { | 25 | 'archosplayer' => { |
23 | name => 'Archos Player/Studio', | 26 | name => 'Archos Player/Studio', |
24 | status => 3, | 27 | status => 3, |
28 | ram => 2, | ||
25 | }, | 29 | }, |
26 | 'archosrecorder' => { | 30 | 'archosrecorder' => { |
27 | name => 'Archos Recorder v1', | 31 | name => 'Archos Recorder v1', |
28 | status => 3, | 32 | status => 3, |
33 | ram => 2, | ||
29 | }, | 34 | }, |
30 | 'archosrecorderv2' => { | 35 | 'archosrecorderv2' => { |
31 | name => 'Archos Recorder v2', | 36 | name => 'Archos Recorder v2', |
32 | status => 3, | 37 | status => 3, |
38 | ram => 2, | ||
33 | }, | 39 | }, |
34 | 'cowond2' => { | 40 | 'cowond2' => { |
35 | name => 'Cowon D2', | 41 | name => 'Cowon D2', |
@@ -104,6 +110,7 @@ $releasenotes="/wiki/ReleaseNotes34"; | |||
104 | 'ipodvideo' => { | 110 | 'ipodvideo' => { |
105 | name => 'iPod Video 30GB', | 111 | name => 'iPod Video 30GB', |
106 | status => 3, | 112 | status => 3, |
113 | ram => 32, | ||
107 | }, | 114 | }, |
108 | 'ipodvideo64mb' => { | 115 | 'ipodvideo64mb' => { |
109 | name => 'iPod Video 60/80GB', | 116 | name => 'iPod Video 60/80GB', |
@@ -112,7 +119,7 @@ $releasenotes="/wiki/ReleaseNotes34"; | |||
112 | manual => 'ipodvideo', | 119 | manual => 'ipodvideo', |
113 | voice => 'ipodvideo', | 120 | voice => 'ipodvideo', |
114 | configname => 'ipodvideo', | 121 | configname => 'ipodvideo', |
115 | ram => 64 | 122 | ram => 64, |
116 | }, | 123 | }, |
117 | 'iriverh10' => { | 124 | 'iriverh10' => { |
118 | name => 'iriver H10 20GB', | 125 | name => 'iriver H10 20GB', |
diff --git a/tools/release/sims.pl b/tools/release/sims.pl index abf652b312..a9d094c356 100755 --- a/tools/release/sims.pl +++ b/tools/release/sims.pl | |||
@@ -4,7 +4,7 @@ use File::Basename; | |||
4 | use File::Path; | 4 | use File::Path; |
5 | use Cwd; | 5 | use Cwd; |
6 | 6 | ||
7 | require "../builds.pm"; | 7 | require "tools/builds.pm"; |
8 | 8 | ||
9 | my $verbose, $strip, $update, $doonly, $version; | 9 | my $verbose, $strip, $update, $doonly, $version; |
10 | my @doonly; | 10 | my @doonly; |
@@ -94,7 +94,7 @@ if (!defined($version)) { | |||
94 | 94 | ||
95 | # made once for all targets | 95 | # made once for all targets |
96 | sub runone { | 96 | sub runone { |
97 | my ($dir)=@_; | 97 | my ($dir, $extra)=@_; |
98 | my $a; | 98 | my $a; |
99 | 99 | ||
100 | if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { | 100 | if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { |
@@ -106,7 +106,7 @@ sub runone { | |||
106 | print "Build in build-$dir\n" if($verbose); | 106 | print "Build in build-$dir\n" if($verbose); |
107 | 107 | ||
108 | # build the target | 108 | # build the target |
109 | $a = buildit($dir); | 109 | $a = buildit($dir, $extra); |
110 | 110 | ||
111 | # 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 |
112 | # prevent a good build getting overwritten by a bad build when | 112 | # prevent a good build getting overwritten by a bad build when |
@@ -176,7 +176,7 @@ sub runone { | |||
176 | }; | 176 | }; |
177 | 177 | ||
178 | sub buildit { | 178 | sub buildit { |
179 | my ($target, $confnum, $extra)=@_; | 179 | my ($dir, $extra)=@_; |
180 | 180 | ||
181 | `rm -rf * >/dev/null 2>&1`; | 181 | `rm -rf * >/dev/null 2>&1`; |
182 | 182 | ||
@@ -188,7 +188,7 @@ sub buildit { | |||
188 | } | 188 | } |
189 | 189 | ||
190 | my $c = sprintf('printf "%s\n%s%s" | ../tools/configure', | 190 | my $c = sprintf('printf "%s\n%s%s" | ../tools/configure', |
191 | $confnum, $extra, $simstring); | 191 | $dir, $extra, $simstring); |
192 | 192 | ||
193 | print "C: $c\n" if($verbose); | 193 | print "C: $c\n" if($verbose); |
194 | `$c`; | 194 | `$c`; |
@@ -200,53 +200,35 @@ sub buildit { | |||
200 | `make install 2>/dev/null`; | 200 | `make install 2>/dev/null`; |
201 | } | 201 | } |
202 | 202 | ||
203 | runone("player", "player", '\n'); | 203 | for my $b (sort byname keys %builds) { |
204 | runone("recorder", "recorder", '\n'); | 204 | if ($builds{$b}{status} >= 2) |
205 | #runone("recorder8mb", "recorder", '8\n'); | 205 | { |
206 | runone("fmrecorder", "fmrecorder", '\n'); | 206 | # ipodvideo64mb uses the ipodvideo simulator |
207 | #runone("fmrecorder8mb", "fmrecorder", '8\n'); | 207 | # sansae200r uses the sansae200 simulator |
208 | runone("recorderv2", "recorderv2", '\n'); | 208 | if ($b ne 'ipodvideo64mb' && $b ne 'sansae200r') |
209 | runone("ondiosp", "ondiosp", '\n'); | 209 | { |
210 | runone("ondiofm", "ondiofm", '\n'); | 210 | if ($builds{$b}{ram} ne '') |
211 | runone("h100", "h100"); | 211 | { |
212 | runone("h120", "h120"); | 212 | # These builds need the ram size sent to configure |
213 | runone("h300", "h300"); | 213 | runone($b, $builds{$b}{ram} . '\n'); |
214 | runone("ipodcolor", "ipodcolor"); | 214 | } |
215 | runone("ipodnano", "ipodnano"); | 215 | else |
216 | runone("ipod4gray", "ipod4g"); | 216 | { |
217 | runone("ipodvideo", "ipodvideo", '32\n'); | 217 | runone($b); |
218 | #runone("ipodvideo64mb", "ipodvideo", '64\n'); | 218 | } |
219 | runone("ipod3g", "ipod3g"); | 219 | } |
220 | runone("ipod1g2g", "ipod1g2g"); | 220 | } |
221 | runone("iaudiox5", "x5"); | 221 | } |
222 | runone("iaudiom5", "m5"); | 222 | |
223 | runone("iaudiom3", "m3"); | 223 | #The following ports are in the unusable category, but the simulator does build |
224 | runone("ipodmini1g", "ipodmini"); | 224 | runone("gogearhdd1630"); |
225 | runone("ipodmini2g", "ipodmini2g"); | 225 | runone("gogearsa9200"); |
226 | runone("h10", "h10"); | 226 | runone("mini2440"); |
227 | runone("h10_5gb", "h10_5gb"); | 227 | runone("ondavx747"); |
228 | runone("gigabeatf", "gigabeatf"); | 228 | runone("ondavx747p"); |
229 | runone("gigabeats", "gigabeats"); | 229 | runone("ondavx777"); |
230 | runone("sansae200", "e200"); | 230 | runone("sansac200v2"); |
231 | runone("sansae200v2", "e200v2"); | 231 | runone("sansam200v4"); |
232 | runone("sansac200", "c200"); | 232 | runone("zenvision"); |
233 | runone("mrobe500", "mrobe500"); | 233 | runone("zenvisionm30gb"); |
234 | runone("mrobe100", "mrobe100"); | 234 | runone("zenvisionm60gb"); |
235 | runone("cowond2", "cowond2"); | ||
236 | runone("clip", "clip"); | ||
237 | runone("zvm30gb", "creativezvm30gb"); | ||
238 | runone("zvm60gb", "creativezvm60gb"); | ||
239 | runone("zenvision", "creativezenvision"); | ||
240 | runone("hdd1630", "hdd1630"); | ||
241 | runone("fuze", "fuze"); | ||
242 | runone("m200v4", "m200v4"); | ||
243 | runone("sa9200", "sa9200"); | ||
244 | runone("sansac200v2", "c200v2"); | ||
245 | runone("yh820", "yh820"); | ||
246 | runone("yh920", "yh920"); | ||
247 | runone("yh925", "yh925"); | ||
248 | runone("ondavx747", "ondavx747"); | ||
249 | runone("ondavx747p", "ondavx747p"); | ||
250 | runone("ondavx777", "ondavx777"); | ||
251 | #runone("ifp7xx", "ifp7xx"); | ||
252 | runone("lyremini2440", "mini2440"); | ||