summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Jenkinsfile19
1 files changed, 9 insertions, 10 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 49c1f8a..60dbabf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -141,20 +141,19 @@ stage ("Post processing") {
unzip -o $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc
# generate qt.conf for linux to windows cross builds ...
- rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
- echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
- echo "Prefix=.." >> $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
- echo "Libraries = lib" >> $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
- echo "Plugins = plugins" >> $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
- echo "HostBinaries=xbin" >> $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
- echo "TargetSpec=win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64-shared/bin/qt.conf
-
+ rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ echo "Prefix=.." >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ echo "Libraries = lib" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ echo "Plugins = plugins" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ echo "HostBinaries=xbin" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ echo "TargetSpec=win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf
+ cp -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf \
+ $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/
#
# finally recreate the whole mingw64-shared archive ...
rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz
cd $WORKSPACE/INST/$QT_VER/x86-mingw64
- cp -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/qt.conf \
- $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin-x86-linux64/
tar -zcf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz .
cd $WORKSPACE/