X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=281944d9944fdbc5d06fde0013f44fe6f8977953;hb=726fdfebd33e0c2d000c68db3f5495fffb50af2a;hp=c94950bfe0fa18d8b0d791f066e95adbdefc269e;hpb=7de25f68bba5465f547751ad617360c243dd0aff;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
index c94950bfe..281944d99 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -1,38 +1,65 @@
-SUMMARY     = "Homescreen for the AGL Demonstrator @ CES2017"
-DESCRIPTION = "Homescreen apps in QML format for the AGL Demonstrator @ CESS2017"
+SUMMARY     = "App Launcher for the AGL Demonstrator @ CES2017"
+DESCRIPTION = "App Lanucher app in QML format for the AGL Demonstrator @ CESS2017"
 HOMEPAGE    = "https://git.automotivelinux.org/gerrit/#/admin/projects/AGL/DemoApps/CES2017"
-
 SECTION     = "apps"
-
-PN = "ces2017-demo"
-
 LICENSE     = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
 
-SRC_URI     = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http"
-SRCREV      = "${AUTOREV}"
-
-PV = "1.0+git"
+DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
 
-RDEPENDS_${PN} += " \
-    qtmultimedia-qmlplugins \
-    qtquickcontrols-qmlplugins \
-    qtsvg-plugins \
-    "
+PV = "1.0+git${SRCPV}"
+PN = "ces2017-demo"
 
-# custom configure and install as these are just qml files
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http"
+SRCREV = "${AUTOREV}"
 
-# we work in the git checkout ...
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/"
 
-do_configure() {
-    ls
-}
+inherit qmake5
 
-# plain copy in own folder for now
 do_install() {
-    mkdir -p ${D}/usr/AGL/CES2017/
-    cp -rf ./* ${D}/usr/AGL/CES2017/
+    install -d ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/qmldir ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/ImageButton.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/ToggleButton.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Key.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/AbstractKeyboard.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Symbols.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Alphabet.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Keyboard.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -d ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Back.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Shift.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Space.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Arrow.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+
+    install -d ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL
+    install -m 0644 ${S}/imports/qtquickcontrols2aglstyle/*.qml ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL
+
+    install -d ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL/images/
+    install -m 0644 ${S}/imports/qtquickcontrols2aglstyle/images/* ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL/images/
 }
 
-FILES_${PN} = "/usr/AGL/"
+FILES_${PN} += " \
+	/usr/AGL/ \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/qmldir \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/ImageButton.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/ToggleButton.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Key.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/AbstractKeyboard.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Symbols.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Alphabet.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Keyboard.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Back.svg \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Shift.svg \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Space.svg \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Arrow.svg \
+	/usr/lib/qt5/qml/QtQuick/Controls.2/AGL \
+	/usr/lib/qt5/qml/QtQuick/Controls.2/AGL/images \
+"
+
+RDEPENDS_${PN} += " \
+	qtquickcontrols-qmlplugins \
+	qtquickcontrols2-qmlplugins \
+	qtsvg-plugins \
+"