From 411bd83991669214e703d94e531f416c6f7bc097 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Fri, 7 Jun 2024 17:49:18 +0100 Subject: [PATCH 1/2] Add debug_and_release for separate build dirs --- Jamulus.pro | 3 ++- mac/deploy_mac.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jamulus.pro b/Jamulus.pro index 0ebabdbd4a..527ebf33ed 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -29,7 +29,8 @@ contains(VERSION, .*dev.*) { CONFIG += qt \ thread \ lrelease \ - embed_translations + embed_translations \ + debug_and_release QT += network \ xml \ diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh index bf4e36372c..1f48570066 100755 --- a/mac/deploy_mac.sh +++ b/mac/deploy_mac.sh @@ -55,7 +55,7 @@ build_app() { "QMAKE_APPLE_DEVICE_ARCHS=${target_arch}" "QT_ARCH=${target_arch}" \ "${@:2}" make -f "${build_path}/Makefile" -C "${build_path}" -j "${job_count}" - target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile") + target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile.Release") if [[ ${#target_archs_array[@]} -gt 1 ]]; then # When building for multiple architectures, move the binary to a safe place to avoid overwriting/cleaning by the other passes. mv "${build_path}/${target_name}.app/Contents/MacOS/${target_name}" "${deploy_path}/${target_name}.arch_${target_arch}" From feb33b454d8491f50475e762ca71efc48b045e5d Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Tue, 25 Jun 2024 21:09:18 +0100 Subject: [PATCH 2/2] Add some more build dirs to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 17c8a97d20..d0f66ccb50 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,9 @@ libs/NSIS/nsProcess.dll windows/NSIS libs/NSIS/nsProcess/Release/ debug/ +debug-*/ release/ +release-*/ build/ deploy/ build-gui/ @@ -48,6 +50,7 @@ linux/jamulus.desktop linux/jamulus-server.desktop .xcode Debug-iphoneos/ +Release-iphoneos/ Jamulus.xcodeproj jamulus_plugin_import.cpp .github_release_changelog.md