aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Marec <frederic.marec@iot.bzh>2020-02-14 17:48:30 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-02-19 11:43:35 +0000
commit3094e43d82c4a2e52f1819db3ea9e88afc5ecbf8 (patch)
tree4cdfdf731b7e1f9fe310c01d2f42880e5aeedbc2
parent5e9d4f1c9dc9dc68c0899c7a2b4449f96bcec822 (diff)
Adapt aglwgt receipe to build multiple widget
Change package task and deploy task to allow creation of test, debug and coverage widget. Add debug and coverage directory to store new widgets Bug-AGL: SPEC-2049 Change-Id: Ic3c1250d43de023e2e08398a098746ecd71592c5 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
-rw-r--r--meta-app-framework/classes/aglwgt.bbclass109
1 files changed, 75 insertions, 34 deletions
diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index 717bd7b90..1ccdd76b8 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -27,26 +27,47 @@ EXTRA_OECMAKE_append_agl-ptest = " -DBUILD_TEST_WGT=TRUE"
OECMAKE_GENERATOR = "Unix Makefiles"
do_aglwgt_package() {
- cd ${B}
- ${S}/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B} VERBOSE=TRUE || \
- ( ${S}/conf.d/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B}/package VERBOSE=TRUE && \
- ( bbwarn "OBSOLETE: Your autobuild script should be located in :" ; \
- bbwarn "autobuild/agl/ from the project root source folder"; \
- bbwarn "and generate a .wgt file using wgtpack in the build"; \
- bbwarn "root folder calling:" ; \
- bbwarn "./autobuild/agl/autobuild package DEST=<BUILDDIR>" ; \
- bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes" \
- )
- ) ||
- ( bbwarn "OBSOLETE: You must have an autobuild script located in:" ; \
- bbwarn "autobuild/agl/ from the project root source folder"; \
- bbwarn "with filename autobuild which should generate"; \
- bbwarn "a .wgt file using wgtpack in the build"; \
- bbwarn "root folder calling:" ; \
- bbwarn "./autobuild/agl/autobuild package DEST=<BUILDDIR>" ; \
- bbwarn "Fix your package as it will not work within the SDK" ; \
- bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes"; \
- make package)
+
+ mkdir -p ${S}/build-test
+ mkdir -p ${S}/build-debug
+ mkdir -p ${S}/build-coverage
+
+ pushd ${B}
+ ${S}/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${S}/widgets VERBOSE=TRUE || \
+ ( ${S}/conf.d/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B}/package VERBOSE=TRUE && \
+ ( bbwarn "OBSOLETE: Your autobuild script should be located in :" ; \
+ bbwarn "autobuild/agl/ from the project root source folder"; \
+ bbwarn "and generate a .wgt file using wgtpack in the build"; \
+ bbwarn "root folder calling:" ; \
+ bbwarn "./autobuild/agl/autobuild package DEST=<BUILDDIR>" ; \
+ bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes" \
+ )
+ ) ||
+ ( bbwarn "OBSOLETE: You must have an autobuild script located in:" ; \
+ bbwarn "autobuild/agl/ from the project root source folder"; \
+ bbwarn "with filename autobuild which should generate"; \
+ bbwarn "a .wgt file using wgtpack in the build"; \
+ bbwarn "root folder calling:" ; \
+ bbwarn "./autobuild/agl/autobuild package DEST=<BUILDDIR>" ; \
+ bbwarn "Fix your package as it will not work within the SDK" ; \
+ bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes"; \
+ make package)
+ popd
+
+ pushd ${S}/build-test
+ ${S}/autobuild/agl/autobuild package-test BUILD_DIR=${S}/build-test DEST=${S}/widgets VERBOSE=TRUE || \
+ ( bbwarn "Target: package-test failed")
+ popd
+
+ pushd ${S}/build-debug
+ ${S}/autobuild/agl/autobuild package-debug BUILD_DIR=${S}/build-debug DEST=${S}/widgets VERBOSE=TRUE || \
+ ( bbwarn "Target: package-debug failed")
+ popd
+
+ pushd ${S}/build-coverage
+ ${S}/autobuild/agl/autobuild package-coverage BUILD_DIR=${S}/build-coverage DEST=${S}/widgets VERBOSE=TRUE || \
+ ( bbwarn "Target: package-coverage failed")
+ popd
}
python () {
@@ -61,21 +82,39 @@ EXTRA_WGT_POSTINSTALL ?= ""
do_aglwgt_deploy() {
TEST_WGT="*-test.wgt"
+ DEBUG_WGT="*-debug.wgt"
+ COVERAGE_WGT="*-coverage.wgt"
if [ "${AGLWGT_AUTOINSTALL_${PN}}" = "0" ]
- then
- install -d ${D}/usr/AGL/apps/manualinstall
- install -m 0644 ${B}/*.wgt ${D}/usr/AGL/apps/manualinstall || \
- install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/manualinstall
- else
- install -d ${D}/usr/AGL/apps/autoinstall
- install -m 0644 ${B}/*.wgt ${D}/usr/AGL/apps/autoinstall || \
- install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/autoinstall
-
- if [ "$(find ${D}/usr/AGL/apps/autoinstall -name ${TEST_WGT})" ]
- then
- install -d ${D}/usr/AGL/apps/testwgt
- mv ${D}/usr/AGL/apps/autoinstall/*-test.wgt ${D}/usr/AGL/apps/testwgt
- fi
+ then
+ install -d ${D}/usr/AGL/apps/manualinstall
+ install -m 0644 ${B}/*.wgt ${D}/usr/AGL/apps/manualinstall || \
+ install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/manualinstall
+ else
+ install -d ${D}/usr/AGL/apps/autoinstall
+ install -m 0644 ${B}/*.wgt ${D}/usr/AGL/apps/autoinstall || \
+ install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/autoinstall
+
+ install -m 0644 ${S}/widgets/*.wgt ${D}/usr/AGL/apps/autoinstall || \
+ ( bbwarn "no package found in widget directory")
+
+ if [ "$(find ${D}/usr/AGL/apps/autoinstall -name ${TEST_WGT})" ]
+ then
+ install -d ${D}/usr/AGL/apps/testwgt
+ mv ${D}/usr/AGL/apps/autoinstall/*-test.wgt ${D}/usr/AGL/apps/testwgt
+ fi
+
+ if [ "$(find ${D}/usr/AGL/apps/autoinstall -name ${DEBUG_WGT})" ]
+ then
+ install -d ${D}/usr/AGL/apps/debugwgt
+ mv ${D}/usr/AGL/apps/autoinstall/*-debug.wgt ${D}/usr/AGL/apps/debugwgt
+ fi
+
+ if [ "$(find ${D}/usr/AGL/apps/autoinstall -name ${COVERAGE_WGT})" ]
+ then
+ install -d ${D}/usr/AGL/apps/coveragewgt
+ mv ${D}/usr/AGL/apps/autoinstall/*-coverage.wgt ${D}/usr/AGL/apps/coveragewgt
+ fi
+
fi
APP_FILES=""
@@ -97,6 +136,8 @@ EOF
FILES_${PN} += "/usr/AGL/apps/autoinstall/*.wgt \
/usr/AGL/apps/manualinstall/*.wgt \
/usr/AGL/apps/testwgt/*.wgt \
+ /usr/AGL/apps/debugwgt/*.wgt \
+ /usr/AGL/apps/coveragewgt/*.wgt \
${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \
"