summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-28 06:47:22 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-28 06:47:22 (GMT)
commit236c398b18e7b2d938176cbf9ca701da80c75f54 (patch)
tree38c76bbf61ac355f0c18305ab1ef28ba921c4208
parentdd90c1907912623b2759d9a4aadd448f03f713c5 (diff)
downloadQt-236c398b18e7b2d938176cbf9ca701da80c75f54.zip
Qt-236c398b18e7b2d938176cbf9ca701da80c75f54.tar.gz
Qt-236c398b18e7b2d938176cbf9ca701da80c75f54.tar.bz2
User regular bin folder for linux binariesrefs/changes/22/11122/1
Change-Id: I60e33cad7e6004adecbd3db598c1b8619bf9b7b2
-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