X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Fclasses%2Faglwgt.bbclass;h=d0f8055ae95a325ea01bdaa353b346bd223d61c3;hb=d40e55dbb362c455f0ee863b23c21ac2628cf3f8;hp=ce566abca5402c4cc2d12b50d06c3657756d0e79;hpb=9aa10da61a5b63ab4f1511bd0e6c83149be4364b;p=AGL%2Fmeta-agl.git

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index ce566abca..d0f8055ae 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -15,16 +15,55 @@ DEPENDS_append = " af-main-native"
 # for bindings  af-binder is required.
 DEPENDS_append = " af-binder"
 
+# for bindings  that use the cmake-apps-module
+DEPENDS_append = " cmake-apps-module-native"
+
+# for hal bindings genskel is required.
+DEPENDS_append = " af-binder-devtools-native"
+
+EXTRA_OECMAKE_append_agl-ptest = " -DBUILD_TEST_WGT=TRUE"
+
+# FIXME: Remove once CMake+ninja issues are resolved
+OECMAKE_GENERATOR = "Unix Makefiles"
+
 do_aglwgt_package()  {
-        cd ${B}
-        ${S}/conf.d/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B}/package VERBOSE=TRUE || \
-        make package || \
-        ( bbwarn "Your makefile must support the 'make package' target" ; \
-          bbwarn "and generate a .wgt file using wgtpack in the"; \
-          bbwarn "subfolder ./package/ !" ; \
-          bbwarn "Fix your package as it will not work within the SDK" ; \
-          bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes" \
+
+    mkdir -p ${S}/build-test
+    mkdir -p ${S}/build-debug
+    mkdir -p ${S}/build-coverage
+
+    cd ${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)
+
+    cd ${S}/build-test
+        ${S}/autobuild/agl/autobuild package-test BUILD_DIR=${S}/build-test DEST=${S}/widgets VERBOSE=TRUE || \
+        ( bbwarn "Target: package-test failed")
+
+    cd ${S}/build-debug
+        ${S}/autobuild/agl/autobuild package-debug BUILD_DIR=${S}/build-debug DEST=${S}/widgets VERBOSE=TRUE || \
+        ( bbwarn "Target: package-debug failed")
+
+    cd ${S}/build-coverage
+        ${S}/autobuild/agl/autobuild package-coverage BUILD_DIR=${S}/build-coverage DEST=${S}/widgets VERBOSE=TRUE || \
+        ( bbwarn "Target: package-coverage failed")
 }
 
 python () {
@@ -38,13 +77,40 @@ POST_INSTALL_SCRIPT ?= "${POST_INSTALL_LEVEL}-${PN}.sh"
 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}/package/*.wgt ${D}/usr/AGL/apps/manualinstall
-    else
-        install -d ${D}/usr/AGL/apps/autoinstall
-        install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/autoinstall
+        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=""
@@ -65,6 +131,9 @@ 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} \
     "
 
@@ -73,3 +142,5 @@ do_install() {
 
 addtask aglwgt_deploy  before do_package after do_install
 addtask aglwgt_package before do_aglwgt_deploy after do_compile
+
+