From dafe9bb87d6dc3f2438aca22f8a47643dee8fc4f Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 21 Sep 2017 09:29:51 -0400 Subject: [PATCH] add message about installing dependencies in build --- build.sh | 3 +-- build/build.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 1105489f8..6dc7044f1 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,4 @@ #!/bin/bash # this is here because teamcity runs /build.sh to build the project -set -euxo pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -$DIR/build/build.sh \ No newline at end of file +$DIR/build/build.sh diff --git a/build/build.sh b/build/build.sh index 700dd610f..86c9a6217 100755 --- a/build/build.sh +++ b/build/build.sh @@ -9,13 +9,11 @@ BUILD_DIR="$ROOT/build" LINUX=false OSX=false if [ "$(uname)" == "Darwin" ]; then -set -x + echo -e "\033[0;32mBuilding for OSX\x1b[m" OSX=true -set +x elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then -set -x + echo -e "\033[0;32mBuilding for Linux\x1b[m" LINUX=true -set +x else echo -e "\033[1;31mPlatform detection failed\x1b[m" exit 1 @@ -26,12 +24,14 @@ if $OSX; then else ICON="$BUILD_DIR/icons/48x48.png" fi -set -x + FULL_BUILD="${FULL_BUILD:-false}" -set +x if [ -n "${TEAMCITY_VERSION:-}" -o -n "${APPVEYOR:-}" ]; then FULL_BUILD="true" fi +if [ "$FULL_BUILD" != "true" ]; then + echo -e "\033[1;36mDependencies will NOT be installed. Run with 'FULL_BUILD=true' to install dependencies.\x1b[m" +fi if [ "$FULL_BUILD" == "true" ]; then # install dependencies