summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-28 06:48:34 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-28 06:48:34 (GMT)
commit7d83006e3345be8cd707a3551f700c0a7e65a2bc (patch)
tree38c76bbf61ac355f0c18305ab1ef28ba921c4208
parent6601bc37084fc4dfcf13d473c507d1ebd0d511e1 (diff)
downloadQt-7d83006e3345be8cd707a3551f700c0a7e65a2bc.zip
Qt-7d83006e3345be8cd707a3551f700c0a7e65a2bc.tar.gz
Qt-7d83006e3345be8cd707a3551f700c0a7e65a2bc.tar.bz2
User regular bin folder for linux binariesREL_5_14_2-166REL_5_14_2QT_5_14refs/changes/23/11123/1
Change-Id: I1be7e6ccf5a43a5475f311e6003a68263c63fe5a
-rw-r--r--Jenkinsfile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 8dd3a0a..d8b5015 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -141,11 +141,10 @@ stage ("Post processing") {
tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64
rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz
cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-mingw64/bin
- mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
- cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
- rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/linguist
- rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/designer
- rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/assistant
+ cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/bin
+ rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/linguist
+ rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/designer
+ rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/assistant
mkdir -p $WORKSPACE/INST/$QT_VER/x86_64-msvc
unzip -qo $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc