Revert "autobuild: introduce build scripts"

We need to double-check this works with the recipe.

This reverts commit e931f079cf5015299256f2f01b824ae42247127e.

Change-Id: I8471e87d1234d98850f2a60114bde34e2dc009a6

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..7a441d4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[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
deleted file mode 100755 (executable)
index e87a1c3..0000000
--- a/autobuild/agl/autobuild
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/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
deleted file mode 100755 (executable)
index 9ec2f6e..0000000
--- a/autobuild/linux/autobuild
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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 8baa90d..3a25880 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
 QT = qml quick dbus websockets
 CONFIG += c++11 link_pkgconfig
 DESTDIR = $${OUT_PWD}/../package/root/bin

-PKGCONFIG += qlibwindowmanager qtappfw afb-helpers-qt
+PKGCONFIG += qlibwindowmanager qtappfw

 
 LIBS += -lhomescreen
 
 
 LIBS += -lhomescreen
 


@@ -30,14 +30,16 @@ SOURCES += \
     src/statusbarserver.cpp \
     src/applicationlauncher.cpp \
     src/mastervolume.cpp \
     src/statusbarserver.cpp \
     src/applicationlauncher.cpp \
     src/mastervolume.cpp \

-    src/homescreenhandler.cpp
+    src/homescreenhandler.cpp \
+    helpers/qafbwebsocketclient.cpp

 
 HEADERS  += \
     src/statusbarmodel.h \
     src/statusbarserver.h \
     src/applicationlauncher.h \
     src/mastervolume.h \
 
 HEADERS  += \
     src/statusbarmodel.h \
     src/statusbarserver.h \
     src/applicationlauncher.h \
     src/mastervolume.h \

-    src/homescreenhandler.h
+    src/homescreenhandler.h \
+    helpers/qafbwebsocketclient.h

 
 OTHER_FILES += \
     README.md
 
 OTHER_FILES += \
     README.md

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

-#include "../qafbwebsocketclient.h"
+#include "../helpers/qafbwebsocketclient.h"

 
 class MasterVolume
        : public QObject
 
 class MasterVolume
        : public QObject