X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=281944d9944fdbc5d06fde0013f44fe6f8977953;hb=1152f0e593f9179465ec0d996ff23adaefa2b926;hp=b72510caf011d16b1bbc2c4e1a65c872fe9ac0a0;hpb=f984a716b8d177b5f7e4844c5a294a53dce84531;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 b72510caf..281944d99 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -1,170 +1,37 @@
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"
-LICENSE = "MPL-2.0"
SECTION = "apps"
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git/"
-PN = "ces2017-demo"
-
-inherit qmake5
-DEPENDS = " qtbase qtdeclarative qtquickcontrols2 qtvirtualkeyboard qtmultimedia homescreen zip-native"
-
+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}"
-
-
-RDEPENDS_${PN} += " \
- qtmultimedia-qmlplugins \
- qtmultimedia-rtlfm-radio-plugin \
- qtquickcontrols-qmlplugins \
- qtquickcontrols2-qmlplugins \
- qtsvg-plugins \
- "
-
-do_install_prepend() {
- echo " \
- \
- Controls \
- \
- Controls app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Controls/config.xml
-
- cd ${B}/apps/Controls/
- zip controls.wgt config.xml controls
-
-
-
- echo " \
- \
- Dashboard \
- \
- Dashboard app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Dashboard/config.xml
-
- cd ${B}/apps/Dashboard/
- zip dashboard.wgt config.xml dashboard
-
-
-
- echo " \
- \
- HVAC \
- \
- HVAC app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/HVAC/config.xml
-
- cd ${B}/apps/HVAC/
- zip hvac.wgt config.xml hvac
-
-
+DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
- echo " \
- \
- MediaPlayer \
- \
- MediaPlayer app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/MediaPlayer/config.xml
+PV = "1.0+git${SRCPV}"
+PN = "ces2017-demo"
- cd ${B}/apps/MediaPlayer/
- zip mediaplayer.wgt config.xml mediaplayer
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http"
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git/"
-
- echo " \
- \
- Phone \
- \
- Phone app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Phone/config.xml
-
- cd ${B}/apps/Phone/
- zip phone.wgt config.xml phone
-
-
-
- echo " \
- \
- Radio \
- \
- Radio app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Radio/config.xml
-
- cd ${B}/apps/Radio/
- 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 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
-}
+inherit qmake5
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/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}/
-
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
@@ -173,16 +40,26 @@ do_install() {
install -m 0644 ${S}/imports/qtquickcontrols2aglstyle/images/* ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL/images/
}
-# plain copy in own folder for now
-#do_install() {
-# mkdir -p ${D}/usr/AGL/CES2017/
-# cp -rf ./* ${D}/usr/AGL/CES2017/
-#}
-
-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 \
+"