Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve check tools: also check that NDK is not a symbolic link, otherwise compiler detection will fail

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-14 12:47:05 +01:00
parent e55145d40b
commit eb3439107c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
check_tools.sh
View file

@ -4,12 +4,12 @@ error_on_quit=0
echo_err() { echo_err() {
echo "$@" >&2 echo "$@" >&2
error_on_quit=1
} }
check_installed() { check_installed() {
if [ -z "$(which $1)" ]; then if [ -z "$(which $1)" ]; then
echo_err "Could not find $1. Please install $2." echo_err "Could not find $1. Please install $2."
error_on_quit=1
return 1 return 1
fi fi
return 0 return 0
@ -25,17 +25,19 @@ if check_installed "android" "android SDK"; then
# check that at least one target is installed # check that at least one target is installed
if [ -z "$(android list target -c)" ]; then if [ -z "$(android list target -c)" ]; then
echo_err "Install at least one android target in the android SDK" echo_err "Install at least one android target in the android SDK"
error_on_quit=1
fi fi
fi fi
if nasm -f elf32 2>&1 | grep -q "fatal: unrecognised output format"; then if nasm -f elf32 2>&1 | grep -q "fatal: unrecognised output format"; then
echo_err "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly." echo_err "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly."
error_on_quit=1
fi fi
if ! (find submodules/linphone/mediastreamer2 -mindepth 1 2>/dev/null | grep -q . \ if ! (find submodules/linphone/mediastreamer2 -mindepth 1 2>/dev/null | grep -q . \
|| find submodules/linphone/oRTP -mindepth 1 2>/dev/null | grep -q .); then || find submodules/linphone/oRTP -mindepth 1 2>/dev/null | grep -q .); then
echo_err "Missing some git submodules. Did you run 'git submodule update --init --recursive'?" echo_err "Missing some git submodules. Did you run 'git submodule update --init --recursive'?"
fi fi
# Android NDK should NOT be simlinked!
if [ ! -f "$ANDROID_NDK" ]; then
echo_err "ANDROID_NDK=$ANDROID_NDK is not existing or is a symbolic link. Please use a correct folder"
fi
if [ $error_on_quit = 0 ]; then if [ $error_on_quit = 0 ]; then
rm -f check_tools.mk rm -f check_tools.mk