qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

device: Allow specifying shortnames for device mkspecs 

Specifying -device linux-amlogic-8726M-g++ is error prone. With this
change, one can specify any substring of the mkspec names under
devices/ and the first one will be picked.

Change-Id: I7c4522fdaefe4a11e9292f7831075aa766a62c0b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Girish Ramakrishnan 2012-05-15 08:44:13 -07:00 committed by Qt by Nokia
parent 76e073375e
commit c01621ec88
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -242,6 +242,21 @@ DeviceVar()
echo "$2" "$eq" "$3" >> "$DEVICE_VARS_FILE" echo "$2" "$eq" "$3" >> "$DEVICE_VARS_FILE"
} }
resolveDeviceMkspec()
{
result=$(find "$relpath/mkspecs/devices/" -type d -name "*$VAL*" | sed "s,^$relpath/mkspecs/,,")
match_count=$(echo "$result" | wc -w)
if [ "$match_count" -gt 1 ]; then
echo >&2 "Error: Multiple matches for device '$VAL'. Candidates are:"
tabbed_result=$(echo "$result" | sed "s,^, ,")
echo >&2 "$tabbed_result"
echo "undefined"
elif [ "$match_count" -eq 0 ]; then
echo >&2 "Error: No device matching '$VAL'"
echo "undefined"
fi
}
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# operating system detection # operating system detection
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -1270,7 +1285,8 @@ while [ "$#" -gt 0 ]; do
case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
;; ;;
device) device)
XPLATFORM="devices/$VAL" XPLATFORM=`resolveDeviceMkspec $VAL`
[ "$XPLATFORM" = "undefined" ] && exit 101
;; ;;
device-option) device-option)
DEV_VAR=`echo $VAL | sed "s,^\(.*\)=.*,\1,"` DEV_VAR=`echo $VAL | sed "s,^\(.*\)=.*,\1,"`