summaryrefslogtreecommitdiffstats
path: root/autobuild
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-08-30 13:37:11 -0400
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-12-01 21:08:10 -0800
commit4cb2d04a796d5a081226552ad5ad594586ec1514 (patch)
tree6bea3ac4de640d98c8c27ffd0c02f9eb86ca0773 /autobuild
parent4d295e4a5c07f6282cf63307b982f93c4e2b7dc9 (diff)
binding: navigation: rewrite of navigation binding
To remove dependency on DBus the binding needed to be rewritten to output pure JSON output to subscribed consumers. Bug-AGL: SPEC-2880 Change-Id: Ie85dfccd42ca36119116a0fbfb16bf4e96efc184 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'autobuild')
-rwxr-xr-xautobuild/agl/autobuild4
-rwxr-xr-xautobuild/linux/autobuild30
2 files changed, 27 insertions, 7 deletions
diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index a086c89..db00c1a 100755
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -59,8 +59,8 @@ package: build
@mkdir -p ${BUILD_DIR}/$@/htdocs
@mkdir -p ${BUILD_DIR}/$@/var
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
- @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
- mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
fi
package-test: build
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
index 512adda..db00c1a 100755
--- a/autobuild/linux/autobuild
+++ b/autobuild/linux/autobuild
@@ -16,7 +16,7 @@
THISFILE := $(lastword $(MAKEFILE_LIST))
BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
-DESTDIR := ${BUILD_DIR}
+DEST := ${BUILD_DIR}
.PHONY: all clean distclean configure build package help update
@@ -33,8 +33,11 @@ help:
@echo "- package: output a widget file '*.wgt'"
@echo "- install: install in your ${CMAKE_INSTALL_DIR} directory"
@echo ""
- @echo "Usage: ./autobuild/linux/autobuild package DESTDIR=${HOME}/opt"
- @echo "Don't use your build dir as DESTDIR as wgt file is generated at this location"
+ @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"
+
+update: configure
+ @cmake --build ${BUILD_DIR} --target autobuild
clean:
@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
@@ -50,9 +53,26 @@ build: configure
@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
package: build
+ @mkdir -p ${BUILD_DIR}/$@/bin
+ @mkdir -p ${BUILD_DIR}/$@/etc
+ @mkdir -p ${BUILD_DIR}/$@/lib
+ @mkdir -p ${BUILD_DIR}/$@/htdocs
+ @mkdir -p ${BUILD_DIR}/$@/var
+ @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+ fi
+
+package-test: build
+ @mkdir -p ${BUILD_DIR}/$@/bin
+ @mkdir -p ${BUILD_DIR}/$@/etc
+ @mkdir -p ${BUILD_DIR}/$@/lib
+ @mkdir -p ${BUILD_DIR}/$@/htdocs
+ @mkdir -p ${BUILD_DIR}/$@/var
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
- @if [ "${DESTDIR}" != "${BUILD_DIR}" ]; then \
- mkdir -p ${DESTDIR} && cp ${BUILD_DIR}/*.wgt ${DESTDIR}; \
+ @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
fi
install: build