From a5dbda3f765a063d56df3f0b83304010b0a19df7 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 9 Mar 2019 22:05:56 +0800 Subject: [PATCH] travis/macos: Use macpack to bundle dependencies This appears to properly handle the ffmpeg libraries that dylibbundler failed to patch. --- .travis/macos/deps.sh | 3 ++- .travis/macos/upload.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh index 1a547c0608..faeafa2165 100755 --- a/.travis/macos/deps.sh +++ b/.travis/macos/deps.sh @@ -1,5 +1,6 @@ #!/bin/sh -ex brew update -brew install dylibbundler p7zip qt5 sdl2 ccache +brew install p7zip qt5 sdl2 ccache brew outdated cmake || brew upgrade cmake +pip3 install macpack diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index 965e9e7946..66e3455ff6 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -12,12 +12,12 @@ cp build/bin/yuzu-cmd "$REV_NAME" cp -r build/bin/yuzu.app "$REV_NAME" # move libs into folder for deployment -dylibbundler -b -x "${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" -cd -d "${REV_NAME}/yuzu.app/Contents/Frameworks/" -p "@executable_path/../Frameworks/" -of +macpack "${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" -d "../Frameworks" # move qt frameworks into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" -executable="${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" # move libs into folder for deployment -dylibbundler -b -x "${REV_NAME}/yuzu-cmd" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/" +macpack "${REV_NAME}/yuzu-cmd" -d "libs" # Make the yuzu.app application launch a debugging terminal. # Store away the actual binary