diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-08-10 15:01:21 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-08-10 20:16:09 +0200 |
| commit | 13c79593eb0d2e4da9a9823a6154846618ae1da8 (patch) | |
| tree | 50af716b50f34c786cbec91b04dc0665a9916d22 /jjb/common/include-apps-build-app.sh | |
| parent | 173409bf67a5bc20cef4a58ab4e289d28765e76d (diff) | |
SPEC-3482: Add package-all in the autobuild case
Add package-all in the autobuild case
v2 (jsmoeller): update autobuild section, fail on non-autobuild
and remove old code.
Bug-AGL: SPEC-3482
Change-Id: I57063a3955e140c03d4ae9a23746014a45074669
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb/common/include-apps-build-app.sh')
| -rw-r--r-- | jjb/common/include-apps-build-app.sh | 63 |
1 files changed, 8 insertions, 55 deletions
diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh index ac1a0ec5..4a708209 100644 --- a/jjb/common/include-apps-build-app.sh +++ b/jjb/common/include-apps-build-app.sh @@ -71,72 +71,25 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t git log -1 --pretty=oneline - # Fixme: use aglbuild script - #set -x - export DONE=0 export isAUTOBUILD=0 if [[ -f autobuild/agl/autobuild ]] then mkdir -p $(pwd)/package/ - chmod a+x autobuild/agl/autobuild - autobuild/agl/autobuild package DEST=$(pwd)/package + chmod a+x autobuild/agl/autobuild + autobuild/agl/autobuild package-all DEST=$(pwd)/package export isAUTOBUILD=1 export DONE=1 else echo "Your binding doesn't use an autobuild script. Please add it in your project." echo "It has to be stored in your root project directory in autobuild/agl/autobuild file" - echo "and be able to generate an AGL package in the build root directory using the call" - echo "autobuild/agl/autobuild package DEST=build" - fi - - ###################################################################### - # /!\/!\/!\ DEPRECATED FALLBACK WAY TO BUILD AGL APPS /!\/!\/!\ # - ###################################################################### - - 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 - rm -rf build || true - mkdir build - pushd build - cmake ../ - make - 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 - make package-all || true - fi - 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 + echo "and be able to generate an AGL package in the build root directory using the call:" + echo " autobuild/agl/autobuild package DEST=somefolder" + echo "" + echo "and for all subtypes ... debug, test, coverage:" + echo " autobuild/agl/autobuild package-all DEST=somefolder" + exit 1 fi - ###################################################################### - # /!\/!\/!\ Ends Here /!\/!\/!\ # - ###################################################################### popd |