diff options
author | Scott Murray <scott.murray@konsulko.com> | 2019-10-20 11:30:15 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2019-10-20 13:16:26 -0400 |
commit | d7d65ef59bd9e54787fdebebe39ea0d8e1155769 (patch) | |
tree | 26fc3bba8202707beddd2034ebaaecf8c6dd3b09 /autobuild/linux | |
parent | 1d3670c387c43f355f7190274085c55098fac90f (diff) |
Fixes and rework to allow using with cluster demo
Changes include:
- Remove older libhomescreen and qlibwindowmanager detection and
configuration from qmake configuration in favor of PKGCONFIG
usage.
- Rework main.cpp to look more like ondemandnavi, and use
qlibhomescreen instead of libhomescreen.
- Update file_operation.{h,cpp} with the newer versions from
ondemandnavi that include OSM configuration.
- Fixed typo in arrived signal name in org.agl.naviapi.xml and
dbus_client.cpp.
- Change some qDebug messages in dbus_client.cpp to qWarning as it
seems more appropriate.
- Rework QtLocation plugin configuration in MapWindow.qml to
support OSM and replace mapboxgl with mapbox, as mapboxgl does not
seem to work out of the box.
- Tweak various things in MapWindow.qml to try to better match the
look of ondemandnavi.
- Many commenting and whitespace fixes in MapWindow.qml.
- Update widget config.xml to add now required display permission,
and add the hidden permission so the application will not show up
in the launcher.
- Add license files for the various header files in include/mapbox,
and update README.md to indicate where they come from and what
files the different licenses apply to.
Bug-AGL: SPEC-2913
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I192efd45ab94ace8234dbe6c8983257a24e51d23
Diffstat (limited to 'autobuild/linux')
-rw-r--r-- | autobuild/linux/autobuild | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild new file mode 100644 index 0000000..569d692 --- /dev/null +++ b/autobuild/linux/autobuild @@ -0,0 +1,62 @@ +#!/usr/bin/make -f +# Copyright (C) 2015 - 2018 "IoT.bzh" +# Author "Romain Forlot" <romain.forlot@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +THISFILE := $(lastword $(MAKEFILE_LIST)) +BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build) +DEST := ${BUILD_DIR} + +.PHONY: all clean distclean configure build package help update + +all: help + +help: + @echo "List of targets available:" + @echo "" + @echo "- all + @echo "- clean" + @echo "- distclean" + @echo "- configure" + @echo "- build: compilation, link and prepare files for package into a widget" + @echo "- package: output a widget file '*.wgt'" + @echo "- install: install in your defined DEST directory" + @echo "" + @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt" + @echo "Don't use your build dir as DEST as wgt file is generated at this location" + + clean: + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean + +distclean: + @[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean + +configure: + @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} + @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..) + +build: configure + @make -C ${BUILD_DIR} ${BUILD_ARGS} all + +package: build + @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \ + mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \ + fi + +install: build + @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ + mkdir -p ${DEST} && cp -rf ${BUILD_DIR}/package/root/* ${DEST}; \ + fi + |