From c992daddaf74590f5f741968ae74ec9ee676ae89 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Fri, 8 May 2015 20:43:32 +1200
Subject: [PATCH] OP-1879 remove openpilot hardcoding: change GCS_APP_PATH on
 Mac removing pointless bin subdir

---
 ground/openpilotgcs/openpilotgcs.pri          | 21 ++++++++++---------
 ground/openpilotgcs/src/app/app.pro           |  7 ++++++-
 .../plugins/hitl/aerosimrc/src/udptest.pro    |  1 -
 package/osx/package                           |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri
index b6cb24b3c..ea870c85f 100644
--- a/ground/openpilotgcs/openpilotgcs.pri
+++ b/ground/openpilotgcs/openpilotgcs.pri
@@ -132,23 +132,27 @@ isEmpty(TOOLS_DIR) {
     isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$ROOT_DIR/tools)
 }
 
-GCS_APP_PATH = $$GCS_BUILD_TREE/bin
 macx {
     GCS_APP_TARGET   = "OpenPilot GCS"
-    GCS_LIBRARY_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Plugins
+    GCS_PATH = $$GCS_BUILD_TREE/$${GCS_APP_TARGET}.app/Contents
+    GCS_APP_PATH = $$GCS_PATH/MacOS
+    GCS_LIBRARY_PATH = $$GCS_PATH/Plugins
     GCS_PLUGIN_PATH  = $$GCS_LIBRARY_PATH
-    GCS_QT_QML_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Imports
-    GCS_DATA_PATH    = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources
+    GCS_QT_QML_PATH = $$GCS_PATH/Imports
+    GCS_DATA_PATH    = $$GCS_PATH/Resources
     GCS_DATA_BASENAME = Resources
     GCS_DOC_PATH     = $$GCS_DATA_PATH/doc
     copydata = 1
     copyqt = 1
 } else {
-    GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
+    GCS_APP_TARGET = openpilotgcs
+    GCS_PATH         = $$GCS_BUILD_TREE
+    GCS_APP_PATH     = $$GCS_PATH/bin
+    GCS_LIBRARY_PATH = $$GCS_PATH/$$GCS_LIBRARY_BASENAME/openpilotgcs
     GCS_PLUGIN_PATH  = $$GCS_LIBRARY_PATH/plugins
-    GCS_DATA_PATH    = $$GCS_BUILD_TREE/share/openpilotgcs
+    GCS_DATA_PATH    = $$GCS_PATH/share/openpilotgcs
     GCS_DATA_BASENAME = share/openpilotgcs
-    GCS_DOC_PATH     = $$GCS_BUILD_TREE/share/doc
+    GCS_DOC_PATH     = $$GCS_PATH/share/doc
 
     !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
 
@@ -162,14 +166,11 @@ macx {
         MESAWIN_DIR = $$(MESAWIN_DIR)
         isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin
 
-        GCS_APP_TARGET   = openpilotgcs
-
         GCS_QT_PLUGINS_PATH = $$GCS_APP_PATH
         GCS_QT_QML_PATH = $$GCS_APP_PATH
 
         copyqt = $$copydata
     } else {
-        GCS_APP_TARGET   = openpilotgcs
         GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5
         GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib
         GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins
diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro
index d7b33ccae..b9ad8b6ac 100644
--- a/ground/openpilotgcs/src/app/app.pro
+++ b/ground/openpilotgcs/src/app/app.pro
@@ -3,7 +3,12 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
 
 TEMPLATE = app
 TARGET = $$GCS_APP_TARGET
-DESTDIR = $$GCS_APP_PATH
+macx {
+    # .app is 3 levels above the executable
+    DESTDIR = $$GCS_APP_PATH/../../..
+} else {
+    DESTDIR = $$GCS_APP_PATH
+}
 
 QT += xml widgets
 
diff --git a/ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/udptest.pro b/ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/udptest.pro
index 1d9a811e0..2412e589d 100644
--- a/ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/udptest.pro
+++ b/ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/udptest.pro
@@ -4,7 +4,6 @@ QT += core gui network widgets
 
 TEMPLATE = app
 TARGET = udp_test
-DESTDIR = $$GCS_APP_PATH
 
 HEADERS += \
     udptestwidget.h
diff --git a/package/osx/package b/package/osx/package
index b63d1b2f2..1fce408b0 100755
--- a/package/osx/package
+++ b/package/osx/package
@@ -4,7 +4,7 @@
 : ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?}
 
 # more variables
-APP_PATH="${BUILD_DIR}/openpilotgcs_release/bin/OpenPilot GCS.app"
+APP_PATH="${BUILD_DIR}/openpilotgcs_release/OpenPilot GCS.app"
 OUT_FILE="${PACKAGE_DIR}/../${PACKAGE_NAME}${PACKAGE_SEP}${PACKAGE_LBL}${PACKAGE_SEP}osx.dmg"
 
 SRC_DIR="${PACKAGE_DIR}/src"