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 | |
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')
-rwxr-xr-x | tools/configure | 196 | ||||
-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 |
5 files changed, 129 insertions, 199 deletions
diff --git a/tools/configure b/tools/configure index 50b89dc4fa..bdea279c3e 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -354,16 +354,16 @@ whichadvanced () { | |||
354 | if [ "$memory" = "2" ]; then | 354 | if [ "$memory" = "2" ]; then |
355 | printf ", (8)MB MOD" | 355 | printf ", (8)MB MOD" |
356 | fi | 356 | fi |
357 | if [ "$modelname" = "player" ]; then | 357 | if [ "$modelname" = "archosplayer" ]; then |
358 | printf ", Use (A)TA poweroff" | 358 | printf ", Use (A)TA poweroff" |
359 | fi | 359 | fi |
360 | if [ "$t_model" = "ondio" ]; then | 360 | if [ "$t_model" = "ondio" ]; then |
361 | printf ", (B)acklight MOD" | 361 | printf ", (B)acklight MOD" |
362 | fi | 362 | fi |
363 | if [ "$modelname" = "m5" ]; then | 363 | if [ "$modelname" = "iaudiom5" ]; then |
364 | printf ", (F)M radio MOD" | 364 | printf ", (F)M radio MOD" |
365 | fi | 365 | fi |
366 | if [ "$modelname" = "h120" ]; then | 366 | if [ "$modelname" = "iriverh120" ]; then |
367 | printf ", (R)TC MOD" | 367 | printf ", (R)TC MOD" |
368 | fi | 368 | fi |
369 | echo "" | 369 | echo "" |
@@ -414,7 +414,7 @@ whichadvanced () { | |||
414 | fi | 414 | fi |
415 | ;; | 415 | ;; |
416 | [Aa]) | 416 | [Aa]) |
417 | if [ "$modelname" = "player" ]; then | 417 | if [ "$modelname" = "archosplayer" ]; then |
418 | have_ata_poweroff="#define HAVE_ATA_POWEROFF" | 418 | have_ata_poweroff="#define HAVE_ATA_POWEROFF" |
419 | echo "ATA poweroff enabled" | 419 | echo "ATA poweroff enabled" |
420 | fi | 420 | fi |
@@ -426,13 +426,13 @@ whichadvanced () { | |||
426 | fi | 426 | fi |
427 | ;; | 427 | ;; |
428 | [Ff]) | 428 | [Ff]) |
429 | if [ "$modelname" = "m5" ]; then | 429 | if [ "$modelname" = "iaudiom5" ]; then |
430 | have_fmradio_in="#define HAVE_FMRADIO_IN" | 430 | have_fmradio_in="#define HAVE_FMRADIO_IN" |
431 | echo "FM radio functions enabled" | 431 | echo "FM radio functions enabled" |
432 | fi | 432 | fi |
433 | ;; | 433 | ;; |
434 | [Rr]) | 434 | [Rr]) |
435 | if [ "$modelname" = "h120" ]; then | 435 | if [ "$modelname" = "iriverh120" ]; then |
436 | config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" | 436 | config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" |
437 | have_rtc_alarm="#define HAVE_RTC_ALARM" | 437 | have_rtc_alarm="#define HAVE_RTC_ALARM" |
438 | echo "RTC functions enabled (DS1339/DS3231)" | 438 | echo "RTC functions enabled (DS1339/DS3231)" |
@@ -889,7 +889,7 @@ else | |||
889 | cat <<EOF | 889 | cat <<EOF |
890 | ==Archos== ==iriver== ==Apple iPod== | 890 | ==Archos== ==iriver== ==Apple iPod== |
891 | 0) Player/Studio 10) H120/H140 20) Color/Photo | 891 | 0) Player/Studio 10) H120/H140 20) Color/Photo |
892 | 1) Recorder 11) H320/H340 21) Nano | 892 | 1) Recorder 11) H320/H340 21) Nano 1G |
893 | 2) FM Recorder 12) iHP-100/110/115 22) Video | 893 | 2) FM Recorder 12) iHP-100/110/115 22) Video |
894 | 3) Recorder v2 13) iFP-790 23) 3G | 894 | 3) Recorder v2 13) iFP-790 23) 3G |
895 | 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale | 895 | 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale |
@@ -978,9 +978,9 @@ fi | |||
978 | 978 | ||
979 | case $buildfor in | 979 | case $buildfor in |
980 | 980 | ||
981 | 0|player) | 981 | 0|archosplayer) |
982 | target_id=1 | 982 | target_id=1 |
983 | modelname="player" | 983 | modelname="archosplayer" |
984 | target="-DARCHOS_PLAYER" | 984 | target="-DARCHOS_PLAYER" |
985 | shcc | 985 | shcc |
986 | tool="$rootdir/tools/scramble" | 986 | tool="$rootdir/tools/scramble" |
@@ -1004,9 +1004,9 @@ fi | |||
1004 | t_model="player" | 1004 | t_model="player" |
1005 | ;; | 1005 | ;; |
1006 | 1006 | ||
1007 | 1|recorder) | 1007 | 1|archosrecorder) |
1008 | target_id=2 | 1008 | target_id=2 |
1009 | modelname="recorder" | 1009 | modelname="archosrecorder" |
1010 | target="-DARCHOS_RECORDER" | 1010 | target="-DARCHOS_RECORDER" |
1011 | shcc | 1011 | shcc |
1012 | tool="$rootdir/tools/scramble" | 1012 | tool="$rootdir/tools/scramble" |
@@ -1026,9 +1026,9 @@ fi | |||
1026 | t_model="recorder" | 1026 | t_model="recorder" |
1027 | ;; | 1027 | ;; |
1028 | 1028 | ||
1029 | 2|fmrecorder) | 1029 | 2|archosfmrecorder) |
1030 | target_id=3 | 1030 | target_id=3 |
1031 | modelname="fmrecorder" | 1031 | modelname="archosfmrecorder" |
1032 | target="-DARCHOS_FMRECORDER" | 1032 | target="-DARCHOS_FMRECORDER" |
1033 | shcc | 1033 | shcc |
1034 | tool="$rootdir/tools/scramble -fm" | 1034 | tool="$rootdir/tools/scramble -fm" |
@@ -1048,9 +1048,9 @@ fi | |||
1048 | t_model="fm_v2" | 1048 | t_model="fm_v2" |
1049 | ;; | 1049 | ;; |
1050 | 1050 | ||
1051 | 3|recorderv2) | 1051 | 3|archosrecorderv2) |
1052 | target_id=4 | 1052 | target_id=4 |
1053 | modelname="recorderv2" | 1053 | modelname="archosrecorderv2" |
1054 | target="-DARCHOS_RECORDERV2" | 1054 | target="-DARCHOS_RECORDERV2" |
1055 | shcc | 1055 | shcc |
1056 | tool="$rootdir/tools/scramble -v2" | 1056 | tool="$rootdir/tools/scramble -v2" |
@@ -1070,9 +1070,9 @@ fi | |||
1070 | t_model="fm_v2" | 1070 | t_model="fm_v2" |
1071 | ;; | 1071 | ;; |
1072 | 1072 | ||
1073 | 4|ondiosp) | 1073 | 4|archosondiosp) |
1074 | target_id=7 | 1074 | target_id=7 |
1075 | modelname="ondiosp" | 1075 | modelname="archosondiosp" |
1076 | target="-DARCHOS_ONDIOSP" | 1076 | target="-DARCHOS_ONDIOSP" |
1077 | shcc | 1077 | shcc |
1078 | tool="$rootdir/tools/scramble -osp" | 1078 | tool="$rootdir/tools/scramble -osp" |
@@ -1092,9 +1092,9 @@ fi | |||
1092 | t_model="ondio" | 1092 | t_model="ondio" |
1093 | ;; | 1093 | ;; |
1094 | 1094 | ||
1095 | 5|ondiofm) | 1095 | 5|archosondiofm) |
1096 | target_id=8 | 1096 | target_id=8 |
1097 | modelname="ondiofm" | 1097 | modelname="archosondiofm" |
1098 | target="-DARCHOS_ONDIOFM" | 1098 | target="-DARCHOS_ONDIOFM" |
1099 | shcc | 1099 | shcc |
1100 | tool="$rootdir/tools/scramble -ofm" | 1100 | tool="$rootdir/tools/scramble -ofm" |
@@ -1112,9 +1112,9 @@ fi | |||
1112 | t_model="ondio" | 1112 | t_model="ondio" |
1113 | ;; | 1113 | ;; |
1114 | 1114 | ||
1115 | 6|av300) | 1115 | 6|archosav300) |
1116 | target_id=38 | 1116 | target_id=38 |
1117 | modelname="av300" | 1117 | modelname="archosav300" |
1118 | target="-DARCHOS_AV300" | 1118 | target="-DARCHOS_AV300" |
1119 | memory=16 # always | 1119 | memory=16 # always |
1120 | arm7tdmicc | 1120 | arm7tdmicc |
@@ -1134,9 +1134,9 @@ fi | |||
1134 | t_model="av300" | 1134 | t_model="av300" |
1135 | ;; | 1135 | ;; |
1136 | 1136 | ||
1137 | 10|h120) | 1137 | 10|iriverh120) |
1138 | target_id=9 | 1138 | target_id=9 |
1139 | modelname="h120" | 1139 | modelname="iriverh120" |
1140 | target="-DIRIVER_H120" | 1140 | target="-DIRIVER_H120" |
1141 | memory=32 # always | 1141 | memory=32 # always |
1142 | coldfirecc | 1142 | coldfirecc |
@@ -1159,9 +1159,9 @@ fi | |||
1159 | t_model="h100" | 1159 | t_model="h100" |
1160 | ;; | 1160 | ;; |
1161 | 1161 | ||
1162 | 11|h300) | 1162 | 11|iriverh300) |
1163 | target_id=10 | 1163 | target_id=10 |
1164 | modelname="h300" | 1164 | modelname="iriverh300" |
1165 | target="-DIRIVER_H300" | 1165 | target="-DIRIVER_H300" |
1166 | memory=32 # always | 1166 | memory=32 # always |
1167 | coldfirecc | 1167 | coldfirecc |
@@ -1182,9 +1182,9 @@ fi | |||
1182 | t_model="h300" | 1182 | t_model="h300" |
1183 | ;; | 1183 | ;; |
1184 | 1184 | ||
1185 | 12|h100) | 1185 | 12|iriverh100) |
1186 | target_id=11 | 1186 | target_id=11 |
1187 | modelname="h100" | 1187 | modelname="iriverh100" |
1188 | target="-DIRIVER_H100" | 1188 | target="-DIRIVER_H100" |
1189 | memory=16 # always | 1189 | memory=16 # always |
1190 | coldfirecc | 1190 | coldfirecc |
@@ -1207,9 +1207,9 @@ fi | |||
1207 | t_model="h100" | 1207 | t_model="h100" |
1208 | ;; | 1208 | ;; |
1209 | 1209 | ||
1210 | 13|ifp7xx) | 1210 | 13|iriverifp7xx) |
1211 | target_id=19 | 1211 | target_id=19 |
1212 | modelname="ifp7xx" | 1212 | modelname="iriverifp7xx" |
1213 | target="-DIRIVER_IFP7XX" | 1213 | target="-DIRIVER_IFP7XX" |
1214 | memory=1 | 1214 | memory=1 |
1215 | arm7tdmicc short | 1215 | arm7tdmicc short |
@@ -1228,9 +1228,9 @@ fi | |||
1228 | t_model="iriver-ifp7xx" | 1228 | t_model="iriver-ifp7xx" |
1229 | ;; | 1229 | ;; |
1230 | 1230 | ||
1231 | 14|h10) | 1231 | 14|iriverh10) |
1232 | target_id=22 | 1232 | target_id=22 |
1233 | modelname="h10" | 1233 | modelname="iriverh10" |
1234 | target="-DIRIVER_H10" | 1234 | target="-DIRIVER_H10" |
1235 | memory=32 # always | 1235 | memory=32 # always |
1236 | arm7tdmicc | 1236 | arm7tdmicc |
@@ -1252,9 +1252,9 @@ fi | |||
1252 | t_model="h10" | 1252 | t_model="h10" |
1253 | ;; | 1253 | ;; |
1254 | 1254 | ||
1255 | 15|h10_5gb) | 1255 | 15|iriverh10_5gb) |
1256 | target_id=24 | 1256 | target_id=24 |
1257 | modelname="h10_5gb" | 1257 | modelname="iriverh10_5gb" |
1258 | target="-DIRIVER_H10_5GB" | 1258 | target="-DIRIVER_H10_5GB" |
1259 | memory=32 # always | 1259 | memory=32 # always |
1260 | arm7tdmicc | 1260 | arm7tdmicc |
@@ -1299,9 +1299,9 @@ fi | |||
1299 | t_model="color" | 1299 | t_model="color" |
1300 | ;; | 1300 | ;; |
1301 | 1301 | ||
1302 | 21|ipodnano) | 1302 | 21|ipodnano1g) |
1303 | target_id=14 | 1303 | target_id=14 |
1304 | modelname="ipodnano" | 1304 | modelname="ipodnano1g" |
1305 | target="-DIPOD_NANO" | 1305 | target="-DIPOD_NANO" |
1306 | memory=32 # always | 1306 | memory=32 # always |
1307 | arm7tdmicc | 1307 | arm7tdmicc |
@@ -1390,9 +1390,9 @@ fi | |||
1390 | t_model="4g" | 1390 | t_model="4g" |
1391 | ;; | 1391 | ;; |
1392 | 1392 | ||
1393 | 25|ipodmini) | 1393 | 25|ipodmini1g) |
1394 | target_id=18 | 1394 | target_id=18 |
1395 | modelname="ipodmini" | 1395 | modelname="ipodmini1g" |
1396 | target="-DIPOD_MINI" | 1396 | target="-DIPOD_MINI" |
1397 | memory=32 # always | 1397 | memory=32 # always |
1398 | arm7tdmicc | 1398 | arm7tdmicc |
@@ -1482,9 +1482,9 @@ fi | |||
1482 | t_model="ipodnano2g" | 1482 | t_model="ipodnano2g" |
1483 | ;; | 1483 | ;; |
1484 | 1484 | ||
1485 | 30|x5) | 1485 | 30|iaudiox5) |
1486 | target_id=12 | 1486 | target_id=12 |
1487 | modelname="x5" | 1487 | modelname="iaudiox5" |
1488 | target="-DIAUDIO_X5" | 1488 | target="-DIAUDIO_X5" |
1489 | memory=16 # always | 1489 | memory=16 # always |
1490 | coldfirecc | 1490 | coldfirecc |
@@ -1506,9 +1506,9 @@ fi | |||
1506 | t_model="x5" | 1506 | t_model="x5" |
1507 | ;; | 1507 | ;; |
1508 | 1508 | ||
1509 | 31|m5) | 1509 | 31|iaudiom5) |
1510 | target_id=28 | 1510 | target_id=28 |
1511 | modelname="m5" | 1511 | modelname="iaudiom5" |
1512 | target="-DIAUDIO_M5" | 1512 | target="-DIAUDIO_M5" |
1513 | memory=16 # always | 1513 | memory=16 # always |
1514 | coldfirecc | 1514 | coldfirecc |
@@ -1576,9 +1576,9 @@ fi | |||
1576 | t_model="cowond2" | 1576 | t_model="cowond2" |
1577 | ;; | 1577 | ;; |
1578 | 1578 | ||
1579 | 34|m3) | 1579 | 34|iaudiom3) |
1580 | target_id=37 | 1580 | target_id=37 |
1581 | modelname="m3" | 1581 | modelname="iaudiom3" |
1582 | target="-DIAUDIO_M3" | 1582 | target="-DIAUDIO_M3" |
1583 | memory=16 # always | 1583 | memory=16 # always |
1584 | coldfirecc | 1584 | coldfirecc |
@@ -1598,9 +1598,9 @@ fi | |||
1598 | t_model="m3" | 1598 | t_model="m3" |
1599 | ;; | 1599 | ;; |
1600 | 1600 | ||
1601 | 40|gigabeatf) | 1601 | 40|gigabeatfx) |
1602 | target_id=20 | 1602 | target_id=20 |
1603 | modelname="gigabeatf" | 1603 | modelname="gigabeatfx" |
1604 | target="-DGIGABEAT_F" | 1604 | target="-DGIGABEAT_F" |
1605 | memory=32 # always | 1605 | memory=32 # always |
1606 | arm9tdmicc | 1606 | arm9tdmicc |
@@ -1785,9 +1785,9 @@ fi | |||
1785 | t_model="creative-zvm" | 1785 | t_model="creative-zvm" |
1786 | ;; | 1786 | ;; |
1787 | 1787 | ||
1788 | 50|e200) | 1788 | 50|sansae200) |
1789 | target_id=23 | 1789 | target_id=23 |
1790 | modelname="e200" | 1790 | modelname="sansae200" |
1791 | target="-DSANSA_E200" | 1791 | target="-DSANSA_E200" |
1792 | memory=32 # supposedly | 1792 | memory=32 # supposedly |
1793 | arm7tdmicc | 1793 | arm7tdmicc |
@@ -1809,12 +1809,12 @@ fi | |||
1809 | t_model="sansa-e200" | 1809 | t_model="sansa-e200" |
1810 | ;; | 1810 | ;; |
1811 | 1811 | ||
1812 | 51|e200r) | 1812 | 51|sansae200r) |
1813 | # the e200R model is pretty much identical to the e200, it only has a | 1813 | # the e200R model is pretty much identical to the e200, it only has a |
1814 | # different option to the scramble tool when building a bootloader and | 1814 | # different option to the scramble tool when building a bootloader and |
1815 | # makes the bootloader output file name in all lower case. | 1815 | # makes the bootloader output file name in all lower case. |
1816 | target_id=27 | 1816 | target_id=27 |
1817 | modelname="e200r" | 1817 | modelname="sansae200r" |
1818 | target="-DSANSA_E200" | 1818 | target="-DSANSA_E200" |
1819 | memory=32 # supposedly | 1819 | memory=32 # supposedly |
1820 | arm7tdmicc | 1820 | arm7tdmicc |
@@ -1836,9 +1836,9 @@ fi | |||
1836 | t_model="sansa-e200" | 1836 | t_model="sansa-e200" |
1837 | ;; | 1837 | ;; |
1838 | 1838 | ||
1839 | 52|c200) | 1839 | 52|sansac200) |
1840 | target_id=30 | 1840 | target_id=30 |
1841 | modelname="c200" | 1841 | modelname="sansac200" |
1842 | target="-DSANSA_C200" | 1842 | target="-DSANSA_C200" |
1843 | memory=32 # supposedly | 1843 | memory=32 # supposedly |
1844 | arm7tdmicc | 1844 | arm7tdmicc |
@@ -1860,9 +1860,9 @@ fi | |||
1860 | t_model="sansa-c200" | 1860 | t_model="sansa-c200" |
1861 | ;; | 1861 | ;; |
1862 | 1862 | ||
1863 | 53|m200) | 1863 | 53|sansam200) |
1864 | target_id=48 | 1864 | target_id=48 |
1865 | modelname="m200" | 1865 | modelname="sansam200" |
1866 | target="-DSANSA_M200" | 1866 | target="-DSANSA_M200" |
1867 | memory=1 # always | 1867 | memory=1 # always |
1868 | arm946cc | 1868 | arm946cc |
@@ -1884,9 +1884,9 @@ fi | |||
1884 | t_model="m200" | 1884 | t_model="m200" |
1885 | ;; | 1885 | ;; |
1886 | 1886 | ||
1887 | 54|c100) | 1887 | 54|sansac100) |
1888 | target_id=42 | 1888 | target_id=42 |
1889 | modelname="c100" | 1889 | modelname="sansac100" |
1890 | target="-DSANSA_C100" | 1890 | target="-DSANSA_C100" |
1891 | memory=2 | 1891 | memory=2 |
1892 | arm946cc | 1892 | arm946cc |
@@ -1908,9 +1908,9 @@ fi | |||
1908 | t_model="c100" | 1908 | t_model="c100" |
1909 | ;; | 1909 | ;; |
1910 | 1910 | ||
1911 | 55|Clip|clip) | 1911 | 55|sansaclip) |
1912 | target_id=50 | 1912 | target_id=50 |
1913 | modelname="clip" | 1913 | modelname="sansaclip" |
1914 | target="-DSANSA_CLIP" | 1914 | target="-DSANSA_CLIP" |
1915 | memory=2 | 1915 | memory=2 |
1916 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1916 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -1929,9 +1929,9 @@ fi | |||
1929 | ;; | 1929 | ;; |
1930 | 1930 | ||
1931 | 1931 | ||
1932 | 56|e200v2) | 1932 | 56|sansae200v2) |
1933 | target_id=51 | 1933 | target_id=51 |
1934 | modelname="e200v2" | 1934 | modelname="sansae200v2" |
1935 | target="-DSANSA_E200V2" | 1935 | target="-DSANSA_E200V2" |
1936 | memory=8 | 1936 | memory=8 |
1937 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1937 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -1950,9 +1950,9 @@ fi | |||
1950 | ;; | 1950 | ;; |
1951 | 1951 | ||
1952 | 1952 | ||
1953 | 57|m200v4) | 1953 | 57|sansam200v4) |
1954 | target_id=52 | 1954 | target_id=52 |
1955 | modelname="m200v4" | 1955 | modelname="sansam200v4" |
1956 | target="-DSANSA_M200V4" | 1956 | target="-DSANSA_M200V4" |
1957 | memory=2 | 1957 | memory=2 |
1958 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1958 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -1971,9 +1971,9 @@ fi | |||
1971 | ;; | 1971 | ;; |
1972 | 1972 | ||
1973 | 1973 | ||
1974 | 58|fuze) | 1974 | 58|sansafuze) |
1975 | target_id=53 | 1975 | target_id=53 |
1976 | modelname="fuze" | 1976 | modelname="sansafuze" |
1977 | target="-DSANSA_FUZE" | 1977 | target="-DSANSA_FUZE" |
1978 | memory=8 | 1978 | memory=8 |
1979 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1979 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -1992,9 +1992,9 @@ fi | |||
1992 | ;; | 1992 | ;; |
1993 | 1993 | ||
1994 | 1994 | ||
1995 | 59|c200v2) | 1995 | 59|sansac200v2) |
1996 | target_id=55 | 1996 | target_id=55 |
1997 | modelname="c200v2" | 1997 | modelname="sansac200v2" |
1998 | target="-DSANSA_C200V2" | 1998 | target="-DSANSA_C200V2" |
1999 | memory=2 # as per OF diagnosis mode | 1999 | memory=2 # as per OF diagnosis mode |
2000 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 2000 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -2015,11 +2015,11 @@ fi | |||
2015 | arm9tdmicc | 2015 | arm9tdmicc |
2016 | ;; | 2016 | ;; |
2017 | 2017 | ||
2018 | 60|Clipv2|clipv2) | 2018 | 60|sansaclipv2) |
2019 | echo "Sansa Clipv2 is not yet supported !" | 2019 | echo "Sansa Clipv2 is not yet supported !" |
2020 | exit 1 | 2020 | exit 1 |
2021 | target_id=60 | 2021 | target_id=60 |
2022 | modelname="clipv2" | 2022 | modelname="sansaclipv2" |
2023 | target="-DSANSA_CLIPV2" | 2023 | target="-DSANSA_CLIPV2" |
2024 | memory=8 | 2024 | memory=8 |
2025 | arm926ejscc | 2025 | arm926ejscc |
@@ -2037,11 +2037,11 @@ fi | |||
2037 | t_model="sansa-clipv2" | 2037 | t_model="sansa-clipv2" |
2038 | ;; | 2038 | ;; |
2039 | 2039 | ||
2040 | 61|view) | 2040 | 61|sansaview) |
2041 | echo "Sansa View is not yet supported!" | 2041 | echo "Sansa View is not yet supported!" |
2042 | exit 1 | 2042 | exit 1 |
2043 | target_id=63 | 2043 | target_id=63 |
2044 | modelname="view" | 2044 | modelname="sansaview" |
2045 | target="-DSANSA_VIEW" | 2045 | target="-DSANSA_VIEW" |
2046 | memory=32 | 2046 | memory=32 |
2047 | arm1176jzscc | 2047 | arm1176jzscc |
@@ -2061,10 +2061,10 @@ fi | |||
2061 | t_model="sansa-view" | 2061 | t_model="sansa-view" |
2062 | ;; | 2062 | ;; |
2063 | 2063 | ||
2064 | 150|tpj1022) | 2064 | 150|tatungtpj1022) |
2065 | target_id=25 | 2065 | target_id=25 |
2066 | modelname="tpj1022" | 2066 | modelname="tatungtpj1022" |
2067 | target="-DELIO_TPJ1022" | 2067 | target="-DTATUNG_TPJ1022" |
2068 | memory=32 # always | 2068 | memory=32 # always |
2069 | arm7tdmicc | 2069 | arm7tdmicc |
2070 | tool="$rootdir/tools/scramble -add tpj2" | 2070 | tool="$rootdir/tools/scramble -add tpj2" |
@@ -2085,9 +2085,9 @@ fi | |||
2085 | t_model="tpj1022" | 2085 | t_model="tpj1022" |
2086 | ;; | 2086 | ;; |
2087 | 2087 | ||
2088 | 100|sa9200) | 2088 | 100|gogearsa9200) |
2089 | target_id=41 | 2089 | target_id=41 |
2090 | modelname="sa9200" | 2090 | modelname="gogearsa9200" |
2091 | target="-DPHILIPS_SA9200" | 2091 | target="-DPHILIPS_SA9200" |
2092 | memory=32 # supposedly | 2092 | memory=32 # supposedly |
2093 | arm7tdmicc | 2093 | arm7tdmicc |
@@ -2109,9 +2109,9 @@ fi | |||
2109 | t_model="sa9200" | 2109 | t_model="sa9200" |
2110 | ;; | 2110 | ;; |
2111 | 2111 | ||
2112 | 101|hdd1630) | 2112 | 101|gogearhdd1630) |
2113 | target_id=43 | 2113 | target_id=43 |
2114 | modelname="hdd1630" | 2114 | modelname="gogearhdd1630" |
2115 | target="-DPHILIPS_HDD1630" | 2115 | target="-DPHILIPS_HDD1630" |
2116 | memory=32 # supposedly | 2116 | memory=32 # supposedly |
2117 | arm7tdmicc | 2117 | arm7tdmicc |
@@ -2287,9 +2287,9 @@ fi | |||
2287 | t_model="onda_vx747" | 2287 | t_model="onda_vx747" |
2288 | ;; | 2288 | ;; |
2289 | 2289 | ||
2290 | 130|lyre_proto1) | 2290 | 130|lyreproto1) |
2291 | target_id=56 | 2291 | target_id=56 |
2292 | modelname="lyre_proto1" | 2292 | modelname="lyreproto1" |
2293 | target="-DLYRE_PROTO1" | 2293 | target="-DLYRE_PROTO1" |
2294 | memory=64 | 2294 | memory=64 |
2295 | arm926ejscc | 2295 | arm926ejscc |
@@ -2331,9 +2331,9 @@ fi | |||
2331 | t_model="mini2440" | 2331 | t_model="mini2440" |
2332 | ;; | 2332 | ;; |
2333 | 2333 | ||
2334 | 140|yh820) | 2334 | 140|samsungyh820) |
2335 | target_id=57 | 2335 | target_id=57 |
2336 | modelname="yh820" | 2336 | modelname="samsungyh820" |
2337 | target="-DSAMSUNG_YH820" | 2337 | target="-DSAMSUNG_YH820" |
2338 | memory=32 # always | 2338 | memory=32 # always |
2339 | arm7tdmicc | 2339 | arm7tdmicc |
@@ -2355,9 +2355,9 @@ fi | |||
2355 | t_model="yh820" | 2355 | t_model="yh820" |
2356 | ;; | 2356 | ;; |
2357 | 2357 | ||
2358 | 141|yh920) | 2358 | 141|samsungyh920) |
2359 | target_id=58 | 2359 | target_id=58 |
2360 | modelname="yh920" | 2360 | modelname="samsungyh920" |
2361 | target="-DSAMSUNG_YH920" | 2361 | target="-DSAMSUNG_YH920" |
2362 | memory=32 # always | 2362 | memory=32 # always |
2363 | arm7tdmicc | 2363 | arm7tdmicc |
@@ -2379,9 +2379,9 @@ fi | |||
2379 | t_model="yh920" | 2379 | t_model="yh920" |
2380 | ;; | 2380 | ;; |
2381 | 2381 | ||
2382 | 142|yh925) | 2382 | 142|samsungyh925) |
2383 | target_id=59 | 2383 | target_id=59 |
2384 | modelname="yh925" | 2384 | modelname="samsungyh925" |
2385 | target="-DSAMSUNG_YH925" | 2385 | target="-DSAMSUNG_YH925" |
2386 | memory=32 # always | 2386 | memory=32 # always |
2387 | arm7tdmicc | 2387 | arm7tdmicc |
@@ -2403,9 +2403,9 @@ fi | |||
2403 | t_model="yh925" | 2403 | t_model="yh925" |
2404 | ;; | 2404 | ;; |
2405 | 2405 | ||
2406 | 143|yps3) | 2406 | 143|samsungyps3) |
2407 | target_id=60 | 2407 | target_id=60 |
2408 | modelname="yps3" | 2408 | modelname="samsungyps3" |
2409 | target="-DSAMSUNG_YPS3" | 2409 | target="-DSAMSUNG_YPS3" |
2410 | memory=16 # always | 2410 | memory=16 # always |
2411 | arm940tbecc | 2411 | arm940tbecc |
@@ -2489,13 +2489,13 @@ fi | |||
2489 | # the ifp7x0 is the only platform that supports building a gdb stub like | 2489 | # the ifp7x0 is the only platform that supports building a gdb stub like |
2490 | # this | 2490 | # this |
2491 | case $modelname in | 2491 | case $modelname in |
2492 | ifp7xx) | 2492 | iriverifp7xx) |
2493 | gdbstub="(G)DB stub, " | 2493 | gdbstub="(G)DB stub, " |
2494 | ;; | 2494 | ;; |
2495 | e200r|e200) | 2495 | sansae200r|sansae200) |
2496 | gdbstub="(I)nstaller, " | 2496 | gdbstub="(I)nstaller, " |
2497 | ;; | 2497 | ;; |
2498 | c200) | 2498 | sansac200) |
2499 | gdbstub="(E)raser, " | 2499 | gdbstub="(E)raser, " |
2500 | ;; | 2500 | ;; |
2501 | *) | 2501 | *) |
@@ -2572,7 +2572,7 @@ fi | |||
2572 | appsdir='\$(ROOTDIR)/gdb' | 2572 | appsdir='\$(ROOTDIR)/gdb' |
2573 | apps="stub" | 2573 | apps="stub" |
2574 | case $modelname in | 2574 | case $modelname in |
2575 | ifp7xx) | 2575 | iriverifp7xx) |
2576 | output="stub.wma" | 2576 | output="stub.wma" |
2577 | ;; | 2577 | ;; |
2578 | *) | 2578 | *) |
@@ -2608,7 +2608,7 @@ fi | |||
2608 | echo "Database tool build selected" | 2608 | echo "Database tool build selected" |
2609 | ;; | 2609 | ;; |
2610 | *) | 2610 | *) |
2611 | if [ "$modelname" = "e200r" ]; then | 2611 | if [ "$modelname" = "sansae200r" ]; then |
2612 | echo "Do not use the e200R target for regular builds. Use e200 instead." | 2612 | echo "Do not use the e200R target for regular builds. Use e200 instead." |
2613 | exit 8 | 2613 | exit 8 |
2614 | fi | 2614 | fi |
@@ -2620,17 +2620,17 @@ fi | |||
2620 | esac | 2620 | esac |
2621 | # to be able running "make manual" from non-manual configuration | 2621 | # to be able running "make manual" from non-manual configuration |
2622 | case $modelname in | 2622 | case $modelname in |
2623 | fmrecorder) | 2623 | archosfmrecorder) |
2624 | manualdev="recorderv2fm" | 2624 | manualdev="archosrecorderv2fm" |
2625 | ;; | 2625 | ;; |
2626 | recorderv2) | 2626 | archosrecorderv2) |
2627 | manualdev="recorderv2fm" | 2627 | manualdev="archosrecorderv2fm" |
2628 | ;; | 2628 | ;; |
2629 | h1??) | 2629 | iriverh1??) |
2630 | manualdev="h100" | 2630 | manualdev="iriverh100" |
2631 | ;; | 2631 | ;; |
2632 | ipodmini2g) | 2632 | ipodmini2g) |
2633 | manualdev="ipodmini" | 2633 | manualdev="ipodmini1g" |
2634 | ;; | 2634 | ;; |
2635 | *) | 2635 | *) |
2636 | manualdev=$modelname | 2636 | manualdev=$modelname |
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 | } | ||