From aaff4be8cd1ef31a4c4204c6b3ef87a62b10fede Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 11 Aug 2020 17:24:19 +0200 Subject: Do build and upload multiple wgt files for applications This change will allow to build and upload - release - debug - coverage - test wgt files. Bug-AGL: SPEC-3482 Signed-off-by: Jan-Simon Moeller Change-Id: I5e7adb40442dd8a9abc3268e4e635c2451e54732 --- jjb/common/include-apps-prepare-upload-folder.sh | 38 ++---------------------- 1 file changed, 3 insertions(+), 35 deletions(-) (limited to 'jjb/common/include-apps-prepare-upload-folder.sh') diff --git a/jjb/common/include-apps-prepare-upload-folder.sh b/jjb/common/include-apps-prepare-upload-folder.sh index 7bb69fe4..803cc54d 100644 --- a/jjb/common/include-apps-prepare-upload-folder.sh +++ b/jjb/common/include-apps-prepare-upload-folder.sh @@ -22,44 +22,12 @@ else fi pushd ${MYPROJECT} -pwd -ls -alh +#pwd +ls -alh package if test x"$isAUTOBUILD" = x"1" ; then - if [ "$(ls -l package/*.wgt | wc -l)" = "1" ] ; then - echo "isAUTOBUILD" - # use just ./package/ for wgt's - ls package || true - cp package/*.wgt $DEST - elif [ "$(ls -l build/package/*.wgt | wc -l)" = "1" ] ; then - # use just ./build/package/ for wgt's - ls build/package || true - cp build/package/*.wgt $DEST - fi + cp package/*.wgt $DEST fi -###################################################################### -# /!\/!\/!\ DEPRECATED FALLBACK WAY TO BUILD AGL APPS /!\/!\/!\ # -###################################################################### - -if test x"$isCMAKE" = x"1" ; then - echo "isCMAKE" - # use cmake build/package folder for wgt's ... - ls build/package/ || true - cp build/package/*.wgt $DEST -fi -if test x"$isMAKE" = x"1" ; then - echo "isMAKE" - # use just ./package/ for wgt's - ls package || true - cp package/*.wgt $DEST -fi -if test x"$isQMAKE" = x"1" ; then - echo "isQMAKE" - # use just ./package/ for wgt's - ls package || true - cp package/*.wgt $DEST -fi - ls -alh $DEST -- cgit 1.2.3-korg