epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Package mono inside the macOS app bundles.

Browse Source 
This also removes the explicit dependency on mono's
packaged FreeType, which should allow development
builds to be used with homebrew-packaged mono.
This commit is contained in:
Paul Chote
2019-03-17 13:38:49 +00:00
committed by Oliver Brakmann
parent 872bf737e0
commit 54d5afed57
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -51,7 +51,7 @@ WHITELISTED_OPENRA_ASSEMBLIES = $(game_TARGET) $(utility_TARGET) $(pdefault_TARG
WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll MaxMind.Db.dll Eluant.dll rix0rrr.BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.dll WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll MaxMind.Db.dll Eluant.dll rix0rrr.BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.dll
# These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack # These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack
# This list *must* be kept in sync with the files packaged by the AppImageSupport repository # This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories
WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll
NUNIT_LIBS_PATH := NUNIT_LIBS_PATH :=

2
OpenRA.Platforms.Default.dll.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<configuration> <configuration>
<dllmap dll="freetype6" os="linux" target="libfreetype.so.6" /> <dllmap dll="freetype6" os="linux" target="libfreetype.so.6" />
<dllmap dll="freetype6" os="osx" target="/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib" /> <dllmap dll="freetype6" os="osx" target="libfreetype.6.dylib" />
<dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" /> <dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
</configuration> </configuration>

2
packaging/osx/buildpackage.sh
View File

@@ -9,7 +9,7 @@ if [[ "$OSTYPE" != "darwin"* ]]; then
command -v genisoimage >/dev/null 2>&1 || { echo >&2 "macOS packaging requires genisoimage."; exit 1; } command -v genisoimage >/dev/null 2>&1 || { echo >&2 "macOS packaging requires genisoimage."; exit 1; }
fi fi
LAUNCHER_TAG="osx-launcher-20171118" LAUNCHER_TAG="osx-launcher-20190317"
if [ $# -ne "2" ]; then if [ $# -ne "2" ]; then
echo "Usage: $(basename "$0") tag outputdir" echo "Usage: $(basename "$0") tag outputdir"

9
thirdparty/fetch-thirdparty-deps-osx.sh vendored
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
LAUNCHER_TAG="osx-launcher-20171118" LAUNCHER_TAG="osx-launcher-20190317"
download_dir="${0%/*}/download/osx" download_dir="${0%/*}/download/osx"
mkdir -p "$download_dir" mkdir -p "$download_dir"
@@ -18,5 +18,10 @@ fi
if [ ! -f Eluant.dll.config ]; then if [ ! -f Eluant.dll.config ]; then
echo "Fetching OS X Lua configuration file from GitHub." echo "Fetching OS X Lua configuration file from GitHub."
curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/${LAUNCHER_TAG}/dependencies/Eluant.dll.config curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/${LAUNCHER_TAG}/Eluant.dll.config
fi
if [ ! -f libfreetype.6.dylib ]; then
echo "Fetching OS X FreeType library from GitHub."
curl -LOs https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/libfreetype.6.dylib
fi fi