rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00
Code Issues Releases Activity

Make qt56-env.sh be sourced automatically

Browse Source
This commit is contained in:
James Duley 2016-05-19 21:20:16 +01:00
parent 8a153de206
commit 128b1ef5dd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -11,7 +11,6 @@ before_install:
- make arm_sdk_install - make arm_sdk_install
script: script:
- . /opt/qt56/bin/qt56-env.sh
- make config_new CCACHE=ccache GCS_EXTRA_CONF='osg osgearth' - make config_new CCACHE=ccache GCS_EXTRA_CONF='osg osgearth'
- make all_flight - make all_flight
- make opfw_resource - make opfw_resource

12
make/tools.mk
View File

@ -552,9 +552,15 @@ ifeq ($(shell [ -d "$(QT_SDK_DIR)" ] && $(ECHO) "exists"), exists)
export LD_LIBRARY_PATH := $(QT_SDK_DIR)/lib:$(LD_LIBRARY_PATH) export LD_LIBRARY_PATH := $(QT_SDK_DIR)/lib:$(LD_LIBRARY_PATH)
endif endif
else else
# not installed, hope it's in the path... OPT_QT := qt56
# $(info $(EMPTY) WARNING $(call toprel, $(QT_SDK_DIR)) not found (make qt_sdk_install), using system PATH) OPT_QT_ENV_SH := /opt/$(OPT_QT)/bin/$(OPT_QT)-env.sh
QMAKE ?= qmake ifneq ($(wildcard $(OPT_QT_ENV_SH)),)
SHELL := /bin/bash
QMAKE := . $(OPT_QT_ENV_SH) && qmake
else
# not installed, hope it's in the path...
QMAKE := qmake
endif
endif endif
.PHONY: qt_sdk_version .PHONY: qt_sdk_version

3
package/linux/deb.mk
View File

@ -24,7 +24,6 @@ SED_SCRIPT := $(SED_SCRIPT)' \
' '
# Ubuntu 14.04 (Trusty Tahr) use qt in /opt PPA # Ubuntu 14.04 (Trusty Tahr) use qt in /opt PPA
OPT_QT := qt56
TRUSTY_DEPS_SED := s/qml-module-.*/$(OPT_QT)quickcontrols/g; \ TRUSTY_DEPS_SED := s/qml-module-.*/$(OPT_QT)quickcontrols/g; \
s/qt5-default.*/$(OPT_QT)-meta-minimal, $(OPT_QT)svg, $(OPT_QT)script, $(OPT_QT)serialport, $(OPT_QT)multimedia, $(OPT_QT)translations, $(OPT_QT)tools/g; s/qt5-default.*/$(OPT_QT)-meta-minimal, $(OPT_QT)svg, $(OPT_QT)script, $(OPT_QT)serialport, $(OPT_QT)multimedia, $(OPT_QT)translations, $(OPT_QT)tools/g;
@ -51,8 +50,6 @@ debian: $(DEB_DIR)
$(V1) $(SED_SCRIPT) debian/changelog debian/control $(V1) $(SED_SCRIPT) debian/changelog debian/control
ifeq ($(DEB_DIST), trusty) ifeq ($(DEB_DIST), trusty)
$(V1) sed -i -e '$(TRUSTY_DEPS_SED)' debian/control $(V1) sed -i -e '$(TRUSTY_DEPS_SED)' debian/control
$(V1) sed -i -e 's,dh ,source /opt/$(OPT_QT)/bin/$(OPT_QT)-env.sh || true; dh ,' debian/rules
$(V1) echo "SHELL := /bin/bash" >> debian/rules
endif endif
.PHONY: package_src .PHONY: package_src