summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorJoerg Koenig <Joerg.Koenig@techsat.com>2019-06-05 19:17:42 (GMT)
committerJoerg Koenig <Joerg.Koenig@techsat.com>2019-06-05 19:17:42 (GMT)
commit56adeca7310d73b0002dc0a0dccdb795c96f6e32 (patch)
tree4bd4f7e165ffd32c8f5b88fcc232bef81ff5ab22 /Jenkinsfile
parent490af33328110fe3b4e2f0d769727f1ec538ebf2 (diff)
downloadQt-56adeca7310d73b0002dc0a0dccdb795c96f6e32.zip
Qt-56adeca7310d73b0002dc0a0dccdb795c96f6e32.tar.gz
Qt-56adeca7310d73b0002dc0a0dccdb795c96f6e32.tar.bz2
Fixed MinGW package bundle
- install missing gcc libs (winpthreads) - create qt.conf file for cross-compiling from linux to windows Change-Id: I852b52797da266013a4cd757e1e2a061e6c5aa0f
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index b237489..96bed20 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -113,9 +113,16 @@ stage ("Post processing") {
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
+ # generate qt.conf for linux to windows cross builds ...
+ rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+ echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+ echo "Prefix=.." >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+ echo "Libraries = lib" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+ echo "Plugins = plugins" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
+ echo "HostBinaries=xbin" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
#
# finally create the whole archive ...
- cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-bin_64.tgz ./
+ cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-bins_64.tgz ./
rm -Rf $WORKSPACE/INST
'''
archiveArtifacts artifacts: '*.tgz, *.zip'