From 10fb487abf49a2ad1cff79541777e4ae986cad35 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 18 Nov 2017 15:24:43 +0000 Subject: [PATCH] Update macOS launcher/dependencies to latest tag. This supports/forces the 64 bit mono runtime, and is the first version that compiles all native code using travis-ci. --- packaging/osx/buildpackage.sh | 2 +- thirdparty/fetch-thirdparty-deps-osx.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 8a92b0a90d..38b2a42fed 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -9,7 +9,7 @@ if [[ "$OSTYPE" != "darwin"* ]]; then command -v genisoimage >/dev/null 2>&1 || { echo >&2 "macOS packaging requires genisoimage."; exit 1; } fi -LAUNCHER_TAG="osx-launcher-20171022" +LAUNCHER_TAG="osx-launcher-20171118" if [ $# -ne "2" ]; then echo "Usage: `basename $0` tag outputdir" diff --git a/thirdparty/fetch-thirdparty-deps-osx.sh b/thirdparty/fetch-thirdparty-deps-osx.sh index d1b61dc93a..f61ff09e9b 100755 --- a/thirdparty/fetch-thirdparty-deps-osx.sh +++ b/thirdparty/fetch-thirdparty-deps-osx.sh @@ -1,20 +1,22 @@ #!/bin/bash +LAUNCHER_TAG="osx-launcher-20171118" + download_dir="${0%/*}/download/osx" mkdir -p "$download_dir" cd "$download_dir" if [ ! -f libSDL2.dylib ]; then echo "Fetching OS X SDL2 library from GitHub." - curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/libSDL2.dylib + curl -LOs https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/libSDL2.dylib fi if [ ! -f liblua.5.1.dylib ]; then echo "Fetching OS X Lua 5.1 library from GitHub." - curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/liblua.5.1.dylib + curl -LOs https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/liblua.5.1.dylib fi if [ ! -f Eluant.dll.config ]; then echo "Fetching OS X Lua configuration file from GitHub." - curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/master/dependencies/Eluant.dll.config + curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/${LAUNCHER_TAG}/dependencies/Eluant.dll.config fi