From 08ea491488d147f6be0c6ca97d441ef2925b6901 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Thu, 13 Jun 2019 18:17:48 +0200 Subject: scripts: add possibility to customize some features On Travis macOS VM, sanitizer works extremely slow, which leads to timeouts while trying to run tests. Also, qdoc is missing from the HomeBrew's Qt. Change-Id: Idc9cec58531eeca7b5cd46f21ba4afed21e76620 Reviewed-by: Qbs CI Bot Reviewed-by: Richard Weickelt Reviewed-by: Christian Kandeler --- scripts/build-qbs-with-qbs.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index 0808cbbef..b70e2bbe7 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -56,17 +56,25 @@ export LSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/address-san # BUILD_OPTIONS="\ ${QBS_BUILD_PROFILE:+profile:${QBS_BUILD_PROFILE}} \ - modules.qbsbuildconfig.enableAddressSanitizer:true \ modules.qbsbuildconfig.enableProjectFileUpdates:true \ modules.qbsbuildconfig.enableUnitTests:true \ " +WITH_ASAN=${WITH_ASAN:-1} +if [ "$WITH_ASAN" -ne 0 ]; then + BUILD_OPTIONS="$BUILD_OPTIONS modules.qbsbuildconfig.enableAddressSanitizer:true" +fi + # # Build all default products of Qbs # qbs resolve ${BUILD_OPTIONS} qbs build ${BUILD_OPTIONS} -qbs build -p "qbs documentation" ${BUILD_OPTIONS} + +WITH_DOCS=${BUILD_DOCS:-1} +if [ "$BUILD_DOCS" -ne 0 ]; then + qbs build -p "qbs documentation" ${BUILD_OPTIONS} +fi # # Set up profiles for the freshly built Qbs if not -- cgit v1.2.3