diff --git a/android/build_all.sh b/android/build_all.sh index 161d9c01ab..990621ba27 100755 --- a/android/build_all.sh +++ b/android/build_all.sh @@ -6,6 +6,7 @@ set -e # # Script to compile everything BOINC needs for Android +export VERBOSE=false cd ../ BUILD_DIR="$PWD/3rdParty/buildCache" cd android/ diff --git a/android/build_boinc_arm.sh b/android/build_boinc_arm.sh index f65400b773..9083759b96 100755 --- a/android/build_boinc_arm.sh +++ b/android/build_boinc_arm.sh @@ -38,7 +38,11 @@ if [ -n "$COMPILEBOINC" ]; then cd "$BOINC" echo "===== building BOINC for arm from $PWD =====" if [ -n "$MAKECLEAN" ] && [ -f "Makefile" ]; then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./_autosetup @@ -46,8 +50,14 @@ if [ -n "$COMPILEBOINC" ]; then sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out mv client/Makefile.out client/Makefile fi - make --silent - make stage --silent + if [ "$VERBOSE" = false ]; then + make --silent + make stage --silent + else + make SHELL="/bin/bash -x" + make stage SHELL="/bin/bash -x" + fi + echo "Stripping Binaries" cd stage/usr/local/bin diff --git a/android/build_boinc_arm64.sh b/android/build_boinc_arm64.sh index d5c5e27a07..98ab37e327 100755 --- a/android/build_boinc_arm64.sh +++ b/android/build_boinc_arm64.sh @@ -38,7 +38,11 @@ if [ -n "$COMPILEBOINC" ]; then cd "$BOINC" echo "===== building BOINC for arm64 from $PWD =====" if [ -n "$MAKECLEAN" ] && [ -f "Makefile" ]; then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./_autosetup @@ -46,8 +50,13 @@ if [ -n "$COMPILEBOINC" ]; then sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out mv client/Makefile.out client/Makefile fi - make --silent - make stage --silent + if [ "$VERBOSE" = false ]; then + make --silent + make stage --silent + else + make SHELL="/bin/bash -x" + make stage SHELL="/bin/bash -x" + fi echo "Stripping Binaries" cd stage/usr/local/bin diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh index 372390737e..72f9a13b38 100755 --- a/android/build_boinc_x86.sh +++ b/android/build_boinc_x86.sh @@ -38,7 +38,11 @@ if [ -n "$COMPILEBOINC" ]; then cd "$BOINC" echo "===== building BOINC for x86 from $PWD =====" if [ -n "$MAKECLEAN" ] && [ -f "Makefile" ]; then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./_autosetup @@ -46,8 +50,13 @@ if [ -n "$COMPILEBOINC" ]; then sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out mv client/Makefile.out client/Makefile fi - make --silent - make stage --silent + if [ "$VERBOSE" = false ]; then + make --silent + make stage --silent + else + make SHELL="/bin/bash -x" + make stage SHELL="/bin/bash -x" + fi echo "Stripping Binaries" cd stage/usr/local/bin diff --git a/android/build_boinc_x86_64.sh b/android/build_boinc_x86_64.sh index da8826f5b3..cfaa582e1d 100755 --- a/android/build_boinc_x86_64.sh +++ b/android/build_boinc_x86_64.sh @@ -38,7 +38,11 @@ if [ -n "$COMPILEBOINC" ]; then cd "$BOINC" echo "===== building BOINC for x86-64 from $PWD =====" if [ -n "$MAKECLEAN" ] && [ -f "Makefile" ]; then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./_autosetup @@ -46,8 +50,13 @@ if [ -n "$COMPILEBOINC" ]; then sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out mv client/Makefile.out client/Makefile fi - make --silent - make stage --silent + if [ "$VERBOSE" = false ]; then + make --silent + make stage --silent + else + make SHELL="/bin/bash -x" + make stage SHELL="/bin/bash -x" + fi echo "Stripping Binaries" cd stage/usr/local/bin diff --git a/android/build_curl_arm.sh b/android/build_curl_arm.sh index 20940b6d9f..b700c81952 100755 --- a/android/build_curl_arm.sh +++ b/android/build_curl_arm.sh @@ -37,12 +37,21 @@ if [ "$COMPILECURL" = "yes" ]; then cd "$CURL" echo "===== building curl for arm from $PWD =====" if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./configure --host=arm-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom --without-zlib 1>$STDOUT_TARGET fi - make 1>$STDOUT_TARGET - make install 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install --silent + else + make SHELL="/bin/bash -x" + make install SHELL="/bin/bash -x" + fi echo "===== curl for arm build done =====" fi diff --git a/android/build_curl_arm64.sh b/android/build_curl_arm64.sh index d430649c58..24ee69b78b 100755 --- a/android/build_curl_arm64.sh +++ b/android/build_curl_arm64.sh @@ -37,12 +37,21 @@ if [ "$COMPILECURL" = "yes" ]; then cd "$CURL" echo "===== building curl for arm64 from $PWD =====" if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./configure --host=aarch64-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom 1>$STDOUT_TARGET fi - make 1>$STDOUT_TARGET - make install 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install --silent + else + make SHELL="/bin/bash -x" + make install SHELL="/bin/bash -x" + fi echo "===== curl for arm64 build done =====" fi diff --git a/android/build_curl_x86.sh b/android/build_curl_x86.sh index 73fdc91fcb..df86d5862e 100755 --- a/android/build_curl_x86.sh +++ b/android/build_curl_x86.sh @@ -37,12 +37,21 @@ if [ "$COMPILECURL" = "yes" ]; then cd "$CURL" echo "===== building curl for x86 from $PWD =====" if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./configure --host=i686-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom 1>$STDOUT_TARGET fi - make 1>$STDOUT_TARGET - make install 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install --silent + else + make SHELL="/bin/bash -x" + make install SHELL="/bin/bash -x" + fi echo "===== curl for x86 build done =====" fi diff --git a/android/build_curl_x86_64.sh b/android/build_curl_x86_64.sh index 5befdedc59..3f4b4709a7 100755 --- a/android/build_curl_x86_64.sh +++ b/android/build_curl_x86_64.sh @@ -37,12 +37,21 @@ if [ "$COMPILECURL" = "yes" ]; then cd "$CURL" echo "===== building curl for x86-64 from $PWD =====" if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then - make distclean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make distclean --silent + else + make distclean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./configure --host=x86_64-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom 1>$STDOUT_TARGET fi - make 1>$STDOUT_TARGET - make install 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install --silent + else + make SHELL="/bin/bash -x" + make install SHELL="/bin/bash -x" + fi echo "===== curl for x86-64 build done =====" fi diff --git a/android/build_openssl_arm.sh b/android/build_openssl_arm.sh index 1d69511ad3..3b958aaec7 100755 --- a/android/build_openssl_arm.sh +++ b/android/build_openssl_arm.sh @@ -37,7 +37,11 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then cd "$OPENSSL" echo "===== building openssl for arm from $PWD =====" if [ -n "$MAKECLEAN" ]; then - make clean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make clean --silent + else + make clean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./Configure linux-generic32 no-shared no-dso -DL_ENDIAN --openssldir="$TCINCLUDES/ssl" 1>$STDOUT_TARGET @@ -46,7 +50,12 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then s%^INSTALLTOP=.*%INSTALLTOP=$TCINCLUDES%g" Makefile > Makefile.out mv Makefile.out Makefile fi - make 1>$STDOUT_TARGET - make install_sw 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install_sw --silent + else + make SHELL="/bin/bash -x" + make install_sw SHELL="/bin/bash -x" + fi echo "===== openssl for arm build done =====" fi diff --git a/android/build_openssl_arm64.sh b/android/build_openssl_arm64.sh index 45de684b87..8315e33d30 100755 --- a/android/build_openssl_arm64.sh +++ b/android/build_openssl_arm64.sh @@ -37,7 +37,11 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then cd "$OPENSSL" echo "===== building openssl for arm64 from $PWD =====" if [ -n "$MAKECLEAN" ]; then - make clean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make clean --silent + else + make clean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./Configure linux-generic32 no-shared no-dso -DL_ENDIAN --openssldir="$TCINCLUDES/ssl" 1>$STDOUT_TARGET @@ -46,7 +50,12 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then s%^INSTALLTOP=.*%INSTALLTOP=$TCINCLUDES%g" Makefile > Makefile.out mv Makefile.out Makefile fi - make 1>$STDOUT_TARGET - make install_sw 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install_sw --silent + else + make SHELL="/bin/bash -x" + make install_sw SHELL="/bin/bash -x" + fi echo "===== openssl for arm64 build done =====" fi diff --git a/android/build_openssl_x86.sh b/android/build_openssl_x86.sh index 4c09746ce0..04e43b3847 100755 --- a/android/build_openssl_x86.sh +++ b/android/build_openssl_x86.sh @@ -37,7 +37,11 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then cd "$OPENSSL" echo "===== building openssl for x86 from $PWD =====" if [ -n "$MAKECLEAN" ]; then - make clean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make clean --silent + else + make clean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./Configure linux-generic32 no-shared no-dso -DL_ENDIAN --openssldir="$TCINCLUDES/ssl" 1>$STDOUT_TARGET @@ -46,7 +50,12 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then s%^INSTALLTOP=.*%INSTALLTOP=$TCINCLUDES%g" Makefile > Makefile.out mv Makefile.out Makefile fi - make 1>$STDOUT_TARGET - make install_sw 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install_sw --silent + else + make SHELL="/bin/bash -x" + make install_sw SHELL="/bin/bash -x" + fi echo "===== openssl for x86 build done =====" fi diff --git a/android/build_openssl_x86_64.sh b/android/build_openssl_x86_64.sh index 70464bdb35..9d9b01e8cd 100755 --- a/android/build_openssl_x86_64.sh +++ b/android/build_openssl_x86_64.sh @@ -37,7 +37,11 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then cd "$OPENSSL" echo "===== building openssl for x86-64 from $PWD =====" if [ -n "$MAKECLEAN" ]; then - make clean 1>$STDOUT_TARGET 2>&1 + if [ "$VERBOSE" = false ]; then + make clean --silent + else + make clean SHELL="/bin/bash -x" + fi fi if [ -n "$CONFIGURE" ]; then ./Configure linux-x86_64 no-shared no-dso -DL_ENDIAN --openssldir="$TCINCLUDES/ssl" 1>$STDOUT_TARGET @@ -46,7 +50,12 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then s%^INSTALLTOP=.*%INSTALLTOP=$TCINCLUDES%g" Makefile > Makefile.out mv Makefile.out Makefile fi - make 1>$STDOUT_TARGET - make install_sw 1>$STDOUT_TARGET + if [ "$VERBOSE" = false ]; then + make --silent + make install_sw --silent + else + make SHELL="/bin/bash -x" + make install_sw SHELL="/bin/bash -x" + fi echo "===== openssl for x86-64 build done =====" fi