X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Fclasses%2Faglwgt.bbclass;h=f42c282a73f6c04db30731b040592a73f16c5b98;hb=1b0d65113b277610135b5599c8810ca7a4e3df4c;hp=7420baefe14b141b2e13a834af6b2c4ae40de553;hpb=f163201918c44a3c3d5788c078981cdfd2b7618a;p=AGL%2Fmeta-agl.git

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index 7420baefe..f42c282a7 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -8,127 +8,154 @@
 # The makefile needs to use wgtpkg-pack.
 #
 
-
 # 'wgtpkg-pack' in af-main-native is required.
-DEPENDS_append = " af-main-native"
+DEPENDS:append = " af-main-native"
 
-# for bindings  af-binder is required.
-DEPENDS_append = " af-binder"
+# 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 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"
+DEPENDS:append = " af-binder-devtools-native"
+
+# Re-enable strip for qmake based projects (default value is "echo")
+OE_QMAKE_STRIP = "${STRIP}"
+
+# Extra build arguments passed to the autobuild script invocations
+AGLWGT_EXTRA_BUILD_ARGS ?= 'VERBOSE=TRUE BUILD_ARGS="${PARALLEL_MAKE}"'
 
-EXTRA_OECMAKE_append_agl-ptest = " -DBUILD_TEST_WGT=TRUE"
+# CMake based widgets that inherit cmake.bbclass will have the
+# following automatically appended to AGLWGT_EXTRA_BUILD_ARGS as
+# the value of CONFIGURE_FLAGS.  This definition may need to be
+# extended to include more of what is passed in cmake.bbclass's
+# do_configure if it is found insufficient.  Using the generated
+# toolchain.cmake file does fix issues with respect to finding the
+# Qt5 CMake modules that seem difficult to fix otherwise, so at the
+# very minimum it should be present.
+AGLWGT_CMAKE_CONFIGURE_ARGS ?= "-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake ${EXTRA_OECMAKE}"
 
-# FIXME: Remove once CMake+ninja issues are resolved
-OECMAKE_GENERATOR = "Unix Makefiles"
+# Only widgets with recipe names starting with agl-service- are
+# assumed to have tests by default, set this to "1" to force
+# building/packaging of the test widget for other widgets.
+AGLWGT_HAVE_TESTS ?= "0"
+
+# Whether the widget should be auto-installed on first boot
+AGLWGT_AUTOINSTALL ?= "1"
+
+# Signature keys
+# These are default keys for development purposes !
+# Change it for production.
+WGTPKG_AUTOSIGN_0:agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/developer.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/developer.cert.pem"
+WGTPKG_AUTOSIGN_1:agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/platform.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/platform.cert.pem"
 
-do_aglwgt_package()  {
+export WGTPKG_AUTOSIGN_0
+export WGTPKG_AUTOSIGN_1
 
-    mkdir -p ${S}/build-test
-    mkdir -p ${S}/build-debug
-    mkdir -p ${S}/build-coverage
+python __anonymous () {
+    # NOTE: AGLWGT_CMAKE_CONFIGURE_ARGS is not updated directly here,
+    #       but via the prefunc below to avoid issues around anonymous
+    #       python ordering conflicts with e.g. externalsrc.bbclass.
+    if bb.data.inherits_class("cmake", d):
+        d.appendVarFlag('do_compile', 'prefuncs', ' aglwgt_cmake_configure')
+}
 
+python aglwgt_cmake_configure () {
+    # Define CONFIGURE_FLAGS appropriately if cmake.bbclass has been
+    # inherited, see description of AGLWGT_CMAKE_CONFIGURE_ARGS above
+    # for more details.
+    cmake_config_args = d.getVar("AGLWGT_CMAKE_CONFIGURE_ARGS")
+    if bb.data.inherits_class("cmake", d) and cmake_config_args:
+        d.appendVar("AGLWGT_EXTRA_BUILD_ARGS", ' CONFIGURE_ARGS="' + cmake_config_args + '"')
+        d.appendVarFlag("AGLWGT_EXTRA_BUILD_ARGS", "vardeps", " AGLWGT_CMAKE_CONFIGURE_ARGS")
+}
+
+# Placeholder to keep things like externalsrc that prefunc or append
+# do_configure working as expected.
+aglwgt_do_configure() {
+    true
+}
+
+aglwgt_do_compile() {
     bldcmd=${S}/autobuild/agl/autobuild
     if [ ! -x "$bldcmd" ]; then
-        bldcmd=${S}/conf.d/autobuild/agl/autobuild
-        if [ -x "$bldcmd" ]; then
-            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"
-        else
-            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"
-            bldcmd=make
-        fi
+        bbfatal "Missing autobuild/agl/autobuild script"
     fi
 
-    cd ${B}
-    if ! $bldcmd package BUILD_DIR=${B} DEST=${S}/widgets VERBOSE=TRUE; then
-        bbwarn "Target: package failed"
+    if [ "${S}" != "${B}" ]; then
+        rm -rf ${B}
+        mkdir -p ${B}
+        cd ${B}
     fi
 
-    cd ${S}/build-test
-    if ! $bldcmd package-test BUILD_DIR=${S}/build-test DEST=${S}/widgets VERBOSE=TRUE; then
-        bbwarn "Target: package-test failed"
-    fi
+    $bldcmd package BUILD_DIR=${B}/build-release ${AGLWGT_EXTRA_BUILD_ARGS}
+    $bldcmd package-debug BUILD_DIR_DEBUG=${B}/build-debug ${AGLWGT_EXTRA_BUILD_ARGS}
 
-    cd ${S}/build-debug
-    if ! $bldcmd package-debug BUILD_DIR=${S}/build-debug DEST=${S}/widgets VERBOSE=TRUE; then
-        bbwarn "Target: package-debug failed"
-    fi
+    if echo ${BPN} | grep -q '^agl-service-' || [ "${AGLWGT_HAVE_TESTS}" = "1" ]; then
+        # Only try building the test widget if there's source for it, to avoid spurious errors
+        if [ -f ${S}/test/CMakeLists.txt ]; then
+            $bldcmd package-test BUILD_DIR_TEST=${B}/build-test ${AGLWGT_EXTRA_BUILD_ARGS}
+        fi
 
-    cd ${S}/build-coverage
-    if ! $bldcmd package-coverage BUILD_DIR=${S}/build-coverage DEST=${S}/widgets VERBOSE=TRUE; then
-        bbwarn "Target: package-coverage failed"
+        # The coverage widget should always build
+        $bldcmd package-coverage BUILD_DIR_COVERAGE=${B}/build-coverage ${AGLWGT_EXTRA_BUILD_ARGS}
     fi
 }
 
-python () {
-    d.setVarFlag('do_aglwgt_deploy', 'fakeroot', '1')
-}
-
-
 POST_INSTALL_LEVEL ?= "10"
 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}/*.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
+aglwgt_do_install() {
+    DEST=release
+    if [ "${AGLWGT_AUTOINSTALL_${PN}}" = "0" ]; then
+        DEST=manualinstall
+    fi
 
+    wgt="$(find ${B}/build-release -maxdepth 1 -name '*.wgt'| head -n 1)"
+    if [ -n "$wgt" ]; then
+        install -d ${D}/usr/AGL/apps/$DEST
+        install -m 0644 $wgt ${D}/usr/AGL/apps/$DEST/
+    else
+        bbfatal "no package found in widget directory"
     fi
 
-    APP_FILES=""
-    for file in ${D}/usr/AGL/apps/autoinstall/*.wgt;do
-        APP_FILES="${APP_FILES} $(basename $file)";
+    for t in debug coverage test; do
+        if [ "$(find ${B}/build-${t} -maxdepth 1 -name *-${t}.wgt)" ]; then
+            install -d ${D}/usr/AGL/apps/${t}
+            install -m 0644 ${B}/build-${t}/*-${t}.wgt ${D}/usr/AGL/apps/${t}/
+        elif [ "$t" = "debug" ]; then
+            # HTML5 widgets complicate things here, need to detect them and
+            # not error out in that case.  ATM this requires looking in the
+            # config.xml of the release widget.
+            rm -rf ${B}/tmp
+            unzip $wgt config.xml -d ${B}/tmp
+            if [ -f ${B}/tmp/config.xml -a \
+                 ! cat ${B}/tmp/config.xml | \
+                     grep -q '^[[:space:]]*<content[[:space:]]\+src="[^\"]*"[[:space:]]\+type="text/html"' ]; then
+                bbfatal "no package found in ${t} widget directory"
+            fi
+            rm -rf ${B}/tmp
+        elif echo ${BPN} | grep -q '^agl-service-' || [ "${AGLWGT_HAVE_TESTS}" = "1" ]; then
+            if [ "$t" = "coverage" -o -f ${S}/test/CMakeLists.txt ]; then
+                bbfatal "no package found in ${t} widget directory"
+            fi
+        fi
     done
-    install -d ${D}/${sysconfdir}/agl-postinsts
-    cat > ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} <<EOF
+
+    if [ "${AGLWGT_AUTOINSTALL}" != "0" ]; then
+        # For now assume autoinstall of the release versions
+        rm -rf ${D}/usr/AGL/apps/autoinstall
+        ln -sf release ${D}/usr/AGL/apps/autoinstall
+
+        APP_FILES=""
+        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/autoinstall/\$file
@@ -136,29 +163,23 @@ done
 sync
 ${EXTRA_WGT_POSTINSTALL}
 EOF
-    chmod a+x ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT}
-}
-
-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} \
-    "
-
-do_install() {
+        chmod a+x ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT}
+    fi
 }
 
-addtask aglwgt_deploy  before do_package after do_install
-addtask aglwgt_package before do_aglwgt_deploy after do_compile
+PACKAGES += "${PN}-test ${PN}-debug ${PN}-coverage"
 
-# Signature keys
-# These are default keys for development purposes !
-# Change it for production.
-WGTPKG_AUTOSIGN_0_agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/developer.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/developer.cert.pem"
-WGTPKG_AUTOSIGN_1_agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/platform.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/platform.cert.pem"
+FILES:${PN} += " \
+    /usr/AGL/apps/release/*.wgt \
+    /usr/AGL/apps/autoinstall \
+    /usr/AGL/apps/manualinstall \
+    ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \
+"
+FILES:${PN}-test = "/usr/AGL/apps/test/*.wgt"
+FILES:${PN}-debug = "/usr/AGL/apps/debug/*.wgt"
+FILES:${PN}-coverage = "/usr/AGL/apps/coverage/*.wgt"
 
-export WGTPKG_AUTOSIGN_0
-export WGTPKG_AUTOSIGN_1
+# Test widgets need the parent widget and the test framework
+RDEPENDS:${PN}-test = "${PN} afb-test"
 
+EXPORT_FUNCTIONS do_configure do_compile do_install