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

Ship a minimal mono 5.10 runtime in the macOS .app bundles #16319

Merged
merged 1 commit into from Mar 26, 2019

Conversation

@pchote
Copy link
Member

commented Mar 17, 2019

This PR continues the work from #16316 (which it also depends on) by shipping the runtime on macOS too.

This pulls in a number of macOS launcher changes:

  • Update SDL to 2.0.9 (this was done last year, but was un-shipped as part of the dark mode revert)
  • Compile our own FreeType 2.10.0 library to remove Mono dependency
  • Remove the mono version check and download/update prompt
  • Replace the launchgame executable that linked against the system libmono2.dylib with the mono executable and runtime provided by Microsoft for the mkbundle cross-compiler toolchain.

This ships mono 5.10 so that we can keep a standard version between the AppImages, macOS, and the compiler used to build releases (which will be updated from 4.6 to 5.10 in a future PR). Ideally, before shipping the first playtest with these changes, we can review our baseline OS requirements and bump the mono version to something newer in all three places at once.

Fixes #12170
Closes #14879

Test build: OpenRA-pkgtest-20190317.dmg

Package mono inside the macOS app bundles.
This also removes the explicit dependency on mono's
packaged FreeType, which should allow development
builds to be used with homebrew-packaged mono.

@pchote pchote force-pushed the pchote:macos-package-mono branch from c6a4c57 to 3d12a70 Mar 22, 2019

@pchote pchote removed the PR: Rebase me! label Mar 22, 2019

@pchote

This comment has been minimized.

Copy link
Member Author

commented Mar 22, 2019

Rebased and hopefully ready to merge.

@obrakmann obrakmann merged commit 54d5afe into OpenRA:bleed Mar 26, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@obrakmann

This comment has been minimized.

Copy link
Contributor

commented Mar 26, 2019

@pchote pchote deleted the pchote:macos-package-mono branch Aug 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.