From 66fb10276fb6f5ecdc1a129735a1269855b71883 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Mon, 17 Apr 2017 19:13:21 +0200 Subject: [PATCH] Use qrencode from brew --- releaseOSX.sh | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/releaseOSX.sh b/releaseOSX.sh index dafd649c..30fd7a03 100755 --- a/releaseOSX.sh +++ b/releaseOSX.sh @@ -7,9 +7,30 @@ macdeployqt YACReaderLibrary.app -qmldir=YACReaderLibrary/qml macdeployqt YACReaderLibraryServer.app #TODO: This copies unneeded stuff into the respective apps -cp -R utils YACReader.app/Contents/MacOS/ -cp -R utils YACReaderLibrary.app/Contents/MacOS/ -cp -R utils YACReaderLibraryServer.app/Contents/MacOS/ +#cp -R utils YACReader.app/Contents/MacOS/ +#cp -R utils YACReaderLibrary.app/Contents/MacOS/ +#cp -R utils YACReaderLibraryServer.app/Contents/MacOS/ + +mkdir -p YACReaderLibrary.app/Contents/MacOS/utils + +cp -L /usr/local/bin/qrencode YACReaderLibrary.app/Contents/MacOS/utils/ +#TODO: avoid using fixed paths here. Get the info from otool instead! + +cp /usr/local/Cellar/qrencode/3.4.4/lib/libqrencode.3.dylib \ +YACReaderLibrary.app/Contents/MacOS/utils + +cp /usr/local/opt/libpng/lib/libpng16.16.dylib \ +YACReaderLibrary.app/Contents/MacOS/utils + +chmod +w YACReaderLibrary.app/Contents/MacOS/utils/* + +install_name_tool -change /usr/local/Cellar/qrencode/3.4.4/lib/libqrencode.3.dylib \ +@executable_path/utils/libqrencode.3.dylib \ +YACReaderLibrary.app/Contents/MacOS/utils/qrencode + +install_name_tool -change /usr/local/opt/libpng/libpng16.16.dylib \ +@executable_path/utils/libpng16.16.dylib \ +YACReaderLibrary.app/Contents/MacOS/utils/qrencode cp -R release/server YACReaderLibrary.app/Contents/MacOS/ cp -R release/server YACReaderLibraryServer.app/Contents/MacOS/ @@ -17,4 +38,5 @@ cp -R release/languages YACReader.app/Contents/MacOS/ cp -R release/languages YACReaderLibrary.app/Contents/MacOS/ cp -R release/languages YACReaderLibraryServer.app/Contents/MacOS/ +echo "Copied!" #./signapps.sh