X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=6c10650bcd11481e7a3accaddf174f40f1c4a214;hb=802a2425be0d4b16bc72528ae8c2dedb0f788e66;hp=cdb0d58b823216e4a435492533d53a21945fc6d1;hpb=0041317e6115e0c662be713a7c43a7a1fb926a5a;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 cdb0d58b8..6c10650bc 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -3,18 +3,22 @@ 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 qtvirtualkeyboard qtmultimedia homescreen zip-native"
+DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http"
-SRCREV = "${AUTOREV}"
+# ALS, CES, FOSDEM available
+AGL_RADIO_PRESETS_LOCALE ?= "CES"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http \
+ file://presets-${AGL_RADIO_PRESETS_LOCALE}.conf \
+"
+SRCREV = "${AUTOREV}"
RDEPENDS_${PN} += " \
qtmultimedia-qmlplugins \
@@ -57,54 +61,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,52 +92,48 @@ do_install_prepend() {
zip radio.wgt config.xml radio
-
- 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
+ cd /usr/AGL/apps
+ for file in \`find . -maxdepth 1 -name '*.wgt'\`; do
+
+ /usr/bin/afm-util install \$file
+ done
+ sync
+
+ #it's Workaround
+ cyad -s -k MANIFESTS -t allow -c User::App::navigation -u '*' -p 'http://tizen.org/privilege/internal/dbus'
+ cyad -s -k MANIFESTS -t allow -c User::App::poi -u '*' -p 'http://tizen.org/privilege/internal/dbus'
EOF
}
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 -d ${D}/usr/AGL/apps
+ install -m 0644 ${B}/apps/Controls/controls.wgt ${D}/usr/AGL/apps/
+ install -m 0644 ${B}/apps/Dashboard/dashboard.wgt ${D}/usr/AGL/apps/
+ install -m 0644 ${B}/apps/Phone/phone.wgt ${D}/usr/AGL/apps/
+ install -m 0644 ${B}/apps/Radio/radio.wgt ${D}/usr/AGL/apps/
+ install -d ${D}/home/root/app-data/radio
+ install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}/home/root/app-data/radio/presets.conf
- install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/${PN}/
+ install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/apps/
+ ln -sf ../apps/installAllApps.sh ${D}/usr/AGL/${PN}/installAllApps.sh
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
@@ -197,9 +149,21 @@ do_install() {
#}
FILES_${PN} += "/usr/AGL/ \
+ /usr/AGL/apps/* \
+ /usr/AGL/${PN}/* \
+ /home/root/app-data/radio/presets.conf \
/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 \
"