From 36d9a434d25db3c1c9d988c9f22b476b30271241 Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Fri, 6 Dec 2019 14:31:40 +0100
Subject: Fixed build for Qt 5.13.2

Change-Id: Iad565bb7ea60fa790f99886269f94e2253056545
---
 Jenkinsfile   | 5 ++---
 buildqt64.bat | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 49fd42d..152bf8e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ stage('Build') {
                 echo 'Windows build failed'
             } finally {
 		sh '''
-		    export PATH=/c/dev-tools/msys/x86/usr/bin
+		    export PATH=/c/msys/x86/usr/bin
 		    rm -Rf $(cygpath $WORKSPACE)/openssl-1.0.2r
 		'''
             }
@@ -98,7 +98,7 @@ stage ("Post processing") {
     node('bslp02-centos6-64') {
 	unstash name: 'qtwin'
 	sh '''
-	    QT_VER=5.13.1
+	    QT_VER=5.13.2
 	    # 
 	    # cleanup temporary destination folder for final distribution ...
 	    # unpack Linux archives ...
@@ -126,7 +126,6 @@ stage ("Post processing") {
 	    echo "TargetSpec=x-win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
 	    # 
 	    # finally create the whole archive ...
-	    cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-bins_64.tgz ./
 	    rm -Rf $WORKSPACE/INST
 	'''
 	archiveArtifacts artifacts: '*.tgz, *.zip'
diff --git a/buildqt64.bat b/buildqt64.bat
index 46ea712..6551891 100644
--- a/buildqt64.bat
+++ b/buildqt64.bat
@@ -23,7 +23,7 @@ set PATH=%PERLDIR%\bin;%MSYSDIR%\usr\bin;%PATH%
 set PERL=%PERLDIR%\bin\perl.exe
 
 SET QT_VERSION=5.13
-SET QT_RELEASE=1
+SET QT_RELEASE=2
 
 SET QT_FULL_VER=%QT_VERSION%.%QT_RELEASE%
 SET QT_SOURCE_ARCHIVE=qt-everywhere-src-%QT_FULL_VER%.zip
-- 
cgit v0.12