From a6090c64edfc51d9d573398d4b266b2718d09546 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 13 Jun 2016 20:28:46 -0400 Subject: [PATCH] Added message directing user to perform the build with the build command --- setenv-android.sh | 9 ++++++++- setenv-embedded.sh | 9 ++++++++- setenv-ios.sh | 25 ++++++++++++++++--------- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/setenv-android.sh b/setenv-android.sh index f68a7580..16f037dd 100755 --- a/setenv-android.sh +++ b/setenv-android.sh @@ -332,7 +332,7 @@ VERBOSE=1 if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT" echo "AOSP_TOOLCHAIN_PATH: $AOSP_TOOLCHAIN_PATH" - echo "AOSP_ABI: $AOSP_ABI" + echo "AOSP_ABI: $AOSP_ABI" echo "AOSP_API: $AOSP_API" echo "AOSP_SYSROOT: $AOSP_SYSROOT" echo "AOSP_FLAGS: $AOSP_FLAGS" @@ -343,4 +343,11 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then fi fi +echo +echo "*******************************************************************************" +echo "It looks the the environemnt is set correcty. Your next step is" +echo "build the library with 'make -f GNUmakefile-cross'" +echo "*******************************************************************************" +echo + [ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0 diff --git a/setenv-embedded.sh b/setenv-embedded.sh index 32c9fbbf..f8675302 100755 --- a/setenv-embedded.sh +++ b/setenv-embedded.sh @@ -130,4 +130,11 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" -ne 0 ]; then echo "ARM_EMBEDDED_SYSROOT: $ARM_EMBEDDED_SYSROOT" fi -[ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0 \ No newline at end of file +echo +echo "*******************************************************************************" +echo "It looks the the environemnt is set correcty. Your next step is" +echo "build the library with 'make -f GNUmakefile-cross'" +echo "*******************************************************************************" +echo + +[ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0 diff --git a/setenv-ios.sh b/setenv-ios.sh index 7ba26260..2920e92c 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -81,32 +81,32 @@ do if [ "$CL" == "iphone" ] || [ "$CL" == "iphoneos" ]; then APPLE_SDK=iPhoneOS fi - + # iPhone Simulator if [ "$CL" == "simulator" ] || [ "$CL" == "iphonesimulator" ]; then APPLE_SDK=iPhoneSimulator fi - + # Watch if [ "$CL" == "watch" ] || [ "$CL" == "watchos" ] || [ "$CL" == "applewatch" ]; then APPLE_SDK=WatchOS fi - + # Watch Simulator if [ "$CL" == "watchsimulator" ]; then APPLE_SDK=WatchSimulator fi - + # Apple TV if [ "$CL" == "tv" ] || [ "$CL" == "appletv" ] || [ "$CL" == "appletvos" ]; then APPLE_SDK=AppleTVOS fi - + # Apple TV Simulator if [ "$CL" == "tvsimulator" ] || [ "$CL" == "appletvsimulator" ]; then APPLE_SDK=AppleTVSimulator fi - + done # Defaults if not set @@ -270,13 +270,20 @@ TOOLS=(clang clang++ ar ranlib libtool ld) for tool in ${TOOLS[@]} do if [ ! -e "$IOS_TOOLCHAIN/$tool" ] && [ ! -e "$XCODE_TOOLCHAIN/$tool" ]; then - echo "WARNING: unable to find $tool at IOS_TOOLCHAIN or XCODE_TOOLCHAIN" + echo "ERROR: unable to find $tool at IOS_TOOLCHAIN or XCODE_TOOLCHAIN" FOUND_ALL=0 fi done -if [ "$SETENV_VERBOSE" == "1" ] && [ "$FOUND_ALL" == "1" ]; then - echo "TOOL TEST: found all tools, this might actually work" +if [ "$FOUND_ALL" -eq "0" ]; then + [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1 fi +echo +echo "*******************************************************************************" +echo "It looks the the environemnt is set correcty. Your next step is" +echo "build the library with 'make -f GNUmakefile-cross'" +echo "*******************************************************************************" +echo + [ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0