diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-12-06 20:27:49 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-12-06 20:27:49 (GMT) |
| commit | 7de8f39c9161fcf7f3442f2a1c764ae81573b365 (patch) | |
| tree | 10c821efc026e56d2caf19d19da22fbf32673121 | |
| parent | 36d9a434d25db3c1c9d988c9f22b476b30271241 (diff) | |
| download | Qt-7de8f39c9161fcf7f3442f2a1c764ae81573b365.zip Qt-7de8f39c9161fcf7f3442f2a1c764ae81573b365.tar.gz Qt-7de8f39c9161fcf7f3442f2a1c764ae81573b365.tar.bz2 | |
Fixed mingw64 packageREL_5_13_2QT_5_13_2refs/changes/62/9462/1
Change-Id: I0236dc39eb6f1846bf468148fb019bbf737f98b9
| -rw-r--r-- | Jenkinsfile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 152bf8e..7dbfced 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,19 +113,23 @@ stage ("Post processing") { mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64 tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64 - mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin - cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin + mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64 + cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64 # 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 - echo "TargetSpec=x-win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf + rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf + echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf + echo "Prefix=.." >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf + echo "Libraries = lib" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf + echo "Plugins = plugins" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf + echo "HostBinaries=xbin" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf + echo "TargetSpec=x-win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/qt.conf # - # finally create the whole archive ... + # finally recreate the whole mingw64 archive ... + rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz + cd $WORKSPACE/INST/$QT_VER/x86-mingw64 + tar -zcf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz . + cd $WORKSPACE/ rm -Rf $WORKSPACE/INST ''' archiveArtifacts artifacts: '*.tgz, *.zip' |