More mac compile script simplification

This commit is contained in:
Felix Kauselmann 2017-04-16 12:41:06 +02:00
parent 7837840883
commit fe7df7130e
2 changed files with 6 additions and 4 deletions

View File

@ -10,19 +10,19 @@ hash qmake 2>/dev/null || { echo >&2 "Qmake command not available. Please add th
echo "Compiling YACReader"
cd YACReader
qmake CONFIG+=release
qmake
make
cd ..
echo "Compiling YACReaderLibrary"
cd YACReaderLibrary
qmake CONFIG+=release
qmake
make
cd ..
echo "Compiling YACReaderLibraryServer"
cd YACReaderLibraryServer
qmake CONFIG+=release
qmake
make
cd ..
@ -51,6 +51,6 @@ cp README.txt "${dest}/"
echo "Creating dmg package"
#tar -czf "${dest}".tar.gz "${dest}"
#hdiutil create "${dest}".dmg -srcfolder "./${dest}" -ov
./create-dmg --volname 'YACReader '$VERSION' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "${dest}.dmg" "${dest}"
dependencies/create-dmg/create-dmg --volname 'YACReader '$VERSION' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "${dest}.dmg" "${dest}"
echo "Done!"

View File

@ -6,9 +6,11 @@ macdeployqt YACReader.app
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 release/server YACReaderLibrary.app/Contents/MacOS/
cp -R release/server YACReaderLibraryServer.app/Contents/MacOS/
cp -R release/languages YACReader.app/Contents/MacOS/