diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-08-30 21:53:26 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-08-30 21:53:26 +0000 |
commit | c704db6b96dcf99cc8214a2c505ae7bee7fa9876 (patch) | |
tree | b6f7612b8a7e6d66bb057a8d1f0152486ffbab67 | |
parent | 7993aa24c6c5114a675eab8f429f674b4b3b344f (diff) | |
download | rockbox-c704db6b96dcf99cc8214a2c505ae7bee7fa9876.tar.gz rockbox-c704db6b96dcf99cc8214a2c505ae7bee7fa9876.zip |
Brand new repolished menu for selecting target. Renumbered all options and
I've tried to group them better and easier under each manufacturer. This also
means that we've now entirely decoupled the menu selection number from the
target_id number used within configure and passed along to the build system.
I also hushed up the script before the main selection menu is written to
the screen.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10814 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/configure | 90 |
1 files changed, 41 insertions, 49 deletions
diff --git a/tools/configure b/tools/configure index 9dfa0fdd3b..2f766d80e4 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -386,10 +386,6 @@ fi | |||
386 | # get our current directory | 386 | # get our current directory |
387 | pwd=`pwd`; | 387 | pwd=`pwd`; |
388 | 388 | ||
389 | echo "This script will setup your Rockbox build environment." | ||
390 | echo "Further docs here: http://www.rockbox.org/" | ||
391 | echo "" | ||
392 | |||
393 | if [ -z "$rootdir" ]; then | 389 | if [ -z "$rootdir" ]; then |
394 | ################################################################## | 390 | ################################################################## |
395 | # Figure out where the source code root is! | 391 | # Figure out where the source code root is! |
@@ -418,10 +414,6 @@ if [ -z "$rootdir" ]; then | |||
418 | cd $rootdir | 414 | cd $rootdir |
419 | rootdir=`pwd` | 415 | rootdir=`pwd` |
420 | 416 | ||
421 | echo "Using this source code root directory:" | ||
422 | echo $rootdir | ||
423 | echo "" | ||
424 | |||
425 | # cd back to the build dir | 417 | # cd back to the build dir |
426 | cd $now | 418 | cd $now |
427 | fi | 419 | fi |
@@ -437,22 +429,20 @@ toolsdir='\$(ROOTDIR)/tools' | |||
437 | # | 429 | # |
438 | 430 | ||
439 | echo "Enter target platform:" | 431 | echo "Enter target platform:" |
440 | 432 | cat <<EOF | |
441 | echo "1 - Archos Player/Studio 16 - iPod 3G" | 433 | ==Archos== ==iriver== ==Apple iPod== |
442 | echo "2 - Archos Recorder 17 - iPod 4G (Grayscale)" | 434 | 0) Player/Studio 10) H120/H140 20) Color/Photo |
443 | echo "3 - Archos FM Recorder 18 - iPod Mini (1G)" | 435 | 1) Recorder 11) H320/H340 21) Nano |
444 | echo "4 - Archos Recorder v2 19 - iriver iFP-790" | 436 | 2) FM Recorder 12) iHP-100/110/115 22) Video |
445 | echo "5 - Archos Gmini 120 20 - Toshiba Gigabeat F" | 437 | 3) Recorder v2 13) iFP-790 23) 3G |
446 | echo "6 - Archos Gmini SP 21 - iPod Mini 2G" | 438 | 4) Gmini 120 14) H10 20Gb 24) 4G Grayscale |
447 | echo "7 - Archos Ondio SP 22 - iriver H10 20Gb" | 439 | 5) Gmini SP 15) H10 5/6Gb 25) Mini 1G |
448 | echo "8 - Archos Ondio FM 23 - SanDisk Sansa e200" | 440 | 6) Ondio SP 26) Mini 2G |
449 | echo "9 - iriver H120/H140 24 - iriver H10 5/6Gb" | 441 | 7) Ondio FM |
450 | echo "10 - iriver H320/H340" | 442 | |
451 | echo "11 - iriver iHP-100/iHP-110/iHP-115" | 443 | ==iAudio== ==Toshiba== ==SanDisk== |
452 | echo "12 - iAudio X5" | 444 | 30) X5/X5V/X5L 40) Gigabeat F 50) Sansa e200 |
453 | echo "13 - iPod Color/Photo" | 445 | EOF |
454 | echo "14 - iPod Nano" | ||
455 | echo "15 - iPod Video" | ||
456 | 446 | ||
457 | buildfor=`input`; | 447 | buildfor=`input`; |
458 | 448 | ||
@@ -499,7 +489,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
499 | 489 | ||
500 | case $buildfor in | 490 | case $buildfor in |
501 | 491 | ||
502 | 1|player) | 492 | 0|player) |
503 | target_id=1 | 493 | target_id=1 |
504 | archos="player" | 494 | archos="player" |
505 | target="-DARCHOS_PLAYER" | 495 | target="-DARCHOS_PLAYER" |
@@ -522,7 +512,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
522 | 512 | ||
523 | ;; | 513 | ;; |
524 | 514 | ||
525 | 2|recorder) | 515 | 1|recorder) |
526 | target_id=2 | 516 | target_id=2 |
527 | archos="recorder" | 517 | archos="recorder" |
528 | target="-DARCHOS_RECORDER" | 518 | target="-DARCHOS_RECORDER" |
@@ -541,7 +531,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
541 | toolset=$archosbitmaptools | 531 | toolset=$archosbitmaptools |
542 | ;; | 532 | ;; |
543 | 533 | ||
544 | 3|fmrecorder) | 534 | 2|fmrecorder) |
545 | target_id=3 | 535 | target_id=3 |
546 | archos="fmrecorder" | 536 | archos="fmrecorder" |
547 | target="-DARCHOS_FMRECORDER" | 537 | target="-DARCHOS_FMRECORDER" |
@@ -560,7 +550,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
560 | toolset=$archosbitmaptools | 550 | toolset=$archosbitmaptools |
561 | ;; | 551 | ;; |
562 | 552 | ||
563 | 4|recorderv2) | 553 | 3|recorderv2) |
564 | target_id=4 | 554 | target_id=4 |
565 | archos="recorderv2" | 555 | archos="recorderv2" |
566 | target="-DARCHOS_RECORDERV2" | 556 | target="-DARCHOS_RECORDERV2" |
@@ -579,7 +569,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
579 | toolset=$archosbitmaptools | 569 | toolset=$archosbitmaptools |
580 | ;; | 570 | ;; |
581 | 571 | ||
582 | 5|gmini120) | 572 | 4|gmini120) |
583 | target_id=5 | 573 | target_id=5 |
584 | archos="gmini120" | 574 | archos="gmini120" |
585 | target="-DARCHOS_GMINI120" | 575 | target="-DARCHOS_GMINI120" |
@@ -599,7 +589,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
599 | toolset="$toolset bmp2rb codepages" | 589 | toolset="$toolset bmp2rb codepages" |
600 | ;; | 590 | ;; |
601 | 591 | ||
602 | 6|gminisp) | 592 | 5|gminisp) |
603 | target_id=6 | 593 | target_id=6 |
604 | archos="gminisp" | 594 | archos="gminisp" |
605 | target="-DARCHOS_GMINISP" | 595 | target="-DARCHOS_GMINISP" |
@@ -619,7 +609,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
619 | toolset="$toolset bmp2rb codepages" | 609 | toolset="$toolset bmp2rb codepages" |
620 | ;; | 610 | ;; |
621 | 611 | ||
622 | 7|ondiosp) | 612 | 6|ondiosp) |
623 | target_id=7 | 613 | target_id=7 |
624 | archos="ondiosp" | 614 | archos="ondiosp" |
625 | target="-DARCHOS_ONDIOSP" | 615 | target="-DARCHOS_ONDIOSP" |
@@ -638,7 +628,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
638 | toolset=$archosbitmaptools | 628 | toolset=$archosbitmaptools |
639 | ;; | 629 | ;; |
640 | 630 | ||
641 | 8|ondiofm) | 631 | 7|ondiofm) |
642 | target_id=8 | 632 | target_id=8 |
643 | archos="ondiofm" | 633 | archos="ondiofm" |
644 | target="-DARCHOS_ONDIOFM" | 634 | target="-DARCHOS_ONDIOFM" |
@@ -655,7 +645,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
655 | toolset=$archosbitmaptools | 645 | toolset=$archosbitmaptools |
656 | ;; | 646 | ;; |
657 | 647 | ||
658 | 9|h120) | 648 | 10|h120) |
659 | target_id=9 | 649 | target_id=9 |
660 | archos="h120" | 650 | archos="h120" |
661 | target="-DIRIVER_H120" | 651 | target="-DIRIVER_H120" |
@@ -677,7 +667,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
677 | toolset=$iriverbitmaptools | 667 | toolset=$iriverbitmaptools |
678 | ;; | 668 | ;; |
679 | 669 | ||
680 | 10|h300) | 670 | 11|h300) |
681 | target_id=10 | 671 | target_id=10 |
682 | archos="h300" | 672 | archos="h300" |
683 | target="-DIRIVER_H300" | 673 | target="-DIRIVER_H300" |
@@ -699,7 +689,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
699 | toolset=$iriverbitmaptools | 689 | toolset=$iriverbitmaptools |
700 | ;; | 690 | ;; |
701 | 691 | ||
702 | 11|h100) | 692 | 12|h100) |
703 | target_id=11 | 693 | target_id=11 |
704 | archos="h100" | 694 | archos="h100" |
705 | target="-DIRIVER_H100" | 695 | target="-DIRIVER_H100" |
@@ -721,7 +711,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
721 | toolset=$iriverbitmaptools | 711 | toolset=$iriverbitmaptools |
722 | ;; | 712 | ;; |
723 | 713 | ||
724 | 12|x5) | 714 | 30|x5) |
725 | target_id=12 | 715 | target_id=12 |
726 | archos="x5" | 716 | archos="x5" |
727 | target="-DIAUDIO_X5" | 717 | target="-DIAUDIO_X5" |
@@ -747,7 +737,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
747 | t_model="x5" | 737 | t_model="x5" |
748 | ;; | 738 | ;; |
749 | 739 | ||
750 | 13|ipodcolor) | 740 | 20|ipodcolor) |
751 | target_id=13 | 741 | target_id=13 |
752 | archos="ipodcolor" | 742 | archos="ipodcolor" |
753 | target="-DIPOD_COLOR" | 743 | target="-DIPOD_COLOR" |
@@ -767,7 +757,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
767 | toolset=$ipodbitmaptools | 757 | toolset=$ipodbitmaptools |
768 | ;; | 758 | ;; |
769 | 759 | ||
770 | 14|ipodnano) | 760 | 21|ipodnano) |
771 | target_id=14 | 761 | target_id=14 |
772 | archos="ipodnano" | 762 | archos="ipodnano" |
773 | target="-DIPOD_NANO" | 763 | target="-DIPOD_NANO" |
@@ -787,7 +777,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
787 | toolset=$ipodbitmaptools | 777 | toolset=$ipodbitmaptools |
788 | ;; | 778 | ;; |
789 | 779 | ||
790 | 15|ipodvideo) | 780 | 22|ipodvideo) |
791 | target_id=15 | 781 | target_id=15 |
792 | archos="ipodvideo" | 782 | archos="ipodvideo" |
793 | target="-DIPOD_VIDEO" | 783 | target="-DIPOD_VIDEO" |
@@ -807,7 +797,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
807 | toolset=$ipodbitmaptools | 797 | toolset=$ipodbitmaptools |
808 | ;; | 798 | ;; |
809 | 799 | ||
810 | 16|ipod3g) | 800 | 23|ipod3g) |
811 | target_id=16 | 801 | target_id=16 |
812 | archos="ipod3g" | 802 | archos="ipod3g" |
813 | target="-DIPOD_3G" | 803 | target="-DIPOD_3G" |
@@ -827,7 +817,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
827 | toolset=$ipodbitmaptools | 817 | toolset=$ipodbitmaptools |
828 | ;; | 818 | ;; |
829 | 819 | ||
830 | 17|ipod4g) | 820 | 24|ipod4g) |
831 | target_id=17 | 821 | target_id=17 |
832 | archos="ipod4g" | 822 | archos="ipod4g" |
833 | target="-DIPOD_4G" | 823 | target="-DIPOD_4G" |
@@ -847,7 +837,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
847 | toolset=$ipodbitmaptools | 837 | toolset=$ipodbitmaptools |
848 | ;; | 838 | ;; |
849 | 839 | ||
850 | 18|ipodmini) | 840 | 25|ipodmini) |
851 | target_id=18 | 841 | target_id=18 |
852 | archos="ipodmini" | 842 | archos="ipodmini" |
853 | target="-DIPOD_MINI" | 843 | target="-DIPOD_MINI" |
@@ -867,7 +857,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
867 | toolset=$ipodbitmaptools | 857 | toolset=$ipodbitmaptools |
868 | ;; | 858 | ;; |
869 | 859 | ||
870 | 19|ifp7xx) | 860 | 13|ifp7xx) |
871 | target_id=19 | 861 | target_id=19 |
872 | archos="ifp7xx" | 862 | archos="ifp7xx" |
873 | target="-DIRIVER_IFP7XX" | 863 | target="-DIRIVER_IFP7XX" |
@@ -887,7 +877,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
887 | toolset=$genericbitmaptools | 877 | toolset=$genericbitmaptools |
888 | ;; | 878 | ;; |
889 | 879 | ||
890 | 20|gigabeatf) | 880 | 40|gigabeatf) |
891 | target_id=20 | 881 | target_id=20 |
892 | archos="gigabeatf" | 882 | archos="gigabeatf" |
893 | target="-DGIGABEAT_F" | 883 | target="-DGIGABEAT_F" |
@@ -909,7 +899,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
909 | t_model="meg-fx" | 899 | t_model="meg-fx" |
910 | ;; | 900 | ;; |
911 | 901 | ||
912 | 21|ipodmini2g) | 902 | 26|ipodmini2g) |
913 | target_id=21 | 903 | target_id=21 |
914 | archos="ipodmini2g" | 904 | archos="ipodmini2g" |
915 | target="-DIPOD_MINI2G" | 905 | target="-DIPOD_MINI2G" |
@@ -929,7 +919,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
929 | toolset=$ipodbitmaptools | 919 | toolset=$ipodbitmaptools |
930 | ;; | 920 | ;; |
931 | 921 | ||
932 | 22|h10) | 922 | 14|h10) |
933 | target_id=22 | 923 | target_id=22 |
934 | archos="h10" | 924 | archos="h10" |
935 | target="-DIRIVER_H10" | 925 | target="-DIRIVER_H10" |
@@ -953,7 +943,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
953 | t_model="h10" | 943 | t_model="h10" |
954 | ;; | 944 | ;; |
955 | 945 | ||
956 | 23|e200) | 946 | 50|e200) |
957 | target_id=23 | 947 | target_id=23 |
958 | archos="e200" | 948 | archos="e200" |
959 | target="-DSANSA_E200" | 949 | target="-DSANSA_E200" |
@@ -977,7 +967,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
977 | t_model="sansa-e200" | 967 | t_model="sansa-e200" |
978 | ;; | 968 | ;; |
979 | 969 | ||
980 | 24|h10_5gb) | 970 | 15|h10_5gb) |
981 | target_id=24 | 971 | target_id=24 |
982 | archos="h10_5gb" | 972 | archos="h10_5gb" |
983 | target="-DIRIVER_H10_5GB" | 973 | target="-DIRIVER_H10_5GB" |
@@ -1002,7 +992,7 @@ toolsdir='\$(ROOTDIR)/tools' | |||
1002 | ;; | 992 | ;; |
1003 | 993 | ||
1004 | *) | 994 | *) |
1005 | echo "Please select an actual target platform!" | 995 | echo "Please select a supported target platform!" |
1006 | exit | 996 | exit |
1007 | ;; | 997 | ;; |
1008 | 998 | ||
@@ -1128,6 +1118,8 @@ fi | |||
1128 | 1118 | ||
1129 | whichaddr | 1119 | whichaddr |
1130 | 1120 | ||
1121 | echo "Using source code root directory: $rootdir" | ||
1122 | |||
1131 | # this was once possible to change at build-time, but no more: | 1123 | # this was once possible to change at build-time, but no more: |
1132 | language="english" | 1124 | language="english" |
1133 | 1125 | ||