summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/builds.pm313
-rw-r--r--tools/checkwps/targets.txt52
-rwxr-xr-xtools/configure208
-rwxr-xr-xtools/release/bins.pl51
-rwxr-xr-xtools/release/manuals.pl41
-rwxr-xr-xtools/release/sims.pl66
-rwxr-xr-xtools/release/voices.pl44
7 files changed, 286 insertions, 489 deletions
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 @@
1$publicrelease="3.4";
2$releasedate="September 24, 2009";
3$releasenotes="/wiki/ReleaseNotes34";
4
5%builds = (
6 'archosav300' => {
7 name => 'Archos AV300',
8 status => 1, # 3=stable, 2=unstable, 1=unusable
9 },
10 'archosfmrecorder' => {
11 name => 'Archos FM Recorder',
12 status => 3,
13 },
14 'archosondiofm' => {
15 name => 'Archos Ondio FM',
16 status => 3,
17 },
18 'archosondiosp' => {
19 name => 'Archos Ondio SP',
20 status => 3,
21 },
22 'archosplayer' => {
23 name => 'Archos Player/Studio',
24 status => 3,
25 },
26 'archosrecorder' => {
27 name => 'Archos Recorder v1',
28 status => 3,
29 },
30 'archosrecorderv2' => {
31 name => 'Archos Recorder v2',
32 status => 3,
33 },
34 'cowond2' => {
35 name => 'Cowon D2',
36 status => 2,
37 },
38 'gigabeatfx' => {
39 name => 'Toshiba Gigabeat F/X',
40 status => 3,
41 },
42 'gigabeats' => {
43 name => 'Toshiba Gigabeat S',
44 status => 2,
45 },
46 'gogearhdd1630' => {
47 name => 'Philips GoGear HDD1630',
48 status => 1,
49 },
50 'gogearsa9200' => {
51 name => 'Philips GoGear SA9200',
52 status => 1,
53 },
54 'iaudio7' => {
55 name => 'iAudio 7',
56 status => 1,
57 },
58 'iaudiom3' => {
59 name => 'iAudio M3',
60 status => 3,
61 },
62 'iaudiom5' => {
63 name => 'iAudio M5',
64 status => 3,
65 },
66 'iaudiox5' => {
67 name => 'iAudio X5',
68 status => 3,
69 },
70 'ipod1g2g' => {
71 name => 'iPod 1st and 2nd gen',
72 status => 3,
73 },
74 'ipod3g' => {
75 name => 'iPod 3rd gen',
76 status => 3,
77 },
78 'ipod4g' => {
79 name => 'iPod 4th gen Grayscale',
80 status => 3,
81 },
82 'ipodcolor' => {
83 name => 'iPod color/Photo',
84 status => 3,
85 },
86 'ipodmini1g' => {
87 name => 'iPod Mini 1st gen',
88 status => 3,
89 manual => 'ipodmini2g',
90 },
91 'ipodmini2g' => {
92 name => 'iPod Mini 2nd gen',
93 status => 3,
94 icon => 'ipodmini1g',
95 },
96 'ipodnano1g' => {
97 name => 'iPod Nano 1st gen',
98 status => 3,
99 },
100 'ipodnano2g' => {
101 name => 'iPod Nano 2nd gen',
102 status => 3,
103 },
104 'ipodvideo' => {
105 name => 'iPod Video 30GB',
106 status => 3,
107 },
108 'ipodvideo64mb' => {
109 name => 'iPod Video 60/80GB',
110 status => 3,
111 icon => 'ipodvideo',
112 manual => 'ipodvideo',
113 voice => 'ipodvideo',
114 configname => 'ipodvideo',
115 ram => 64
116 },
117 'iriverh10' => {
118 name => 'iriver H10 20GB',
119 status => 3,
120 },
121 'iriverh10_5gb' => {
122 name => 'iriver H10 5GB',
123 status => 3,
124 manual => 'iriverh10',
125 },
126 'iriverh100' => {
127 name => 'iriver H100/115',
128 status => 3,
129 },
130 'iriverh120' => {
131 name => 'iriver H120/140',
132 status => 3,
133 icon => 'iriverh100',
134 manual => 'iriverh100',
135 },
136 'iriverh300' => {
137 name => 'iriver H320/340',
138 status => 3,
139 },
140 'iriverifp7xx' => {
141 name => 'iriver iFP-7xx',
142 status => 1,
143 },
144 'logikdax' => {
145 name => 'Logik DAX',
146 status => 1,
147 },
148 'lyreproto1' => {
149 name => 'Lyre Prototype 1',
150 status => 1,
151 },
152 'mini2440' => {
153 name => 'Mini 2440',
154 status => 1,
155 },
156 'meizum3' => {
157 name => 'Meizu M3',
158 status => 1,
159 },
160 'meizum6sl' => {
161 name => 'Meizu M6SL',
162 status => 1,
163 },
164 'meizum6sp' => {
165 name => 'Meizu M6SP',
166 status => 1,
167 },
168 'mrobe100' => {
169 name => 'Olympus M-Robe 100',
170 status => 3,
171 },
172 'mrobe500' => {
173 name => 'Olympus M-Robe 500',
174 status => 2,
175 },
176 'ondavx747' => {
177 name => 'Onda VX747',
178 status => 1,
179 },
180 'ondavx747p' => {
181 name => 'Onda VX747+',
182 status => 1,
183 },
184 'ondavx767' => {
185 name => 'Onda VX767',
186 status => 1,
187 },
188 'ondavx777' => {
189 name => 'Onda VX777',
190 status => 1,
191 },
192 'samsungyh820' => {
193 name => 'Samsung YH-820',
194 status => 2,
195 },
196 'samsungyh920' => {
197 name => 'Samsung YH-920',
198 status => 2,
199 },
200 'samsungyh925' => {
201 name => 'Samsung YH-925',
202 status => 2,
203 },
204 'samsungyps3' => {
205 name => 'Samsung YP-S3',
206 status => 1,
207 },
208 'sansac100' => {
209 name => 'SanDisk Sansa c100',
210 status => 1,
211 },
212 'sansac200' => {
213 name => 'SanDisk Sansa c200',
214 status => 3,
215 },
216 'sansac200v2' => {
217 name => 'SanDisk Sansa c200 v2',
218 status => 1,
219 icon => 'sansac200',
220 },
221 'sansaclip' => {
222 name => 'SanDisk Sansa Clip',
223 status => 2,
224 },
225 'sansaclipv2' => {
226 name => 'SanDisk Sansa Clip v2',
227 status => 1,
228 },
229 'sansae200' => {
230 name => 'SanDisk Sansa e200',
231 status => 3,
232 },
233 'sansae200r' => {
234 name => 'SanDisk Sansa e200R',
235 status => 3,
236 icon => 'sansae200',
237 },
238 'sansae200v2' => {
239 name => 'SanDisk Sansa e200 v2',
240 status => 3,
241 icon => 'sansae200',
242 },
243 'sansafuze' => {
244 name => 'SanDisk Sansa Fuze',
245 status => 2,
246 },
247 'sansam200' => {
248 name => 'SanDisk Sansa m200',
249 status => 1,
250 },
251 'sansam200v4' => {
252 name => 'SanDisk Sansa m200 v4',
253 status => 1,
254 },
255 'sansaview' => {
256 name => 'SanDisk Sansa View',
257 status => 1,
258 },
259 'tatungtpj1022' => {
260 name => 'Tatung Elio TPJ-1022',
261 status => 1,
262 },
263 'zenvision' => {
264 name => 'Creative Zen Vision',
265 status => 1,
266 },
267 'zenvisionm30gb' => {
268 name => 'Creative Zen Vision:M 30GB',
269 status => 1,
270 },
271 'zenvisionm60gb' => {
272 name => 'Creative Zen Vision:M 60GB',
273 status => 1,
274 },
275);
276
277sub manualname {
278 my $m = shift @_;
279
280 return $builds{$m}{manual} ? "$builds{$m}{manual}" : $m;
281}
282
283sub voicename {
284 my $m = shift @_;
285
286 return $builds{$m}{voice} ? "$builds{$m}{voice}" : $m;
287}
288
289sub byname {
290 return $builds{$a}{name} cmp $builds{$b}{name};
291}
292
293sub usablebuilds {
294 my @list;
295
296 for my $b (sort byname keys %builds) {
297 push @list, $b if ($builds{$b}{status} >= 2);
298 }
299
300 return @list;
301}
302
303sub stablebuilds {
304 my @list;
305
306 for my $b (sort byname keys %builds) {
307 push @list, $b if ($builds{$b}{status} >= 3);
308 }
309
310 return @list;
311}
312
3131;
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 @@
1ARCHOS_RECORDER archosrecorder 1ARCHOS_RECORDER recorder
2ARCHOS_FMRECORDER archosfmrecorder 2ARCHOS_FMRECORDER fmrecorder
3ARCHOS_RECORDERV2 archosrecorderv2 3ARCHOS_RECORDERV2 recorderv2
4ARCHOS_ONDIOSP archosondiosp 4ARCHOS_ONDIOSP ondiosp
5ARCHOS_ONDIOFM archosondiofm 5ARCHOS_ONDIOFM ondiofm
6IRIVER_H120 iriverh120 6IRIVER_H120 h120
7IRIVER_H300 iriverh300 7IRIVER_H300 h300
8IRIVER_H100 iriverh100 8IRIVER_H100 h100
9IRIVER_IFP7XX iriverifp7xx 9IRIVER_IFP7XX ifp7xx
10IRIVER_H10 iriverh10 10IRIVER_H10 h10
11IRIVER_H10_5GB iriverh10_5gb 11IRIVER_H10_5GB h10_5gb
12IPOD_COLOR ipodcolor 12IPOD_COLOR ipodcolor
13IPOD_NANO ipodnano1g 13IPOD_NANO ipodnano
14IPOD_VIDEO ipodvideo 14IPOD_VIDEO ipodvideo
15IPOD_3G ipod3g 15IPOD_3G ipod3g
16IPOD_4G ipod4g 16IPOD_4G ipod4g
17IPOD_MINI ipodmini1g 17IPOD_MINI ipodmini
18IPOD_MINI2G ipodmini2g 18IPOD_MINI2G ipodmini2g
19IPOD_1G2G ipod1g2g 19IPOD_1G2G ipod1g2g
20IAUDIO_X5 iaudiox5 20IAUDIO_X5 x5
21IAUDIO_M5 iaudiom5 21IAUDIO_M5 m5
22COWON_D2 cowond2 22COWON_D2 cowond2
23IAUDIO_M3 iaudiom3 23IAUDIO_M3 m3
24GIGABEAT_F gigabeatfx 24GIGABEAT_F gigabeatf
25GIGABEAT_S gigabeats 25GIGABEAT_S gigabeats
26MROBE_500 mrobe500 26MROBE_500 mrobe500
27MROBE_100 mrobe100 27MROBE_100 mrobe100
28LOGIK_DAX logikdax 28LOGIK_DAX logikdax
29CREATIVE_ZVM zenvisionm30gb 29CREATIVE_ZVM creativezvm30gb
30CREATIVE_ZVM60GB zenvisionm60gb 30CREATIVE_ZVM60GB creativezvm60gb
31CREATIVE_ZV zenvision 31CREATIVE_ZV creativezenvision
32SANSA_E200 sansae200 32SANSA_E200 e200
33SANSA_E200 sansae200r 33SANSA_E200 e200r
34SANSA_C200 sansac200 34SANSA_C200 c200
35SANSA_M200 sansam200 35SANSA_M200 m200
36SANSA_C100 sansac100 36SANSA_C100 c100
37ELIO_TPJ1022 tatungtpj1022 37ELIO_TPJ1022 tpj1022
38ONDA_VX747 ondavx747 38ONDA_VX747 ondavx747
39ONDA_VX777 ondavx777 39ONDA_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 () {
315 if [ "$memory" = "2" ]; then 315 if [ "$memory" = "2" ]; then
316 printf ", (8)MB MOD" 316 printf ", (8)MB MOD"
317 fi 317 fi
318 if [ "$modelname" = "archosplayer" ]; then 318 if [ "$modelname" = "player" ]; then
319 printf ", Use (A)TA poweroff" 319 printf ", Use (A)TA poweroff"
320 fi 320 fi
321 if [ "$t_model" = "ondio" ]; then 321 if [ "$t_model" = "ondio" ]; then
322 printf ", (B)acklight MOD" 322 printf ", (B)acklight MOD"
323 fi 323 fi
324 if [ "$modelname" = "iaudiom5" ]; then 324 if [ "$modelname" = "m5" ]; then
325 printf ", (F)M radio MOD" 325 printf ", (F)M radio MOD"
326 fi 326 fi
327 if [ "$modelname" = "iriverh120" ]; then 327 if [ "$modelname" = "h120" ]; then
328 printf ", (R)TC MOD" 328 printf ", (R)TC MOD"
329 fi 329 fi
330 echo "" 330 echo ""
@@ -375,7 +375,7 @@ whichadvanced () {
375 fi 375 fi
376 ;; 376 ;;
377 [Aa]) 377 [Aa])
378 if [ "$modelname" = "archosplayer" ]; then 378 if [ "$modelname" = "player" ]; then
379 have_ata_poweroff="#define HAVE_ATA_POWEROFF" 379 have_ata_poweroff="#define HAVE_ATA_POWEROFF"
380 echo "ATA poweroff enabled" 380 echo "ATA poweroff enabled"
381 fi 381 fi
@@ -387,13 +387,13 @@ whichadvanced () {
387 fi 387 fi
388 ;; 388 ;;
389 [Ff]) 389 [Ff])
390 if [ "$modelname" = "iaudiom5" ]; then 390 if [ "$modelname" = "m5" ]; then
391 have_fmradio_in="#define HAVE_FMRADIO_IN" 391 have_fmradio_in="#define HAVE_FMRADIO_IN"
392 echo "FM radio functions enabled" 392 echo "FM radio functions enabled"
393 fi 393 fi
394 ;; 394 ;;
395 [Rr]) 395 [Rr])
396 if [ "$modelname" = "iriverh120" ]; then 396 if [ "$modelname" = "h120" ]; then
397 config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" 397 config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231"
398 have_rtc_alarm="#define HAVE_RTC_ALARM" 398 have_rtc_alarm="#define HAVE_RTC_ALARM"
399 echo "RTC functions enabled (DS1339/DS3231)" 399 echo "RTC functions enabled (DS1339/DS3231)"
@@ -839,7 +839,7 @@ else
839cat <<EOF 839cat <<EOF
840 ==Archos== ==iriver== ==Apple iPod== 840 ==Archos== ==iriver== ==Apple iPod==
841 0) Player/Studio 10) H120/H140 20) Color/Photo 841 0) Player/Studio 10) H120/H140 20) Color/Photo
842 1) Recorder 11) H320/H340 21) Nano 1G 842 1) Recorder 11) H320/H340 21) Nano
843 2) FM Recorder 12) iHP-100/110/115 22) Video 843 2) FM Recorder 12) iHP-100/110/115 22) Video
844 3) Recorder v2 13) iFP-790 23) 3G 844 3) Recorder v2 13) iFP-790 23) 3G
845 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale 845 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale
@@ -928,9 +928,9 @@ fi
928 928
929 case $buildfor in 929 case $buildfor in
930 930
931 0|archosplayer) 931 0|player)
932 target_id=1 932 target_id=1
933 modelname="archosplayer" 933 modelname="player"
934 target="-DARCHOS_PLAYER" 934 target="-DARCHOS_PLAYER"
935 shcc 935 shcc
936 tool="$rootdir/tools/scramble" 936 tool="$rootdir/tools/scramble"
@@ -954,9 +954,9 @@ fi
954 t_model="player" 954 t_model="player"
955 ;; 955 ;;
956 956
957 1|archosrecorder) 957 1|recorder)
958 target_id=2 958 target_id=2
959 modelname="archosrecorder" 959 modelname="recorder"
960 target="-DARCHOS_RECORDER" 960 target="-DARCHOS_RECORDER"
961 shcc 961 shcc
962 tool="$rootdir/tools/scramble" 962 tool="$rootdir/tools/scramble"
@@ -976,9 +976,9 @@ fi
976 t_model="recorder" 976 t_model="recorder"
977 ;; 977 ;;
978 978
979 2|archosfmrecorder) 979 2|fmrecorder)
980 target_id=3 980 target_id=3
981 modelname="archosfmrecorder" 981 modelname="fmrecorder"
982 target="-DARCHOS_FMRECORDER" 982 target="-DARCHOS_FMRECORDER"
983 shcc 983 shcc
984 tool="$rootdir/tools/scramble -fm" 984 tool="$rootdir/tools/scramble -fm"
@@ -998,9 +998,9 @@ fi
998 t_model="fm_v2" 998 t_model="fm_v2"
999 ;; 999 ;;
1000 1000
1001 3|archosrecorderv2) 1001 3|recorderv2)
1002 target_id=4 1002 target_id=4
1003 modelname="archosrecorderv2" 1003 modelname="recorderv2"
1004 target="-DARCHOS_RECORDERV2" 1004 target="-DARCHOS_RECORDERV2"
1005 shcc 1005 shcc
1006 tool="$rootdir/tools/scramble -v2" 1006 tool="$rootdir/tools/scramble -v2"
@@ -1020,9 +1020,9 @@ fi
1020 t_model="fm_v2" 1020 t_model="fm_v2"
1021 ;; 1021 ;;
1022 1022
1023 4|archosondiosp) 1023 4|ondiosp)
1024 target_id=7 1024 target_id=7
1025 modelname="archosondiosp" 1025 modelname="ondiosp"
1026 target="-DARCHOS_ONDIOSP" 1026 target="-DARCHOS_ONDIOSP"
1027 shcc 1027 shcc
1028 tool="$rootdir/tools/scramble -osp" 1028 tool="$rootdir/tools/scramble -osp"
@@ -1042,9 +1042,9 @@ fi
1042 t_model="ondio" 1042 t_model="ondio"
1043 ;; 1043 ;;
1044 1044
1045 5|archosondiofm) 1045 5|ondiofm)
1046 target_id=8 1046 target_id=8
1047 modelname="archosondiofm" 1047 modelname="ondiofm"
1048 target="-DARCHOS_ONDIOFM" 1048 target="-DARCHOS_ONDIOFM"
1049 shcc 1049 shcc
1050 tool="$rootdir/tools/scramble -ofm" 1050 tool="$rootdir/tools/scramble -ofm"
@@ -1062,9 +1062,9 @@ fi
1062 t_model="ondio" 1062 t_model="ondio"
1063 ;; 1063 ;;
1064 1064
1065 6|archosav300) 1065 6|av300)
1066 target_id=38 1066 target_id=38
1067 modelname="archosav300" 1067 modelname="av300"
1068 target="-DARCHOS_AV300" 1068 target="-DARCHOS_AV300"
1069 memory=16 # always 1069 memory=16 # always
1070 arm7tdmicc 1070 arm7tdmicc
@@ -1084,9 +1084,9 @@ fi
1084 t_model="av300" 1084 t_model="av300"
1085 ;; 1085 ;;
1086 1086
1087 10|iriverh120) 1087 10|h120)
1088 target_id=9 1088 target_id=9
1089 modelname="iriverh120" 1089 modelname="h120"
1090 target="-DIRIVER_H120" 1090 target="-DIRIVER_H120"
1091 memory=32 # always 1091 memory=32 # always
1092 coldfirecc 1092 coldfirecc
@@ -1108,9 +1108,9 @@ fi
1108 t_model="h100" 1108 t_model="h100"
1109 ;; 1109 ;;
1110 1110
1111 11|iriverh300) 1111 11|h300)
1112 target_id=10 1112 target_id=10
1113 modelname="iriverh300" 1113 modelname="h300"
1114 target="-DIRIVER_H300" 1114 target="-DIRIVER_H300"
1115 memory=32 # always 1115 memory=32 # always
1116 coldfirecc 1116 coldfirecc
@@ -1131,9 +1131,9 @@ fi
1131 t_model="h300" 1131 t_model="h300"
1132 ;; 1132 ;;
1133 1133
1134 12|iriverh100) 1134 12|h100)
1135 target_id=11 1135 target_id=11
1136 modelname="iriverh100" 1136 modelname="h100"
1137 target="-DIRIVER_H100" 1137 target="-DIRIVER_H100"
1138 memory=16 # always 1138 memory=16 # always
1139 coldfirecc 1139 coldfirecc
@@ -1155,9 +1155,9 @@ fi
1155 t_model="h100" 1155 t_model="h100"
1156 ;; 1156 ;;
1157 1157
1158 13|iriverifp7xx) 1158 13|ifp7xx)
1159 target_id=19 1159 target_id=19
1160 modelname="iriverifp7xx" 1160 modelname="ifp7xx"
1161 target="-DIRIVER_IFP7XX" 1161 target="-DIRIVER_IFP7XX"
1162 memory=1 1162 memory=1
1163 arm7tdmicc short 1163 arm7tdmicc short
@@ -1176,9 +1176,9 @@ fi
1176 t_model="iriver-ifp7xx" 1176 t_model="iriver-ifp7xx"
1177 ;; 1177 ;;
1178 1178
1179 14|iriverh10) 1179 14|h10)
1180 target_id=22 1180 target_id=22
1181 modelname="iriverh10" 1181 modelname="h10"
1182 target="-DIRIVER_H10" 1182 target="-DIRIVER_H10"
1183 memory=32 # always 1183 memory=32 # always
1184 arm7tdmicc 1184 arm7tdmicc
@@ -1200,9 +1200,9 @@ fi
1200 t_model="h10" 1200 t_model="h10"
1201 ;; 1201 ;;
1202 1202
1203 15|iriverh10_5gb) 1203 15|h10_5gb)
1204 target_id=24 1204 target_id=24
1205 modelname="iriverh10_5gb" 1205 modelname="h10_5gb"
1206 target="-DIRIVER_H10_5GB" 1206 target="-DIRIVER_H10_5GB"
1207 memory=32 # always 1207 memory=32 # always
1208 arm7tdmicc 1208 arm7tdmicc
@@ -1247,9 +1247,9 @@ fi
1247 t_model="color" 1247 t_model="color"
1248 ;; 1248 ;;
1249 1249
1250 21|ipodnano1g) 1250 21|ipodnano)
1251 target_id=14 1251 target_id=14
1252 modelname="ipodnano1g" 1252 modelname="ipodnano"
1253 target="-DIPOD_NANO" 1253 target="-DIPOD_NANO"
1254 memory=32 # always 1254 memory=32 # always
1255 arm7tdmicc 1255 arm7tdmicc
@@ -1338,9 +1338,9 @@ fi
1338 t_model="4g" 1338 t_model="4g"
1339 ;; 1339 ;;
1340 1340
1341 25|ipodmini1g) 1341 25|ipodmini)
1342 target_id=18 1342 target_id=18
1343 modelname="ipodmini1g" 1343 modelname="ipodmini"
1344 target="-DIPOD_MINI" 1344 target="-DIPOD_MINI"
1345 memory=32 # always 1345 memory=32 # always
1346 arm7tdmicc 1346 arm7tdmicc
@@ -1431,9 +1431,9 @@ fi
1431 t_model="ipodnano2g" 1431 t_model="ipodnano2g"
1432 ;; 1432 ;;
1433 1433
1434 30|iaudiox5) 1434 30|x5)
1435 target_id=12 1435 target_id=12
1436 modelname="iaudiox5" 1436 modelname="x5"
1437 target="-DIAUDIO_X5" 1437 target="-DIAUDIO_X5"
1438 memory=16 # always 1438 memory=16 # always
1439 coldfirecc 1439 coldfirecc
@@ -1455,9 +1455,9 @@ fi
1455 t_model="x5" 1455 t_model="x5"
1456 ;; 1456 ;;
1457 1457
1458 31|iaudiom5) 1458 31|m5)
1459 target_id=28 1459 target_id=28
1460 modelname="iaudiom5" 1460 modelname="m5"
1461 target="-DIAUDIO_M5" 1461 target="-DIAUDIO_M5"
1462 memory=16 # always 1462 memory=16 # always
1463 coldfirecc 1463 coldfirecc
@@ -1524,9 +1524,9 @@ fi
1524 t_model="cowond2" 1524 t_model="cowond2"
1525 ;; 1525 ;;
1526 1526
1527 34|iaudiom3) 1527 34|m3)
1528 target_id=37 1528 target_id=37
1529 modelname="iaudiom3" 1529 modelname="m3"
1530 target="-DIAUDIO_M3" 1530 target="-DIAUDIO_M3"
1531 memory=16 # always 1531 memory=16 # always
1532 coldfirecc 1532 coldfirecc
@@ -1546,9 +1546,9 @@ fi
1546 t_model="m3" 1546 t_model="m3"
1547 ;; 1547 ;;
1548 1548
1549 40|gigabeatfx) 1549 40|gigabeatf)
1550 target_id=20 1550 target_id=20
1551 modelname="gigabeatfx" 1551 modelname="gigabeatf"
1552 target="-DGIGABEAT_F" 1552 target="-DGIGABEAT_F"
1553 memory=32 # always 1553 memory=32 # always
1554 arm9tdmicc 1554 arm9tdmicc
@@ -1664,9 +1664,9 @@ fi
1664 t_model="logikdax" 1664 t_model="logikdax"
1665 ;; 1665 ;;
1666 1666
1667 90|zenvisionm30gb) 1667 90|creativezvm30gb)
1668 target_id=35 1668 target_id=35
1669 modelname="zenvisionm30gb" 1669 modelname="creativezvm30"
1670 target="-DCREATIVE_ZVM" 1670 target="-DCREATIVE_ZVM"
1671 memory=64 1671 memory=64
1672 arm926ejscc 1672 arm926ejscc
@@ -1687,9 +1687,9 @@ fi
1687 t_model="creative-zvm" 1687 t_model="creative-zvm"
1688 ;; 1688 ;;
1689 1689
1690 91|zenvisionm60gb) 1690 91|creativezvm60gb)
1691 target_id=40 1691 target_id=40
1692 modelname="creativezvm60gb" 1692 modelname="creativezvm60"
1693 target="-DCREATIVE_ZVM60GB" 1693 target="-DCREATIVE_ZVM60GB"
1694 memory=64 1694 memory=64
1695 arm926ejscc 1695 arm926ejscc
@@ -1710,9 +1710,9 @@ fi
1710 t_model="creative-zvm" 1710 t_model="creative-zvm"
1711 ;; 1711 ;;
1712 1712
1713 92|zenvision) 1713 92|creativezenvision)
1714 target_id=39 1714 target_id=39
1715 modelname="zenvision" 1715 modelname="creativezv"
1716 target="-DCREATIVE_ZV" 1716 target="-DCREATIVE_ZV"
1717 memory=64 1717 memory=64
1718 arm926ejscc 1718 arm926ejscc
@@ -1733,9 +1733,9 @@ fi
1733 t_model="creative-zvm" 1733 t_model="creative-zvm"
1734 ;; 1734 ;;
1735 1735
1736 50|sansae200) 1736 50|e200)
1737 target_id=23 1737 target_id=23
1738 modelname="sansae200" 1738 modelname="e200"
1739 target="-DSANSA_E200" 1739 target="-DSANSA_E200"
1740 memory=32 # supposedly 1740 memory=32 # supposedly
1741 arm7tdmicc 1741 arm7tdmicc
@@ -1757,12 +1757,12 @@ fi
1757 t_model="sansa-e200" 1757 t_model="sansa-e200"
1758 ;; 1758 ;;
1759 1759
1760 51|sansae200r) 1760 51|e200r)
1761 # the e200R model is pretty much identical to the e200, it only has a 1761 # the e200R model is pretty much identical to the e200, it only has a
1762 # different option to the scramble tool when building a bootloader and 1762 # different option to the scramble tool when building a bootloader and
1763 # makes the bootloader output file name in all lower case. 1763 # makes the bootloader output file name in all lower case.
1764 target_id=27 1764 target_id=27
1765 modelname="sansae200r" 1765 modelname="e200r"
1766 target="-DSANSA_E200" 1766 target="-DSANSA_E200"
1767 memory=32 # supposedly 1767 memory=32 # supposedly
1768 arm7tdmicc 1768 arm7tdmicc
@@ -1784,9 +1784,9 @@ fi
1784 t_model="sansa-e200" 1784 t_model="sansa-e200"
1785 ;; 1785 ;;
1786 1786
1787 52|sansac200) 1787 52|c200)
1788 target_id=30 1788 target_id=30
1789 modelname="sansac200" 1789 modelname="c200"
1790 target="-DSANSA_C200" 1790 target="-DSANSA_C200"
1791 memory=32 # supposedly 1791 memory=32 # supposedly
1792 arm7tdmicc 1792 arm7tdmicc
@@ -1808,9 +1808,9 @@ fi
1808 t_model="sansa-c200" 1808 t_model="sansa-c200"
1809 ;; 1809 ;;
1810 1810
1811 53|sansam200) 1811 53|m200)
1812 target_id=48 1812 target_id=48
1813 modelname="sansam200" 1813 modelname="m200"
1814 target="-DSANSA_M200" 1814 target="-DSANSA_M200"
1815 memory=1 # always 1815 memory=1 # always
1816 arm946cc 1816 arm946cc
@@ -1832,9 +1832,9 @@ fi
1832 t_model="m200" 1832 t_model="m200"
1833 ;; 1833 ;;
1834 1834
1835 54|sansac100) 1835 54|c100)
1836 target_id=42 1836 target_id=42
1837 modelname="sansac100" 1837 modelname="c100"
1838 target="-DSANSA_C100" 1838 target="-DSANSA_C100"
1839 memory=2 1839 memory=2
1840 arm946cc 1840 arm946cc
@@ -1856,9 +1856,9 @@ fi
1856 t_model="c100" 1856 t_model="c100"
1857 ;; 1857 ;;
1858 1858
1859 55|sansaclip) 1859 55|Clip|clip)
1860 target_id=50 1860 target_id=50
1861 modelname="sansaclip" 1861 modelname="clip"
1862 target="-DSANSA_CLIP" 1862 target="-DSANSA_CLIP"
1863 memory=2 1863 memory=2
1864 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" 1864 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1877,9 +1877,9 @@ fi
1877 ;; 1877 ;;
1878 1878
1879 1879
1880 56|sansae200v2) 1880 56|e200v2)
1881 target_id=51 1881 target_id=51
1882 modelname="sansae200v2" 1882 modelname="e200v2"
1883 target="-DSANSA_E200V2" 1883 target="-DSANSA_E200V2"
1884 memory=8 1884 memory=8
1885 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" 1885 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1898,9 +1898,9 @@ fi
1898 ;; 1898 ;;
1899 1899
1900 1900
1901 57|sansam200v4) 1901 57|m200v4)
1902 target_id=52 1902 target_id=52
1903 modelname="sansam200v4" 1903 modelname="m200v4"
1904 target="-DSANSA_M200V4" 1904 target="-DSANSA_M200V4"
1905 memory=2 1905 memory=2
1906 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" 1906 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1919,9 +1919,9 @@ fi
1919 ;; 1919 ;;
1920 1920
1921 1921
1922 58|sansafuze) 1922 58|fuze)
1923 target_id=53 1923 target_id=53
1924 modelname="sansafuze" 1924 modelname="fuze"
1925 target="-DSANSA_FUZE" 1925 target="-DSANSA_FUZE"
1926 memory=8 1926 memory=8
1927 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" 1927 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1940,9 +1940,9 @@ fi
1940 ;; 1940 ;;
1941 1941
1942 1942
1943 59|sansac200v2) 1943 59|c200v2)
1944 target_id=55 1944 target_id=55
1945 modelname="sansac200v2" 1945 modelname="c200v2"
1946 target="-DSANSA_C200V2" 1946 target="-DSANSA_C200V2"
1947 memory=2 # as per OF diagnosis mode 1947 memory=2 # as per OF diagnosis mode
1948 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" 1948 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1963,11 +1963,11 @@ fi
1963 arm9tdmicc 1963 arm9tdmicc
1964 ;; 1964 ;;
1965 1965
1966 60|sansaclipv2) 1966 60|Clipv2|clipv2)
1967 echo "Sansa Clipv2 is not yet supported !" 1967 echo "Sansa Clipv2 is not yet supported !"
1968 exit 1 1968 exit 1
1969 target_id=60 1969 target_id=60
1970 modelname="sansaclipv2" 1970 modelname="clipv2"
1971 target="-DSANSA_CLIPV2" 1971 target="-DSANSA_CLIPV2"
1972 memory=8 1972 memory=8
1973 arm926ejscc 1973 arm926ejscc
@@ -1985,11 +1985,11 @@ fi
1985 t_model="sansa-clipv2" 1985 t_model="sansa-clipv2"
1986 ;; 1986 ;;
1987 1987
1988 61|sansaview) 1988 61|view)
1989 echo "Sansa View is not yet supported!" 1989 echo "Sansa View is not yet supported!"
1990 exit 1 1990 exit 1
1991 target_id=63 1991 target_id=63
1992 modelname="sansaview" 1992 modelname="view"
1993 target="-DSANSA_VIEW" 1993 target="-DSANSA_VIEW"
1994 memory=32 1994 memory=32
1995 arm1176jzscc 1995 arm1176jzscc
@@ -2009,10 +2009,10 @@ fi
2009 t_model="sansa-view" 2009 t_model="sansa-view"
2010 ;; 2010 ;;
2011 2011
2012 150|tatungtpj1022) 2012 150|tpj1022)
2013 target_id=25 2013 target_id=25
2014 modelname="tatungtpj1022" 2014 modelname="tpj1022"
2015 target="-DTATUNG_TPJ1022" 2015 target="-DELIO_TPJ1022"
2016 memory=32 # always 2016 memory=32 # always
2017 arm7tdmicc 2017 arm7tdmicc
2018 tool="$rootdir/tools/scramble -add tpj2" 2018 tool="$rootdir/tools/scramble -add tpj2"
@@ -2033,9 +2033,9 @@ fi
2033 t_model="tpj1022" 2033 t_model="tpj1022"
2034 ;; 2034 ;;
2035 2035
2036 100|gogearsa9200) 2036 100|sa9200)
2037 target_id=41 2037 target_id=41
2038 modelname="gogearsa9200" 2038 modelname="sa9200"
2039 target="-DPHILIPS_SA9200" 2039 target="-DPHILIPS_SA9200"
2040 memory=32 # supposedly 2040 memory=32 # supposedly
2041 arm7tdmicc 2041 arm7tdmicc
@@ -2057,9 +2057,9 @@ fi
2057 t_model="sa9200" 2057 t_model="sa9200"
2058 ;; 2058 ;;
2059 2059
2060 101|gogearhdd1630) 2060 101|hdd1630)
2061 target_id=43 2061 target_id=43
2062 modelname="gogearhdd1630" 2062 modelname="hdd1630"
2063 target="-DPHILIPS_HDD1630" 2063 target="-DPHILIPS_HDD1630"
2064 memory=32 # supposedly 2064 memory=32 # supposedly
2065 arm7tdmicc 2065 arm7tdmicc
@@ -2235,9 +2235,9 @@ fi
2235 t_model="onda_vx747" 2235 t_model="onda_vx747"
2236 ;; 2236 ;;
2237 2237
2238 130|lyreproto1) 2238 130|lyre_proto1)
2239 target_id=56 2239 target_id=56
2240 modelname="lyreproto1" 2240 modelname="lyre_proto1"
2241 target="-DLYRE_PROTO1" 2241 target="-DLYRE_PROTO1"
2242 memory=64 2242 memory=64
2243 arm926ejscc 2243 arm926ejscc
@@ -2257,9 +2257,9 @@ fi
2257 t_model="lyre_proto1" 2257 t_model="lyre_proto1"
2258 ;; 2258 ;;
2259 2259
2260 140|samsungyh820) 2260 140|yh820)
2261 target_id=57 2261 target_id=57
2262 modelname="samsungyh820" 2262 modelname="yh820"
2263 target="-DSAMSUNG_YH820" 2263 target="-DSAMSUNG_YH820"
2264 memory=32 # always 2264 memory=32 # always
2265 arm7tdmicc 2265 arm7tdmicc
@@ -2281,9 +2281,9 @@ fi
2281 t_model="yh820" 2281 t_model="yh820"
2282 ;; 2282 ;;
2283 2283
2284 141|samsungyh920) 2284 141|yh920)
2285 target_id=58 2285 target_id=58
2286 modelname="samsungyh920" 2286 modelname="yh920"
2287 target="-DSAMSUNG_YH920" 2287 target="-DSAMSUNG_YH920"
2288 memory=32 # always 2288 memory=32 # always
2289 arm7tdmicc 2289 arm7tdmicc
@@ -2305,9 +2305,9 @@ fi
2305 t_model="yh920" 2305 t_model="yh920"
2306 ;; 2306 ;;
2307 2307
2308 142|samsungyh925) 2308 142|yh925)
2309 target_id=59 2309 target_id=59
2310 modelname="samsungyh925" 2310 modelname="yh925"
2311 target="-DSAMSUNG_YH925" 2311 target="-DSAMSUNG_YH925"
2312 memory=32 # always 2312 memory=32 # always
2313 arm7tdmicc 2313 arm7tdmicc
@@ -2329,9 +2329,9 @@ fi
2329 t_model="yh925" 2329 t_model="yh925"
2330 ;; 2330 ;;
2331 2331
2332 143|samsungyps3) 2332 143|yps3)
2333 target_id=60 2333 target_id=60
2334 modelname="samsungyps3" 2334 modelname="yps3"
2335 target="-DSAMSUNG_YPS3" 2335 target="-DSAMSUNG_YPS3"
2336 memory=16 # always 2336 memory=16 # always
2337 arm940tbecc 2337 arm940tbecc
@@ -2415,13 +2415,13 @@ fi
2415 # the ifp7x0 is the only platform that supports building a gdb stub like 2415 # the ifp7x0 is the only platform that supports building a gdb stub like
2416 # this 2416 # this
2417case $modelname in 2417case $modelname in
2418 iriverifp7xx) 2418 ifp7xx)
2419 gdbstub="(G)DB stub, " 2419 gdbstub="(G)DB stub, "
2420 ;; 2420 ;;
2421 sansae200r|sansae200) 2421 e200r|e200)
2422 gdbstub="(I)nstaller, " 2422 gdbstub="(I)nstaller, "
2423 ;; 2423 ;;
2424 sansac200) 2424 c200)
2425 gdbstub="(E)raser, " 2425 gdbstub="(E)raser, "
2426 ;; 2426 ;;
2427 *) 2427 *)
@@ -2498,7 +2498,7 @@ fi
2498 appsdir='\$(ROOTDIR)/gdb' 2498 appsdir='\$(ROOTDIR)/gdb'
2499 apps="stub" 2499 apps="stub"
2500 case $modelname in 2500 case $modelname in
2501 iriverifp7xx) 2501 ifp7xx)
2502 output="stub.wma" 2502 output="stub.wma"
2503 ;; 2503 ;;
2504 *) 2504 *)
@@ -2523,7 +2523,7 @@ fi
2523 echo "CheckWPS build selected" 2523 echo "CheckWPS build selected"
2524 ;; 2524 ;;
2525 *) 2525 *)
2526 if [ "$modelname" = "sansae200r" ]; then 2526 if [ "$modelname" = "e200r" ]; then
2527 echo "Do not use the e200R target for regular builds. Use e200 instead." 2527 echo "Do not use the e200R target for regular builds. Use e200 instead."
2528 exit 8 2528 exit 8
2529 fi 2529 fi
@@ -2535,17 +2535,17 @@ fi
2535 esac 2535 esac
2536 # to be able running "make manual" from non-manual configuration 2536 # to be able running "make manual" from non-manual configuration
2537 case $modelname in 2537 case $modelname in
2538 archosfmrecorder) 2538 fmrecorder)
2539 manualdev="archosrecorderv2fm" 2539 manualdev="recorderv2fm"
2540 ;; 2540 ;;
2541 archosrecorderv2) 2541 recorderv2)
2542 manualdev="archosrecorderv2fm" 2542 manualdev="recorderv2fm"
2543 ;; 2543 ;;
2544 iriverh1??) 2544 h1??)
2545 manualdev="iriverh100" 2545 manualdev="h100"
2546 ;; 2546 ;;
2547 ipodmini2g) 2547 ipodmini2g)
2548 manualdev="ipodmini1g" 2548 manualdev="ipodmini"
2549 ;; 2549 ;;
2550 *) 2550 *)
2551 manualdev=$modelname 2551 manualdev=$modelname
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 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2 2
3require "../builds.pm"; 3$version="3.4";
4
5$version=$publicrelease;
6 4
7my $verbose; 5my $verbose;
8if($ARGV[0] eq "-v") { 6if($ARGV[0] eq "-v") {
@@ -75,7 +73,7 @@ sub fonts {
75 chdir "build-$dir"; 73 chdir "build-$dir";
76 print "Build fonts in build-$dir\n" if($verbose); 74 print "Build fonts in build-$dir\n" if($verbose);
77 75
78 # build the fonts 76 # build the manual(s)
79 $a = buildfonts($dir, $confnum, $newl); 77 $a = buildfonts($dir, $confnum, $newl);
80 78
81 chdir ".."; 79 chdir "..";
@@ -100,8 +98,8 @@ sub buildit {
100 98
101 `rm -rf * >/dev/null 2>&1`; 99 `rm -rf * >/dev/null 2>&1`;
102 100
103 my $ram = $extra ? $extra : -1; 101 my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure',
104 my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; 102 $confnum, $extra);
105 103
106 print "C: $c\n" if($verbose); 104 print "C: $c\n" if($verbose);
107 `$c`; 105 `$c`;
@@ -121,8 +119,8 @@ sub buildfonts {
121 119
122 `rm -rf * >/dev/null 2>&1`; 120 `rm -rf * >/dev/null 2>&1`;
123 121
124 my $ram = $extra ? $extra : -1; 122 my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure",
125 my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; 123 $confnum, $newl?'\n':'');
126 124
127 print "C: $c\n" if($verbose); 125 print "C: $c\n" if($verbose);
128 `$c`; 126 `$c`;
@@ -135,10 +133,37 @@ sub buildfonts {
135print "cd tools && make\n" if($verbose); 133print "cd tools && make\n" if($verbose);
136`(cd tools && make ) >/dev/null 2>&1`; 134`(cd tools && make ) >/dev/null 2>&1`;
137 135
138for my $b (&stablebuilds) { 136runone("player", "player", '\n');
139 my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b; 137runone("recorder", "recorder", '\n');
140 runone($b, $configname, $builds{b}{ram}); 138runone("recorder8mb", "recorder", '8\n');
141} 139runone("fmrecorder", "fmrecorder", '\n');
140runone("fmrecorder8mb", "fmrecorder", '8\n');
141runone("recorderv2", "recorderv2", '\n');
142runone("ondiosp", "ondiosp", '\n');
143runone("ondiofm", "ondiofm", '\n');
144runone("h100", "h100");
145runone("h120", "h120");
146runone("h300", "h300");
147runone("ipodcolor", "ipodcolor");
148runone("ipodnano", "ipodnano");
149runone("ipod4gray", "ipod4g");
150runone("ipodvideo", "ipodvideo", '32\n');
151runone("ipodvideo64mb", "ipodvideo", '64\n');
152runone("ipod3g", "ipod3g");
153runone("ipod1g2g", "ipod1g2g");
154runone("iaudiox5", "x5");
155runone("iaudiom5", "m5");
156runone("iaudiom3", "m3");
157runone("ipodmini1g", "ipodmini");
158runone("ipodmini2g", "ipodmini2g");
159runone("h10", "h10");
160runone("h10_5gb", "h10_5gb");
161runone("gigabeatf", "gigabeatf");
162runone("sansae200", "e200");
163runone("sansac200", "c200");
164#runone("mrobe500", "mrobe500");
165runone("mrobe100", "mrobe100");
166runone("cowond2", "cowond2");
167fonts("fonts", "x5");
142 168
143fonts("fonts", "iaudiox5");
144 169
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 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2 2
3require "../builds.pm"; 3$version="3.4";
4my $version = $publicrelease;
5 4
6my $verbose; 5my $verbose;
7if($ARGV[0] eq "-v") { 6if($ARGV[0] eq "-v") {
@@ -17,7 +16,7 @@ if($ARGV[0]) {
17 16
18# made once for all targets 17# made once for all targets
19sub runone { 18sub runone {
20 my ($dir)=@_; 19 my ($dir, $conf, $nl)=@_;
21 my $a; 20 my $a;
22 21
23 if($doonly && ($doonly ne $dir)) { 22 if($doonly && ($doonly ne $dir)) {
@@ -29,7 +28,7 @@ sub runone {
29 print "Build in buildm-$dir\n" if($verbose); 28 print "Build in buildm-$dir\n" if($verbose);
30 29
31 # build the manual(s) 30 # build the manual(s)
32 $a = buildit($dir); 31 $a = buildit($dir, $conf, $nl);
33 32
34 chdir ".."; 33 chdir "..";
35 34
@@ -54,11 +53,12 @@ sub runone {
54}; 53};
55 54
56sub buildit { 55sub buildit {
57 my ($target)=@_; 56 my ($target, $confnum, $newl)=@_;
58 57
59 `rm -rf * >/dev/null 2>&1`; 58 `rm -rf * >/dev/null 2>&1`;
60 59
61 my $c = "../tools/configure --target=$target --type=m"; 60 my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure',
61 $confnum, $newl?'\n':'');
62 62
63 print "C: $c\n" if($verbose); 63 print "C: $c\n" if($verbose);
64 `$c`; 64 `$c`;
@@ -73,8 +73,27 @@ sub buildit {
73# run make in tools first to make sure they're up-to-date 73# run make in tools first to make sure they're up-to-date
74`(cd tools && make ) >/dev/null 2>&1`; 74`(cd tools && make ) >/dev/null 2>&1`;
75 75
76for my $b (&stablebuilds) { 76runone("player", "player", 1);
77 next if ($builds{$b}{configname} < 3); # no variants 77runone("recorder", "recorder", 1);
78 78runone("fmrecorder", "fmrecorder", 1);
79 runone($b); 79runone("recorderv2", "recorderv2", 1);
80} 80runone("ondiosp", "ondiosp", 1);
81runone("ondiofm", "ondiofm", 1);
82runone("h100", "h100");
83#runone("h120", 9);
84runone("h300", "h300");
85runone("ipodcolor", "ipodcolor");
86runone("ipodnano", "ipodnano");
87runone("ipod4gray", "ipod4g");
88runone("ipodvideo", "ipodvideo", 1);
89runone("ipod3g", "ipod3g");
90runone("ipod1g2g", "ipod1g2g");
91runone("iaudiox5", "x5");
92runone("iaudiom5", "m5");
93runone("ipodmini2g", "ipodmini2g");
94runone("h10", "h10");
95runone("h10_5gb", "h10_5gb");
96runone("gigabeatf", "gigabeatf");
97runone("sansae200", "e200");
98runone("sansac200", "c200");
99runone("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;
4use File::Path; 4use File::Path;
5use Cwd; 5use Cwd;
6 6
7require "../builds.pm";
8
9my $verbose, $strip, $update, $doonly, $version; 7my $verbose, $strip, $update, $doonly, $version;
10my @doonly; 8my @doonly;
11 9
@@ -90,7 +88,7 @@ if (!defined($version)) {
90 88
91# made once for all targets 89# made once for all targets
92sub runone { 90sub runone {
93 my ($dir)=@_; 91 my ($dir, $confnum, $extra)=@_;
94 my $a; 92 my $a;
95 93
96 if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { 94 if(@doonly > 0 && !grep(/^$dir$/, @doonly)) {
@@ -102,7 +100,7 @@ sub runone {
102 print "Build in build-$dir\n" if($verbose); 100 print "Build in build-$dir\n" if($verbose);
103 101
104 # build the target 102 # build the target
105 $a = buildit($dir); 103 $a = buildit($dir, $confnum, $extra);
106 104
107 if ($strip) { 105 if ($strip) {
108 print "Stripping binaries\n" if ($verbose); 106 print "Stripping binaries\n" if ($verbose);
@@ -151,11 +149,12 @@ sub runone {
151}; 149};
152 150
153sub buildit { 151sub buildit {
154 my ($target)=@_; 152 my ($target, $confnum, $extra)=@_;
155 153
156 `rm -rf * >/dev/null 2>&1`; 154 `rm -rf * >/dev/null 2>&1`;
157 155
158 my $c = "../tools/configure --type=s --target=$target"; 156 my $c = sprintf('printf "%s\n%ss\n" | ../tools/configure',
157 $confnum, $extra);
159 158
160 print "C: $c\n" if($verbose); 159 print "C: $c\n" if($verbose);
161 `$c`; 160 `$c`;
@@ -167,9 +166,52 @@ sub buildit {
167 `make install 2>/dev/null`; 166 `make install 2>/dev/null`;
168} 167}
169 168
170for my $b (keys %builds) { 169runone("player", "player", '\n');
171 next if ($builds{$b}{status} < 3); # only stable builds 170runone("recorder", "recorder", '\n');
172 next if ($builds{$b}{configname} < 3); # no memsize variants 171#runone("recorder8mb", "recorder", '8\n');
173 172runone("fmrecorder", "fmrecorder", '\n');
174 runone($b); 173#runone("fmrecorder8mb", "fmrecorder", '8\n');
175} 174runone("recorderv2", "recorderv2", '\n');
175runone("ondiosp", "ondiosp", '\n');
176runone("ondiofm", "ondiofm", '\n');
177runone("h100", "h100");
178runone("h120", "h120");
179runone("h300", "h300");
180runone("ipodcolor", "ipodcolor");
181runone("ipodnano", "ipodnano");
182runone("ipod4gray", "ipod4g");
183runone("ipodvideo", "ipodvideo", '32\n');
184#runone("ipodvideo64mb", "ipodvideo", '64\n');
185runone("ipod3g", "ipod3g");
186runone("ipod1g2g", "ipod1g2g");
187runone("iaudiox5", "x5");
188runone("iaudiom5", "m5");
189runone("iaudiom3", "m3");
190runone("ipodmini1g", "ipodmini");
191runone("ipodmini2g", "ipodmini2g");
192runone("h10", "h10");
193runone("h10_5gb", "h10_5gb");
194runone("gigabeatf", "gigabeatf");
195runone("gigabeats", "gigabeats");
196runone("sansae200", "e200");
197runone("sansae200v2", "e200v2");
198runone("sansac200", "c200");
199runone("mrobe500", "mrobe500");
200runone("mrobe100", "mrobe100");
201runone("cowond2", "cowond2");
202runone("clip", "clip");
203runone("zvm30gb", "creativezvm30gb");
204runone("zvm60gb", "creativezvm60gb");
205runone("zenvision", "creativezenvision");
206runone("hdd1630", "hdd1630");
207runone("fuze", "fuze");
208runone("m200v4", "m200v4");
209runone("sa9200", "sa9200");
210runone("sansac200v2", "c200v2");
211runone("yh820", "yh_820");
212runone("yh920", "yh_920");
213runone("yh925", "yh_925");
214runone("ondavx747", "ondavx747");
215runone("ondavx747p", "ondavx747p");
216runone("ondavx777", "ondavx777");
217runone("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 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2 2
3require "../builds.pm"; 3$version="3.4";
4my $version = $publicrelease;
5 4
6my $verbose; 5my $verbose;
7if($ARGV[0] eq "-v") { 6if($ARGV[0] eq "-v") {
@@ -17,7 +16,7 @@ if($ARGV[0]) {
17 16
18# made once for all targets 17# made once for all targets
19sub runone { 18sub runone {
20 my ($dir)=@_; 19 my ($dir, $select, $newl)=@_;
21 my $a; 20 my $a;
22 21
23 if($doonly && ($doonly ne $dir)) { 22 if($doonly && ($doonly ne $dir)) {
@@ -29,7 +28,7 @@ sub runone {
29 print "Build in buildv-$dir\n" if($verbose); 28 print "Build in buildv-$dir\n" if($verbose);
30 29
31 # build the manual(s) 30 # build the manual(s)
32 $a = buildit($dir); 31 $a = buildit($dir, $select, $newl);
33 32
34 chdir ".."; 33 chdir "..";
35 34
@@ -51,11 +50,13 @@ sub runone {
51}; 50};
52 51
53sub buildit { 52sub buildit {
54 my ($model)=@_; 53 my ($dir, $select, $newl)=@_;
55 54
56 `rm -rf * >/dev/null 2>&1`; 55 `rm -rf * >/dev/null 2>&1`;
57 56
58 my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f"; 57 # V (voice), F (festival), L (lame), [blank] (English)
58 my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure',
59 $select, $newl?'\n':"");
59 60
60 print "C: $c\n" if($verbose); 61 print "C: $c\n" if($verbose);
61 `$c`; 62 `$c`;
@@ -74,8 +75,31 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
74`rm -f $pool/*`; 75`rm -f $pool/*`;
75$ENV{'POOL'}="$pool"; 76$ENV{'POOL'}="$pool";
76 77
77for my $b (&stablebuilds) { 78runone("player", "player", 1);
78 next if ($builds{$b}{configname} < 3); # no variants 79runone("recorder", "recorder", 1);
80runone("fmrecorder", "fmrecorder", 1);
81runone("recorderv2", "recorderv2", 1);
82runone("ondiosp", "ondiosp", 1);
83runone("ondiofm", "ondiofm", 1);
84runone("h100", "h100");
85runone("h120", "h120");
86runone("h300", "h300");
87runone("ipodcolor", "ipodcolor");
88runone("ipodnano", "ipodnano");
89runone("ipod4gray", "ipod4g");
90runone("ipodvideo", "ipodvideo", 1);
91runone("ipod3g", "ipod3g");
92runone("ipod1g2g", "ipod1g2g");
93runone("iaudiox5", "x5");
94runone("iaudiom5", "m5");
95runone("iaudiom3", "m3");
96runone("ipodmini2g", "ipodmini2g");
97runone("ipodmini1g", "ipodmini");
98runone("h10", "h10");
99runone("h10_5gb", "h10_5gb");
100runone("gigabeatf", "gigabeatf");
101runone("sansae200", "e200");
102runone("sansac200", "c200");
103runone("mrobe100", "mrobe100");
104#runone("cowond2", "cowond2");
79 105
80 runone($b);
81}