Slim down chooseproduct (used by choosecombo).

People keep getting confused by the default products
in this list, which are almost never what they want,
because this list roughly corresponds to the DEVICES
and not the PRODUCTS.

Now that lunch works again, I'm not too worried about
choosecombo except for the couple of cases lunch can't
handle, like the simulator.  Therefore, this change
just removes the list of suggested products, and you
have to know which one you're trying to build (which
seems like a resonable prerequisite).
This commit is contained in:
Joe Onorato 2009-04-29 15:56:47 -07:00
parent b4abfb91bf
commit 8849aedde0
1 changed files with 1 additions and 33 deletions

View File

@ -289,30 +289,6 @@ function choosetype()
# #
function chooseproduct() function chooseproduct()
{ {
# Find the makefiles that must exist for a product.
# Send stderr to /dev/null in case partner isn't present.
local -a choices
choices=(`/bin/ls build/target/board/*/BoardConfig.mk vendor/*/*/BoardConfig.mk 2> /dev/null`)
local choice
local -a prodlist
for choice in ${choices[@]}
do
# The product name is the name of the directory containing
# the makefile we found, above.
prodlist=(${prodlist[@]} `dirname ${choice} | xargs basename`)
done
local index=1
local p
echo "Product choices are:"
for p in ${prodlist[@]}
do
echo " $index. $p"
let "index = $index + 1"
done
if [ "x$TARGET_PRODUCT" != x ] ; then if [ "x$TARGET_PRODUCT" != x ] ; then
default_value=$TARGET_PRODUCT default_value=$TARGET_PRODUCT
else else
@ -327,8 +303,7 @@ function chooseproduct()
local ANSWER local ANSWER
while [ -z "$TARGET_PRODUCT" ] while [ -z "$TARGET_PRODUCT" ]
do do
echo "You can also type the name of a product if you know it." echo -n "Which product would you like? [$default_value] "
echo -n "Which would you like? [$default_value] "
if [ -z "$1" ] ; then if [ -z "$1" ] ; then
read ANSWER read ANSWER
else else
@ -338,13 +313,6 @@ function chooseproduct()
if [ -z "$ANSWER" ] ; then if [ -z "$ANSWER" ] ; then
export TARGET_PRODUCT=$default_value export TARGET_PRODUCT=$default_value
elif (echo -n $ANSWER | grep -q -e "^[0-9][0-9]*$") ; then
local poo=`echo -n $ANSWER`
if [ $poo -le ${#prodlist[@]} ] ; then
export TARGET_PRODUCT=${prodlist[$(($ANSWER-$_arrayoffset))]}
else
echo "** Bad product selection: $ANSWER"
fi
else else
if check_product $ANSWER if check_product $ANSWER
then then