diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-06-29 00:07:10 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-06-28 22:10:07 +0000 |
| commit | b2c419efb672e7a24de336b07864ae5927db3224 (patch) | |
| tree | f42828328b189b48867a70f14a0fb1465443cf7d /jjb/common/include-apps-build-app.sh | |
| parent | 7380dd1f2b7163c6a8299920f7441c2d07c7aa51 (diff) | |
Adapt to recent changes in app-templates
we have more versions where the wgt will end up ...
Change-Id: Ic59cb9e5629d64ad1779b6139c390cefa554d4cb
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb/common/include-apps-build-app.sh')
| -rw-r--r-- | jjb/common/include-apps-build-app.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh index a6626302..089a4ecd 100644 --- a/jjb/common/include-apps-build-app.sh +++ b/jjb/common/include-apps-build-app.sh @@ -74,9 +74,14 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t # Fixme: use aglbuild script set -x export DONE=0 + export isAUTOBUILD=0 + export isCMAKE=0 + export isMAKE=0 + export isQMAKE=0 if test x"0" = x"$DONE" -a -f conf.d/autobuild/agl/autobuild ; then mkdir -p $(pwd)/package/ conf.d/autobuild/agl/autobuild package DEST=$(pwd)/package/ + export isAUTOBUILD=1 export DONE=1 fi if test x"0" = x"$DONE" -a -f CMakeLists.txt; then @@ -87,17 +92,20 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t make make package || true popd + export isCMAKE=1 export DONE=1 fi if test x"0" = x"$DONE" -a -f Makefile ; then make make package + export isMAKE=1 export DONE=1 fi if test x"0" = x"$DONE" -a -f ${MYPROJECT}.pro; then qmake make make package + export isQMAKE=1 export DONE=1 fi popd |