Skip to content
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.

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

[Build] [Depends] Unify macOS deploy target #2400

Merged
merged 17 commits into from
Jun 11, 2021

Conversation

Fuzzbawls
Copy link
Collaborator

@Fuzzbawls Fuzzbawls commented May 25, 2021

This is a companion to #2272 that focuses on on the .dmg creation aspect of macOS builds (ie, make deploy). The following upstream PRs are backported here:

Also worth mentioning: This drops support for MacPorts entirely, which has been antiquated and un-maintained for quite some time, and never actually used by any PIVX macOS build doc.

@Fuzzbawls Fuzzbawls added Build System macOS Issues/problems specifically related to macOS Upstream labels May 25, 2021
@Fuzzbawls Fuzzbawls added this to the 6.0.0 milestone May 25, 2021
@Fuzzbawls Fuzzbawls self-assigned this May 25, 2021
Empact and others added 17 commits May 25, 2021 18:55
phonon is no longer a part of Qt as of version 5
Rather than using OSX_QT_TRANSLATIONS which must be manually updated,
and we forget to update anyway, automatically find and copy
available translations from the translations directory.
4 different levels of verbosity is overkill for a fairly simple script, which
was always being run at 2 in any case.
We already require Python 3.5 or later
Rather than two lots of logic doing roughly the same thing, dependent on if
you're compiling on Linux or macOS, combine the .DS store generation into
macdeployqtplus.

This also removes the -fancy and -volname options.
This change is required on macOS 11 Big Sur.
@Fuzzbawls Fuzzbawls force-pushed the 2021_macdeploy_unify branch from 7c82497 to a68c7d5 Compare May 26, 2021 02:06
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested using depends, ACK a68c7d5.

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK a68c7d5 and merging...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build System macOS Issues/problems specifically related to macOS Upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants