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-prepare-upload-folder-merged.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-prepare-upload-folder-merged.sh')
| -rw-r--r-- | jjb/common/include-apps-prepare-upload-folder-merged.sh | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/jjb/common/include-apps-prepare-upload-folder-merged.sh b/jjb/common/include-apps-prepare-upload-folder-merged.sh index ced33d28..a5dc0152 100644 --- a/jjb/common/include-apps-prepare-upload-folder-merged.sh +++ b/jjb/common/include-apps-prepare-upload-folder-merged.sh @@ -43,14 +43,37 @@ export DEST=$(pwd)/UPLOAD/${PROJECTPATTERN} # copy the wgt to the upload folder pushd ${MYPROJECT} pwd -if test -d build/package ; then + +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 -else - # use just ./package/ for wgt's - ls package || true - cp package/*.wgt $DEST fi +if test x"$isAUTOBUILD" = x"1" ; then + echo "isAUTOBUILD" + if [ "$(ls -l package/*.wgt | wc -l)" = "1" ] ; then + # 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 +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 + popd |