autobuild: introduce build scripts

This reverts commit bde8622fc349829cf03e196f2161995688fc1a09.

Which reverted the original commit from Raquel.
With the dependency added, we can go ahead now.

Thanks for the fix.

Change-Id: Ia0e5c34252eb832dbaebb643e7e06e53d74c29dc

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 7a441d4..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "homescreen/helpers"]
-       path = homescreen/helpers
-       url =  https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
new file mode 100755 (executable)
index 0000000..e87a1c3
--- /dev/null
+++ b/autobuild/agl/autobuild
@@ -0,0 +1,58 @@
+#!/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
+
+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 INSTALL_ROOT 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 ${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
+       @make -C ${BUILD_DIR} ${INSTALL_ARGS} install

diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
new file mode 100755 (executable)
index 0000000..9ec2f6e
--- /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
+
+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
+

diff --git a/homescreen/homescreen.pro b/homescreen/homescreen.pro
index 3a25880..8baa90d 100644 (file)
--- a/homescreen/homescreen.pro
+++ b/homescreen/homescreen.pro
@@ -18,7 +18,7 @@ TARGET = HomeScreen
 QT = qml quick dbus websockets
 CONFIG += c++11 link_pkgconfig
 DESTDIR = $${OUT_PWD}/../package/root/bin
-PKGCONFIG += qlibwindowmanager qtappfw
+PKGCONFIG += qlibwindowmanager qtappfw afb-helpers-qt
 
 LIBS += -lhomescreen
 
@@ -30,16 +30,14 @@ SOURCES += \
     src/statusbarserver.cpp \
     src/applicationlauncher.cpp \
     src/mastervolume.cpp \
-    src/homescreenhandler.cpp \
-    helpers/qafbwebsocketclient.cpp
+    src/homescreenhandler.cpp
 
 HEADERS  += \
     src/statusbarmodel.h \
     src/statusbarserver.h \
     src/applicationlauncher.h \
     src/mastervolume.h \
-    src/homescreenhandler.h \
-    helpers/qafbwebsocketclient.h
+    src/homescreenhandler.h
 
 OTHER_FILES += \
     README.md

diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h
index e23e8d1..6ae0aad 100644 (file)
--- a/homescreen/src/mastervolume.h
+++ b/homescreen/src/mastervolume.h
@@ -16,7 +16,7 @@
 
 #include <QtCore/QObject>
 #include <QQmlEngine>
-#include "../helpers/qafbwebsocketclient.h"
+#include "../qafbwebsocketclient.h"
 
 class MasterVolume
        : public QObject