mirror of
https://github.com/debauchee/barrier.git
synced 2026-05-15 14:16:02 -06:00
[PR #648] [MERGED] Use macdeployqt #1667
Labels
No labels
HiDPI
bounty
bsd/freebsd
bsd/openbsd
bug
bug
build-infra
cantfix
critical
doc
duplicate
enhancement
fix-available
from git
from release
good first issue
help wanted
installer/package
invalid
linux
macOS
meta
needs testing
pull-request
query
question
regression
regression
v2.4.0
windows
wontfix
work-in-progress
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: github-starred/barrier#1667
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/debauchee/barrier/pull/648
Author: @simons-public
Created: 5/2/2020
Status: ✅ Merged
Merged: 5/6/2020
Merged by: @shymega
Base:
master← Head:use-macdeployqt📝 Commits (6)
e37277fAdd script that uses macdeployqt instead ofreref_dylibs.shshell script to create the.appbundle8cd59ebUsebuild_dist.shin CMake instead ofbuild_installer.shfb3eaa3Add warnings for users manually runningbuild_installer.shandreref_dylibs.shmanuallye0051d1Homebrew (Ruby) throws an error when it getsSIGPIPEfrom the--max-countongrep.0deaaadadded barrierc and barriers to macdeployqt targetsb5c7eb4Change MacOS Build Steps📊 Changes
5 files changed (+97 additions, -10 deletions)
View changed files
📝
CMakeLists.txt(+4 -6)📝
azure-pipelines.yml(+9 -4)➕
dist/macos/bundle/build_dist.sh.in(+73 -0)📝
dist/macos/bundle/build_installer.sh.in(+5 -0)📝
dist/macos/bundle/reref_dylibs.sh(+6 -0)📄 Description
Making a release was failing with both Homebrew and MacPorts on Mojave. The compiled binary would run successfully, but the resulting
.appbundle from runningbuild_installer.sh(which runsreref_dylibs.shand builds the.appbundle) was giving SEGFAULT 11 when executed.This pull request replaces
build_installer.shwithbuild_dist.shthat runs the Qt toolkit'smacdeployqtwhich is included with the Qt on both MacPorts and Homebrew. It builds the distributable bundle and creates thedmgif it is a Release build.The previous scripts have been left in place with deprecation warnings in case they are still needed by older versions of MacOS.
It also removes the
ifcondition in CMake that prevents building a bundle on Debug releases.🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.