summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 493f008..3517728 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,7 +48,8 @@ stage('Build') {
userRemoteConfigs: [[url: REPO]]])
stage ("Windows 64 Bit MinGW Build") {
- sh '''
+ sh '''#!/bin/bash
+ set -x
echo "Cleanup prev. builds ..."
WS=$(cygpath $WORKSPACE)
rm -f openssl-1.0.2r/NUL
@@ -67,7 +68,8 @@ stage('Build') {
'''
}
stage ("Windows 64 Bit MSVC Build") {
- sh '''
+ sh '''#!/bin/bash
+ set -x
rm -f openssl-1.0.2r/NUL
rm -Rf openssl-1.0.2r
'''
@@ -112,7 +114,8 @@ stage ("Post processing") {
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-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
+ cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-shared/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