diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-06-27 19:56:31 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-06-28 00:31:57 +0200 |
| commit | 7380dd1f2b7163c6a8299920f7441c2d07c7aa51 (patch) | |
| tree | 4c218d75ff6471c9dfc21f220e8e4aaf8eaa9dbe /jjb | |
| parent | 3b90c745ea2894b655ca96aafa2f464347dbef9e (diff) | |
In case of cmake enforce an out-of-tree build
This fixes a build error with newer app templates if no autobuild script is found.
Change-Id: Iad3ea26ddd8cd3f680f8788cd08b8d2a374e8dc5
Bug-AGL: SPEC-1534
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/common/include-apps-build-app.sh | 6 | ||||
| -rw-r--r-- | jjb/common/include-apps-prepare-upload-folder-merged.sh | 12 | ||||
| -rw-r--r-- | jjb/common/include-apps-prepare-upload-folder.sh | 13 |
3 files changed, 23 insertions, 8 deletions
diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh index cd742587..a6626302 100644 --- a/jjb/common/include-apps-build-app.sh +++ b/jjb/common/include-apps-build-app.sh @@ -80,9 +80,13 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t export DONE=1 fi if test x"0" = x"$DONE" -a -f CMakeLists.txt; then - cmake . + rm -rf build || true + mkdir build + pushd build + cmake ../ make make package || true + popd export DONE=1 fi if test x"0" = x"$DONE" -a -f Makefile ; then diff --git a/jjb/common/include-apps-prepare-upload-folder-merged.sh b/jjb/common/include-apps-prepare-upload-folder-merged.sh index 222e921c..ced33d28 100644 --- a/jjb/common/include-apps-prepare-upload-folder-merged.sh +++ b/jjb/common/include-apps-prepare-upload-folder-merged.sh @@ -42,9 +42,15 @@ export DEST=$(pwd)/UPLOAD/${PROJECTPATTERN} # copy the wgt to the upload folder pushd ${MYPROJECT} - pwd - ls -alh || true +pwd +if test -d build/package ; then + # use cmake build/package folder for wgt's ... + ls build/package/ || true + cp build/package/*.wgt $DEST +else + # use just ./package/ for wgt's ls package || true cp package/*.wgt $DEST - ls -alh $DEST +fi popd + diff --git a/jjb/common/include-apps-prepare-upload-folder.sh b/jjb/common/include-apps-prepare-upload-folder.sh index e883e610..dc2f8bf0 100644 --- a/jjb/common/include-apps-prepare-upload-folder.sh +++ b/jjb/common/include-apps-prepare-upload-folder.sh @@ -23,14 +23,19 @@ fi pushd ${MYPROJECT} pwd - ls -alh -ls +if test -d build/package ; then + # use cmake build/package folder for wgt's ... + ls build/package/ || true + cp build/package/*.wgt $DEST +else + # use just ./package/ for wgt's + ls package || true + cp package/*.wgt $DEST +fi -ls package || true -cp package/*.wgt $DEST ls -alh $DEST popd |