Use generated autobuild script if none commited 05/17405/2
authorRomain Forlot <romain.forlot@iot.bzh>
Tue, 23 Oct 2018 17:51:53 +0000 (19:51 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Tue, 23 Oct 2018 17:56:27 +0000 (19:56 +0200)
It could be useful to not commit the autobuild script in the repository then you'll
always use a generated autobuild script. Doing so you always use the most up-to-date
autobuild script following the upstream version.

If the script hasn't been generated during the build then fallback to the classic method
'make package'.

Bug-AGL: SPEC-1832

Change-Id: I6a5e72ebb9254c7140e6ad7c31e02ba06fe2e0e0
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
jjb/common/include-apps-build-app.sh

index 089a4ec..d79c88e 100644 (file)
@@ -90,7 +90,12 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t
             pushd build
             cmake ../
             make
-            make package || true
+            if test x"0" = x"$DONE" -a -f ../conf.d/autobuild/agl/autobuild ; then
+                ../conf.d/autobuild/agl/autobuild package DEST=$(pwd)/package
+                export isAUTOBUILD=1
+           else
+                make package || true
+           fi
             popd
             export isCMAKE=1
             export DONE=1