diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-12-05 11:59:49 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-12-05 11:59:49 (GMT) |
| commit | c8381bd2993211a1f1ebf846553983f5941f2d55 (patch) | |
| tree | 71677b1b7292aa5dd12bb1a3316d7a5cb0c2d69b /Jenkinsfile | |
| parent | c055c8543b0973c722291bb94fde0f68577e111d (diff) | |
| download | Qt-c8381bd2993211a1f1ebf846553983f5941f2d55.zip Qt-c8381bd2993211a1f1ebf846553983f5941f2d55.tar.gz Qt-c8381bd2993211a1f1ebf846553983f5941f2d55.tar.bz2 | |
Update to 5.13.2refs/changes/42/9442/1
Change-Id: I0989e133308870f80dddc10c0e24502443733ee1
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 9 |
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 |