From b2c419efb672e7a24de336b07864ae5927db3224 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 29 Jun 2018 00:07:10 +0200
Subject: Adapt to recent changes in app-templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

we have more versions where the wgt will end up ...

Change-Id: Ic59cb9e5629d64ad1779b6139c390cefa554d4cb
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/common/include-apps-prepare-upload-folder.sh | 31 ++++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 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 dc2f8bf0..83b939a3 100644
--- a/jjb/common/include-apps-prepare-upload-folder.sh
+++ b/jjb/common/include-apps-prepare-upload-folder.sh
@@ -25,14 +25,35 @@ pushd ${MYPROJECT}
 pwd
 ls -alh
 
-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
+  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
+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
 
 
-- 
cgit 1.2.3-korg