mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-19 16:51:06 +00:00
Merge pull request #4517 from MerryMage/simplify-macos-upload
[WIP] travis: Simplify macos/upload.sh
This commit is contained in:
commit
2feb87ba2d
@ -12,92 +12,26 @@ cp build/bin/citra "$REV_NAME"
|
|||||||
cp -r build/bin/citra-qt.app "$REV_NAME"
|
cp -r build/bin/citra-qt.app "$REV_NAME"
|
||||||
cp build/bin/citra-room "$REV_NAME"
|
cp build/bin/citra-room "$REV_NAME"
|
||||||
|
|
||||||
# move qt libs into app bundle for deployment
|
# move libs into folder for deployment
|
||||||
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
|
dylibbundler -b -x "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -cd -d "${REV_NAME}/citra-qt.app/Contents/Frameworks/" -p "@executable_path/../Frameworks/" -of
|
||||||
|
# move qt frameworks into app bundle for deployment
|
||||||
|
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" -executable="${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt"
|
||||||
|
|
||||||
# move SDL2 libs into folder for deployment
|
# move libs into folder for deployment
|
||||||
dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
|
dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
|
||||||
|
|
||||||
# Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).
|
# TODO(merry): Figure out why these libraries are not automatically processed
|
||||||
# To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks
|
install_name_tool -change /usr/local/Cellar/ffmpeg/4.1_1/lib/libavutil.56.dylib @executable_path/../Frameworks/libavutil.56.dylib "${REV_NAME}/citra-qt.app/Contents/Frameworks/libavcodec.58.dylib"
|
||||||
# (in the Contents/Frameworks folder).
|
install_name_tool -change /usr/local/Cellar/ffmpeg/4.1_1/lib/libavutil.56.dylib @executable_path/../Frameworks/libavutil.56.dylib "${REV_NAME}/citra-qt.app/Contents/Frameworks/libswresample.3.dylib"
|
||||||
# The "install_name_tool" is used to do so.
|
install_name_tool -change /usr/local/Cellar/ffmpeg/4.1_1/lib/libavutil.56.dylib @executable_path/libs/libavutil.56.dylib "${REV_NAME}/libs/libavcodec.58.dylib"
|
||||||
|
install_name_tool -change /usr/local/Cellar/ffmpeg/4.1_1/lib/libavutil.56.dylib @executable_path/libs/libavutil.56.dylib "${REV_NAME}/libs/libswresample.3.dylib"
|
||||||
# Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:
|
install_name_tool -change /usr/local/Cellar/libvorbis/1.3.6/lib/libvorbis.0.dylib @executable_path/libs/libavutil.56.dylib "${REV_NAME}/libs/libvorbisenc.2.dylib"
|
||||||
# ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1
|
|
||||||
# grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1
|
|
||||||
brew install coreutils || brew upgrade coreutils || true
|
|
||||||
|
|
||||||
REV_NAME_ALT=$REV_NAME/
|
|
||||||
# grealpath is located in coreutils, there is no "realpath" for OS X :(
|
|
||||||
QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")
|
|
||||||
BREW_PATH=$(brew --prefix)
|
|
||||||
QT_VERSION_NUM=5
|
|
||||||
|
|
||||||
$BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \
|
|
||||||
-executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"
|
|
||||||
|
|
||||||
# These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.
|
|
||||||
declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")
|
|
||||||
|
|
||||||
for macos_lib in "${macos_libs[@]}"
|
|
||||||
do
|
|
||||||
SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib
|
|
||||||
# Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)
|
|
||||||
cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
|
|
||||||
|
|
||||||
# Replace references within the embedded Framework files with "internal" versions.
|
|
||||||
for macos_lib2 in "${macos_libs[@]}"
|
|
||||||
do
|
|
||||||
# Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.
|
|
||||||
# /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.
|
|
||||||
# So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.
|
|
||||||
RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
|
|
||||||
install_name_tool -change \
|
|
||||||
$QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
|
|
||||||
@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
|
|
||||||
"${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
|
|
||||||
install_name_tool -change \
|
|
||||||
"$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
|
|
||||||
@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
|
|
||||||
"${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
# Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`
|
|
||||||
# Which manifests itself as:
|
|
||||||
# "Exception Type: EXC_CRASH (SIGABRT) | Exception Codes: 0x0000000000000000, 0x0000000000000000 | Exception Note: EXC_CORPSE_NOTIFY"
|
|
||||||
# There may be more dylibs needed to be fixed...
|
|
||||||
declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")
|
|
||||||
|
|
||||||
for macos_lib in "${macos_plugins[@]}"
|
|
||||||
do
|
|
||||||
install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
|
|
||||||
for macos_lib2 in "${macos_libs[@]}"
|
|
||||||
do
|
|
||||||
RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
|
|
||||||
install_name_tool -change \
|
|
||||||
$QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
|
|
||||||
@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
|
|
||||||
"${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
|
|
||||||
install_name_tool -change \
|
|
||||||
"$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
|
|
||||||
@executable_path/../Frameworks/$RM_FRAMEWORK_PART \
|
|
||||||
"${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
for macos_lib in "${macos_libs[@]}"
|
|
||||||
do
|
|
||||||
# Debugging info for Travis-CI
|
|
||||||
otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Make the citra-qt.app application launch a debugging terminal.
|
# Make the citra-qt.app application launch a debugging terminal.
|
||||||
# Store away the actual binary
|
# Store away the actual binary
|
||||||
mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin
|
mv ${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt-bin
|
||||||
|
|
||||||
cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL
|
cat > ${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt <<EOL
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
cd "\`dirname "\$0"\`"
|
cd "\`dirname "\$0"\`"
|
||||||
chmod +x citra-qt-bin
|
chmod +x citra-qt-bin
|
||||||
@ -106,6 +40,9 @@ EOL
|
|||||||
# Content that will serve as the launching script for citra (within the .app folder)
|
# Content that will serve as the launching script for citra (within the .app folder)
|
||||||
|
|
||||||
# Make the launching script executable
|
# Make the launching script executable
|
||||||
chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt
|
chmod +x ${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt
|
||||||
|
|
||||||
|
# Verify loader instructions
|
||||||
|
find "$REV_NAME" -exec otool -L {} \;
|
||||||
|
|
||||||
. .travis/common/post-upload.sh
|
. .travis/common/post-upload.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user