Skip to content

Add debug_and_release to use separate build dirs #3299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softins merged 2 commits into from
Jun 26, 2024
Merged

Add debug_and_release to use separate build dirs #3299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411bd83
Add debug_and_release for separate build dirs
softins Jun 7, 2024
feb33b4
Add some more build dirs to .gitignore
softins Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ libs/NSIS/nsProcess.dll
windows/NSIS
libs/NSIS/nsProcess/Release/
debug/
debug-*/
release/
release-*/
build/
deploy/
build-gui/
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ contains(VERSION, .*dev.*) {
CONFIG += qt \
thread \
lrelease \
embed_translations
embed_translations \
debug_and_release

QT += network \
xml \
Expand Down
2 changes: 1 addition & 1 deletion mac/deploy_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down