rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

OP-1879 remove openpilot hardcoding: change GCS_APP_PATH on Mac removing pointless bin subdir

Browse Source
This commit is contained in:
James Duley 2015-05-08 20:43:32 +12:00 committed by LibrePilot Packager
parent 1b9df07394
commit c992daddaf
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ground/openpilotgcs/openpilotgcs.pri
View File

@ -132,23 +132,27 @@ isEmpty(TOOLS_DIR) {
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$ROOT_DIR/tools) isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$ROOT_DIR/tools)
} }
GCS_APP_PATH = $$GCS_BUILD_TREE/bin
macx { macx {
GCS_APP_TARGET = "OpenPilot GCS" 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_PLUGIN_PATH = $$GCS_LIBRARY_PATH
GCS_QT_QML_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Imports GCS_QT_QML_PATH = $$GCS_PATH/Imports
GCS_DATA_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources GCS_DATA_PATH = $$GCS_PATH/Resources
GCS_DATA_BASENAME = Resources GCS_DATA_BASENAME = Resources
GCS_DOC_PATH = $$GCS_DATA_PATH/doc GCS_DOC_PATH = $$GCS_DATA_PATH/doc
copydata = 1 copydata = 1
copyqt = 1 copyqt = 1
} else { } 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_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_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 !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
@ -162,14 +166,11 @@ macx {
MESAWIN_DIR = $$(MESAWIN_DIR) MESAWIN_DIR = $$(MESAWIN_DIR)
isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin isEmpty(MESAWIN_DIR):MESAWIN_DIR = $${TOOLS_DIR}/mesawin
GCS_APP_TARGET = openpilotgcs
GCS_QT_PLUGINS_PATH = $$GCS_APP_PATH GCS_QT_PLUGINS_PATH = $$GCS_APP_PATH
GCS_QT_QML_PATH = $$GCS_APP_PATH GCS_QT_QML_PATH = $$GCS_APP_PATH
copyqt = $$copydata copyqt = $$copydata
} else { } else {
GCS_APP_TARGET = openpilotgcs
GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5 GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5
GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib
GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins

7
ground/openpilotgcs/src/app/app.pro
View File

@ -3,7 +3,12 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
TEMPLATE = app TEMPLATE = app
TARGET = $$GCS_APP_TARGET 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 QT += xml widgets

1
ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/udptest.pro
View File

@ -4,7 +4,6 @@ QT += core gui network widgets
TEMPLATE = app TEMPLATE = app
TARGET = udp_test TARGET = udp_test
DESTDIR = $$GCS_APP_PATH
HEADERS += \ HEADERS += \
udptestwidget.h udptestwidget.h

2
package/osx/package
View File

@ -4,7 +4,7 @@
: ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?} : ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?}
# more variables # 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" OUT_FILE="${PACKAGE_DIR}/../${PACKAGE_NAME}${PACKAGE_SEP}${PACKAGE_LBL}${PACKAGE_SEP}osx.dmg"
SRC_DIR="${PACKAGE_DIR}/src" SRC_DIR="${PACKAGE_DIR}/src"