aboutsummaryrefslogtreecommitdiffstats
path: root/jjb/common/include-apps-prepare-upload-folder-merged.sh
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/common/include-apps-prepare-upload-folder-merged.sh')
-rw-r--r--jjb/common/include-apps-prepare-upload-folder-merged.sh12
1 files changed, 9 insertions, 3 deletions
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
+