X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Fclasses%2Faglwgt.bbclass;h=717bd7b9030bb444aa18971f0e87e7146cc88cb9;hb=006b93ba7cb4c102150ec01997d94bcce33960dd;hp=14f00a74c233aeff985d8dc1e67136d3de65bcf6;hpb=3051f4733706d78b31356cd8c3464f25613996eb;p=AGL%2Fmeta-agl.git

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index 14f00a74c..717bd7b90 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -15,15 +15,38 @@ 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}
-        make package || ( \
-          bbwarn "Your makefile must support the 'make package' target" ; \
-          bbwarn "and generate a .wgt file using wgtpack in the"; \
-          bbwarn "subfolder ./package/ !" ; \
+        ${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" \
-                        )
+          bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes"; \
+          make package)
 }
 
 python () {
@@ -37,17 +60,33 @@ POST_INSTALL_SCRIPT ?= "${POST_INSTALL_LEVEL}-${PN}.sh"
 EXTRA_WGT_POSTINSTALL ?= ""
 
 do_aglwgt_deploy() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/
+    TEST_WGT="*-test.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
+    fi
+
     APP_FILES=""
-    for file in ${D}/usr/AGL/apps/*.wgt;do
-        APP_FILES+=" "$(basename $file);
+    for file in ${D}/usr/AGL/apps/autoinstall/*.wgt;do
+        APP_FILES="${APP_FILES} $(basename $file)";
     done
     install -d ${D}/${sysconfdir}/agl-postinsts
     cat > ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} <<EOF
 #!/bin/sh -e
 for file in ${APP_FILES}; do
-    /usr/bin/afm-install install /usr/AGL/apps/\$file
+    /usr/bin/afm-install install /usr/AGL/apps/autoinstall/\$file
 done
 sync
 ${EXTRA_WGT_POSTINSTALL}
@@ -55,7 +94,16 @@ EOF
     chmod a+x ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT}
 }
 
-FILES_${PN} += "/usr/AGL/apps/*.wgt ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT}"
+FILES_${PN} += "/usr/AGL/apps/autoinstall/*.wgt \
+    /usr/AGL/apps/manualinstall/*.wgt \
+    /usr/AGL/apps/testwgt/*.wgt \
+    ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \
+    "
+
+do_install() {
+}
 
 addtask aglwgt_deploy  before do_package after do_install
 addtask aglwgt_package before do_aglwgt_deploy after do_compile
+
+