Commit 282d1258 authored by Don Gagne's avatar Don Gagne

Merge pull request #1289 from DonLakeFlyer/OSXInstaller

Previous cp of app to current dir too flaky (OS X Installer)
parents 568eb81b 0f16b9e3
...@@ -19,15 +19,12 @@ ...@@ -19,15 +19,12 @@
installer { installer {
MacBuild { MacBuild {
# We copy qgroundcontrol.app to the current directory so we can run macdeployqt without a path to the # We cd to release directory so we can run macdeployqt without a path to the
# qgroundcontrol.app file. If you specify a path to the .app file the symbolic links to plugins will not # qgroundcontrol.app file. If you specify a path to the .app file the symbolic
# be created correctly. # links to plugins will not be created correctly.
QMAKE_POST_LINK += && rm -rf qgroundcontrol.app QMAKE_POST_LINK += && cd release
QMAKE_POST_LINK += && cp -r $${DESTDIR}/qgroundcontrol.app .
QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=src -dmg QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=src -dmg
QMAKE_POST_LINK += && rm -rf qgroundcontrol.app QMAKE_POST_LINK += && cd ..
QMAKE_POST_LINK += && cp qgroundcontrol.dmg release
QMAKE_POST_LINK += && rm -rf qgroundcontrol.dmg
} }
WindowsBuild { WindowsBuild {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment