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

1 files changed, 41 insertions, 49 deletions

diff --git a/tools/configure b/tools/configure
index 9dfa0fd..2f766d8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -386,10 +386,6 @@ fi
 # get our current directory
 pwd=`pwd`;
 
-echo "This script will setup your Rockbox build environment."
-echo "Further docs here: http://www.rockbox.org/"
-echo ""
-
 if [ -z "$rootdir" ]; then
   ##################################################################
   # Figure out where the source code root is!
@@ -418,10 +414,6 @@ if [ -z "$rootdir" ]; then
   cd $rootdir
   rootdir=`pwd`
 
-  echo "Using this source code root directory:"
-  echo $rootdir
-  echo ""
-
   # cd back to the build dir
   cd $now
 fi
@@ -437,22 +429,20 @@ toolsdir='\$(ROOTDIR)/tools'
 #
 
   echo "Enter target platform:"
-
-  echo "1 - Archos Player/Studio               16 - iPod 3G"
-  echo "2 - Archos Recorder                    17 - iPod 4G (Grayscale)"
-  echo "3 - Archos FM Recorder                 18 - iPod Mini (1G)"
-  echo "4 - Archos Recorder v2                 19 - iriver iFP-790"
-  echo "5 - Archos Gmini 120                   20 - Toshiba Gigabeat F"
-  echo "6 - Archos Gmini SP                    21 - iPod Mini 2G"
-  echo "7 - Archos Ondio SP                    22 - iriver H10 20Gb"
-  echo "8 - Archos Ondio FM                    23 - SanDisk Sansa e200"
-  echo "9 - iriver H120/H140                   24 - iriver H10 5/6Gb"
-  echo "10 - iriver H320/H340"
-  echo "11 - iriver iHP-100/iHP-110/iHP-115"
-  echo "12 - iAudio X5"
-  echo "13 - iPod Color/Photo"
-  echo "14 - iPod Nano"
-  echo "15 - iPod Video"
+cat <<EOF
+ ==Archos==            ==iriver==             ==Apple iPod==   
+  0) Player/Studio     10) H120/H140          20) Color/Photo  
+  1) Recorder          11) H320/H340          21) Nano         
+  2) FM Recorder       12) iHP-100/110/115    22) Video        
+  3) Recorder v2       13) iFP-790            23) 3G           
+  4) Gmini 120         14) H10 20Gb           24) 4G Grayscale 
+  5) Gmini SP          15) H10 5/6Gb          25) Mini 1G      
+  6) Ondio SP                                 26) Mini 2G      
+  7) Ondio FM                                 
+
+ ==iAudio==            ==Toshiba==            ==SanDisk==      
+ 30) X5/X5V/X5L        40) Gigabeat F         50) Sansa e200   
+EOF
 
   buildfor=`input`;
 
@@ -499,7 +489,7 @@ toolsdir='\$(ROOTDIR)/tools'
 
   case $buildfor in
 
-   1|player)
+   0|player)
     target_id=1
     archos="player"
     target="-DARCHOS_PLAYER"
@@ -522,7 +512,7 @@ toolsdir='\$(ROOTDIR)/tools'
 
     ;;
 
-   2|recorder)
+   1|recorder)
     target_id=2
     archos="recorder"
     target="-DARCHOS_RECORDER"
@@ -541,7 +531,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$archosbitmaptools
     ;;
 
-   3|fmrecorder)
+   2|fmrecorder)
     target_id=3
     archos="fmrecorder"
     target="-DARCHOS_FMRECORDER"
@@ -560,7 +550,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$archosbitmaptools
     ;;
 
-   4|recorderv2)
+   3|recorderv2)
     target_id=4
     archos="recorderv2"
     target="-DARCHOS_RECORDERV2"
@@ -579,7 +569,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$archosbitmaptools
     ;;
 
-   5|gmini120)
+   4|gmini120)
     target_id=5
     archos="gmini120"
     target="-DARCHOS_GMINI120"
@@ -599,7 +589,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset="$toolset bmp2rb codepages"
     ;;
 
-   6|gminisp)
+   5|gminisp)
     target_id=6
     archos="gminisp"
     target="-DARCHOS_GMINISP"
@@ -619,7 +609,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset="$toolset bmp2rb codepages"
     ;;
 
-   7|ondiosp)
+   6|ondiosp)
     target_id=7
     archos="ondiosp"
     target="-DARCHOS_ONDIOSP"
@@ -638,7 +628,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$archosbitmaptools
     ;;
 
-   8|ondiofm)
+   7|ondiofm)
     target_id=8
     archos="ondiofm"
     target="-DARCHOS_ONDIOFM"
@@ -655,7 +645,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$archosbitmaptools
     ;;
 
-   9|h120)
+  10|h120)
     target_id=9
     archos="h120"
     target="-DIRIVER_H120"
@@ -677,7 +667,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$iriverbitmaptools
     ;;
 
-   10|h300)
+   11|h300)
     target_id=10
     archos="h300"
     target="-DIRIVER_H300"
@@ -699,7 +689,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$iriverbitmaptools
     ;;
 
-   11|h100)
+   12|h100)
     target_id=11
     archos="h100"
     target="-DIRIVER_H100"
@@ -721,7 +711,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$iriverbitmaptools
     ;;
 
-   12|x5)
+   30|x5)
     target_id=12
     archos="x5"
     target="-DIAUDIO_X5"
@@ -747,7 +737,7 @@ toolsdir='\$(ROOTDIR)/tools'
     t_model="x5"
     ;;
 
-   13|ipodcolor)
+   20|ipodcolor)
     target_id=13
     archos="ipodcolor"
     target="-DIPOD_COLOR"
@@ -767,7 +757,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
 
-   14|ipodnano)
+   21|ipodnano)
     target_id=14
     archos="ipodnano"
     target="-DIPOD_NANO"
@@ -787,7 +777,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
 
-   15|ipodvideo)
+   22|ipodvideo)
     target_id=15
     archos="ipodvideo"
     target="-DIPOD_VIDEO"
@@ -807,7 +797,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
 
-   16|ipod3g)
+   23|ipod3g)
     target_id=16
     archos="ipod3g"
     target="-DIPOD_3G"
@@ -827,7 +817,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
     
-   17|ipod4g)
+   24|ipod4g)
     target_id=17
     archos="ipod4g"
     target="-DIPOD_4G"
@@ -847,7 +837,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
     
-   18|ipodmini)
+   25|ipodmini)
     target_id=18
     archos="ipodmini"
     target="-DIPOD_MINI"
@@ -867,7 +857,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
     
-   19|ifp7xx)
+   13|ifp7xx)
     target_id=19
     archos="ifp7xx"
     target="-DIRIVER_IFP7XX"
@@ -887,7 +877,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$genericbitmaptools
     ;;
 
-   20|gigabeatf)
+   40|gigabeatf)
     target_id=20
     archos="gigabeatf"
     target="-DGIGABEAT_F"
@@ -909,7 +899,7 @@ toolsdir='\$(ROOTDIR)/tools'
     t_model="meg-fx"
     ;;
 
-   21|ipodmini2g)
+   26|ipodmini2g)
     target_id=21
     archos="ipodmini2g"
     target="-DIPOD_MINI2G"
@@ -929,7 +919,7 @@ toolsdir='\$(ROOTDIR)/tools'
     toolset=$ipodbitmaptools
     ;;
 
-   22|h10)
+   14|h10)
     target_id=22
     archos="h10"
     target="-DIRIVER_H10"
@@ -953,7 +943,7 @@ toolsdir='\$(ROOTDIR)/tools'
     t_model="h10"
     ;;
 
-   23|e200)
+   50|e200)
     target_id=23
     archos="e200"
     target="-DSANSA_E200"
@@ -977,7 +967,7 @@ toolsdir='\$(ROOTDIR)/tools'
     t_model="sansa-e200"
     ;;
 
-   24|h10_5gb)
+   15|h10_5gb)
     target_id=24
     archos="h10_5gb"
     target="-DIRIVER_H10_5GB"
@@ -1002,7 +992,7 @@ toolsdir='\$(ROOTDIR)/tools'
     ;;
 
    *)
-    echo "Please select an actual target platform!"
+    echo "Please select a supported target platform!"
     exit
     ;;
 
@@ -1128,6 +1118,8 @@ fi
 
 whichaddr
 
+echo "Using source code root directory: $rootdir"
+
 # this was once possible to change at build-time, but no more:
 language="english"