From 0f16b9e3c0d7ebc727b704159c8a66ec82025e84 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 28 Feb 2015 22:17:48 -0800 Subject: [PATCH] Previous cp of app to current dir too flaky Switch to cd into release and then back to run macdelpoyqt --- QGCInstaller.pri | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/QGCInstaller.pri b/QGCInstaller.pri index 010d4ad8d..b69e7290b 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -19,15 +19,12 @@ installer { MacBuild { - # We copy qgroundcontrol.app to the current 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 - # be created correctly. - QMAKE_POST_LINK += && rm -rf qgroundcontrol.app - QMAKE_POST_LINK += && cp -r $${DESTDIR}/qgroundcontrol.app . + # 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 be created correctly. + QMAKE_POST_LINK += && cd release QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=src -dmg - QMAKE_POST_LINK += && rm -rf qgroundcontrol.app - QMAKE_POST_LINK += && cp qgroundcontrol.dmg release - QMAKE_POST_LINK += && rm -rf qgroundcontrol.dmg + QMAKE_POST_LINK += && cd .. } WindowsBuild { -- 2.22.0