rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-28 17:54:15 +01:00
Code Issues Releases Activity

OP-1741 Path wrong in version_info.pro: set it to ROOT_DIR

Browse Source
This commit is contained in:
James Duley 2015-02-23 13:32:50 +13:00
parent ad42ca7f16
commit 1c5710942c
3 changed files with 4 additions and 4 deletions
ground/openpilotgcs
openpilotgcs.pri
src
libs/version_info
version_info.pro
python.pri

4
ground/openpilotgcs/openpilotgcs.pri

@ -66,6 +66,8 @@ equals(TEST, 1) {
win32:!isEmpty(QMAKE_SH):QMAKE_COPY_DIR = cp -r -f win32:!isEmpty(QMAKE_SH):QMAKE_COPY_DIR = cp -r -f
GCS_SOURCE_TREE = $$PWD GCS_SOURCE_TREE = $$PWD
ROOT_DIR = $$GCS_SOURCE_TREE/../..
isEmpty(GCS_BUILD_TREE) { isEmpty(GCS_BUILD_TREE) {
sub_dir = $$_PRO_FILE_PWD_ sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),, sub_dir ~= s,^$$re_escape($$PWD),,
@ -80,7 +82,7 @@ isEmpty(TOOLS_DIR) {
# check for custom enviroment variable, # check for custom enviroment variable,
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR) TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
# fallback to default location. # fallback to default location.
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools) isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$ROOT_DIR/tools)
} }
GCS_APP_PATH = $$GCS_BUILD_TREE/bin GCS_APP_PATH = $$GCS_BUILD_TREE/bin

2
ground/openpilotgcs/src/libs/version_info/version_info.pro

@ -28,7 +28,7 @@ SOURCES = version_info.cpp
version_info.target = $$VERSION_INFO_FILE version_info.target = $$VERSION_INFO_FILE
version_info.commands = -$(MKDIR) $$targetPath($$VERSION_INFO_DIR) $$addNewline() version_info.commands = -$(MKDIR) $$targetPath($$VERSION_INFO_DIR) $$addNewline()
version_info.commands += $$VERSION_INFO_COMMAND \ version_info.commands += $$VERSION_INFO_COMMAND \
--path=\"$$GCS_SOURCE_TREE\" \ --path=\"$$ROOT_DIR\" \
--template=\"$$VERSION_INFO_TEMPLATE\" \ --template=\"$$VERSION_INFO_TEMPLATE\" \
--uavodir=\"$$UAVO_DEF_PATH\" \ --uavodir=\"$$UAVO_DEF_PATH\" \
--outfile=\"$$VERSION_INFO_FILE\" --outfile=\"$$VERSION_INFO_FILE\"

2
ground/openpilotgcs/src/python.pri

@ -3,8 +3,6 @@
# kept in sync with make/tools.mk. # kept in sync with make/tools.mk.
PYTHON_DIR = qt-5.4.0/Tools/mingw491_32/opt/bin PYTHON_DIR = qt-5.4.0/Tools/mingw491_32/opt/bin
ROOT_DIR = $$GCS_SOURCE_TREE/../..
# Search the python using environment override first # Search the python using environment override first
OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR) OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
!isEmpty(OPENPILOT_TOOLS_DIR):exists($$OPENPILOT_TOOLS_DIR/$$PYTHON_DIR/python*) { !isEmpty(OPENPILOT_TOOLS_DIR):exists($$OPENPILOT_TOOLS_DIR/$$PYTHON_DIR/python*) {