From cf1aed1ff19da79997ed6eedcde383fd7dd07a3c Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Thu, 18 May 2023 15:24:22 +0400 Subject: [PATCH 1/6] Fix macOS build in case QT is installed via brew --- deploy/build_macos.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 170f2237..87014248 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -49,7 +49,21 @@ echo "Using QIF in $QIF_BIN_DIR" # Checking env -$QT_BIN_DIR/qt-cmake --version +BREW_BIN_DIR=/opt/homebrew/bin +if "$QT_BIN_DIR"/qt-cmake --version; then + QT_CMAKE=$QT_BIN_DIR/qt-cmake + echo "qt-cmake found at $QT_BIN_DIR/qt-cmake" +else + if $BREW_BIN_DIR/qt-cmake --version; then + QT_CMAKE=$BREW_BIN_DIR/qt-cmake + echo "qt-cmake found at $BREW_BIN_DIR/qt-cmake" + else + echo "'qt_make' not found in $QT_BIN_DIR or $BREW_BIN_DIR directories." + exit 1 + fi +fi + +$QT_CMAKE --version cmake --version clang -v From 06b0f46a49b7b935c6e47cf04904bd0a60b84985 Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Thu, 18 May 2023 15:33:59 +0400 Subject: [PATCH 2/6] Suppress cmake --version stdout --- deploy/build_macos.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 87014248..c533d733 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -50,11 +50,11 @@ echo "Using QIF in $QIF_BIN_DIR" # Checking env BREW_BIN_DIR=/opt/homebrew/bin -if "$QT_BIN_DIR"/qt-cmake --version; then +if "$QT_BIN_DIR"/qt-cmake --version >/dev/null 2>&1; then QT_CMAKE=$QT_BIN_DIR/qt-cmake echo "qt-cmake found at $QT_BIN_DIR/qt-cmake" else - if $BREW_BIN_DIR/qt-cmake --version; then + if $BREW_BIN_DIR/qt-cmake --version >/dev/null 2>&1; then QT_CMAKE=$BREW_BIN_DIR/qt-cmake echo "qt-cmake found at $BREW_BIN_DIR/qt-cmake" else @@ -71,7 +71,8 @@ clang -v echo "Building App..." cd $BUILD_DIR -$QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -B $BUILD_DIR +$QT_CMAKE -S $PROJECT_DIR -B $BUILD_DIR + cmake --build . --config release --target all # Build and run tests here From 4713151b7b53fe825b0ce70efdb9f3bf07c711f0 Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Thu, 18 May 2023 15:34:39 +0400 Subject: [PATCH 3/6] Fix format --- deploy/build_macos.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index c533d733..e7b3d981 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -72,7 +72,6 @@ echo "Building App..." cd $BUILD_DIR $QT_CMAKE -S $PROJECT_DIR -B $BUILD_DIR - cmake --build . --config release --target all # Build and run tests here From 2753ca4807149d6472e73a5b121a3f911bbd7c3e Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Thu, 18 May 2023 17:25:04 +0400 Subject: [PATCH 4/6] Fix typo --- deploy/build_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index e7b3d981..e2dc5721 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -58,7 +58,7 @@ else QT_CMAKE=$BREW_BIN_DIR/qt-cmake echo "qt-cmake found at $BREW_BIN_DIR/qt-cmake" else - echo "'qt_make' not found in $QT_BIN_DIR or $BREW_BIN_DIR directories." + echo "qt-cmake not found in $QT_BIN_DIR or $BREW_BIN_DIR directories." exit 1 fi fi From 1c4eabd2476bce1acc9af4f9ab61291df3db51ad Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Thu, 18 May 2023 19:21:22 +0400 Subject: [PATCH 5/6] Add an environment variable to build only the application, without any deploy steps --- deploy/build_macos.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index e2dc5721..bb12f625 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -1,4 +1,11 @@ #!/bin/bash + +# If you want to just build the binary, you can pass `BUILD_ONLY=True` environment variable, +# in this case you'll get only the binary, without any deployment steps like packaging installer + +# BUILD_ONLY requires: +# qt – you can install minimal QT toolchain via brew: `brew install qt` + echo "Build script started ..." set -o errexit -o nounset @@ -74,6 +81,11 @@ cd $BUILD_DIR $QT_CMAKE -S $PROJECT_DIR -B $BUILD_DIR cmake --build . --config release --target all +if [ "$BUILD_ONLY" = "True" ] || [ "$BUILD_ONLY" = "true" ]; then + echo Succesfull build $APP_NAME, path to binary: $BUNDLE_DIR + exit 0 +fi + # Build and run tests here echo "____________________________________" From a3ff89855fc4900c39ea0d6d2bf66fb4eac52840 Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Fri, 19 May 2023 12:50:36 +0400 Subject: [PATCH 6/6] Fix unbound variable err then BUILD_ONLY env var not set --- deploy/build_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index bb12f625..062b4ae8 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -81,7 +81,7 @@ cd $BUILD_DIR $QT_CMAKE -S $PROJECT_DIR -B $BUILD_DIR cmake --build . --config release --target all -if [ "$BUILD_ONLY" = "True" ] || [ "$BUILD_ONLY" = "true" ]; then +if [ "${BUILD_ONLY:-}" = "True" ] || [ "${BUILD_ONLY:-}" = "true" ]; then echo Succesfull build $APP_NAME, path to binary: $BUNDLE_DIR exit 0 fi