X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=777f98e6c3ca1ca27e42a739f00e803cec6d896f;hb=95116b13a141d9a74d5738418829c42759d80504;hp=7f8a31e5303a5433dd311645fa79b83fc8c5287b;hpb=9fe237892c9dd3a11e6406a69c464c28ef2cbf6e;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 7f8a31e53..777f98e6c 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -3,12 +3,12 @@ DESCRIPTION = "App Lanucher app in QML format for the AGL Demonstrator @ CESS201
HOMEPAGE = "https://git.automotivelinux.org/gerrit/#/admin/projects/AGL/DemoApps/CES2017"
LICENSE = "MPL-2.0"
SECTION = "apps"
-PV = "1.0+git"
+PV = "1.0+git${SRCPV}"
S = "${WORKDIR}/git/"
PN = "ces2017-demo"
inherit qmake5
-DEPENDS = " qtbase qtdeclarative qtquickcontrols2 qtmultimedia homescreen zip-native"
+DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
@@ -18,6 +18,7 @@ SRCREV = "${AUTOREV}"
RDEPENDS_${PN} += " \
qtmultimedia-qmlplugins \
+ qtmultimedia-rtlfm-radio-plugin \
qtquickcontrols-qmlplugins \
qtquickcontrols2-qmlplugins \
qtsvg-plugins \
@@ -56,54 +57,6 @@ do_install_prepend() {
- echo " \
- \
- Home \
- \
- Home app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Home/config.xml
-
- cd ${B}/apps/Home/
- zip home.wgt config.xml home
-
-
-
- echo " \
- \
- HVAC \
- \
- HVAC app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/HVAC/config.xml
-
- cd ${B}/apps/HVAC/
- zip hvac.wgt config.xml hvac
-
-
-
- echo " \
- \
- MediaPlayer \
- \
- MediaPlayer app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/MediaPlayer/config.xml
-
- cd ${B}/apps/MediaPlayer/
- zip mediaplayer.wgt config.xml mediaplayer
-
-
-
echo " \
\
Phone \
@@ -136,31 +89,14 @@ do_install_prepend() {
- echo " \
- \
- Settings \
- \
- Settings app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Settings/config.xml
-
- cd ${B}/apps/Settings/
- zip settings.wgt config.xml settings
-
-
cat > ${B}/apps/installAllApps.sh <<-EOF
#!/bin/sh
/usr/bin/afm-util install controls.wgt
/usr/bin/afm-util install dashboard.wgt
- /usr/bin/afm-util install home.wgt
- /usr/bin/afm-util install hvac.wgt
- /usr/bin/afm-util install mediaplayer.wgt
/usr/bin/afm-util install phone.wgt
/usr/bin/afm-util install radio.wgt
/usr/bin/afm-util install settings.wgt
+ /usr/bin/afm-util install navigation.wgt
EOF
}
@@ -168,12 +104,8 @@ do_install() {
install -d ${D}/usr/AGL/${PN}
install -m 0644 ${B}/apps/Controls/controls.wgt ${D}/usr/AGL/${PN}/
install -m 0644 ${B}/apps/Dashboard/dashboard.wgt ${D}/usr/AGL/${PN}/
- install -m 0644 ${B}/apps/Home/home.wgt ${D}/usr/AGL/${PN}/
- install -m 0644 ${B}/apps/HVAC/hvac.wgt ${D}/usr/AGL/${PN}/
- install -m 0644 ${B}/apps/MediaPlayer/mediaplayer.wgt ${D}/usr/AGL/${PN}/
install -m 0644 ${B}/apps/Phone/phone.wgt ${D}/usr/AGL/${PN}/
install -m 0644 ${B}/apps/Radio/radio.wgt ${D}/usr/AGL/${PN}/
- install -m 0644 ${B}/apps/Settings/settings.wgt ${D}/usr/AGL/${PN}/
install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/${PN}/
@@ -181,6 +113,16 @@ do_install() {
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
@@ -199,6 +141,15 @@ 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 \
"