From 050a4848be764059f331e06cc8c589cef4c8b0ab Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Fri, 17 May 2019 08:13:39 +0200
Subject: Next dev stage

Change-Id: I2f2ee4822d159edd1448b746b2e692c1cd313b2f
---
 Jenkinsfile   | 30 ++++++++++++++++++++++++++----
 buildqt32.bat |  2 +-
 buildqt64.bat |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c202b70..0d09988 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,6 @@
+import jenkins.model.*
+import hudson.model.Result
+
 def REPO = 'ssh://gerrit1.techsat.local:29418/external/Qt'
 
 properties([
@@ -38,7 +41,6 @@ stage('Build') {
 	    }
 
 
-	    archiveArtifacts artifacts: 'qt-*-x86-linux64.tgz,qt-*-x86-linux.tgz'
         }
     },
     windows: {
@@ -79,10 +81,10 @@ stage('Build') {
 			    buildqt64.bat
 			'''
 		    }
-        	    archiveArtifacts artifacts: '*-msvc.zip'
-        	    
+		    stash name: "qtwin", includes: "*-msvc.zip"
             } catch (e) {
                 echo 'Windows build failed'
+		setBuildResult('FAILURE')
             } finally {
         	    bat '''
             		set PATH=C:\\dev-tools\\msys\\x86\\usr\\bin;%PATH%
@@ -90,8 +92,28 @@ stage('Build') {
             		sh.exe -c "rm -f NUL"
             		cd %WORKSPACE%
         	    '''
-                
+        	    deleteDir()
             }
         }
     }
 }
+stage ("Post processing") {
+    node('bslp02-centos6-64') {
+	unstash name: 'qtwin'
+	sh '''
+	    rm -Rf $WORKSPACE/INST
+	    QT_VER=5.12.3
+	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux
+	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-linux.tgz -C $WORKSPACE/INST/5.12.3/x86-linux
+	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64
+	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-linux64.tgz -C $WORKSPACE/INST/5.12.3/x86-linux64
+	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-msvc
+	    unzip -o $WORKSPACE/qt-$QT_VER-x86-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86-msvc
+	    mkdir -p $WORKSPACE/INST/$QT_VER/x86_64-msvc
+	    unzip -o $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86-msvc
+	    cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-bin.tgz ./
+	    rm -Rf $WORKSPACE/INST
+	'''
+	archiveArtifacts artifacts: 'qt-5.12.3-bin.tgz'
+    }
+}
diff --git a/buildqt32.bat b/buildqt32.bat
index 957d30c..9b14289 100644
--- a/buildqt32.bat
+++ b/buildqt32.bat
@@ -88,7 +88,7 @@ call nmake install
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 cd %PREFIX%
-%BASEDIR%wintools\7za.exe a -tzip %BASEDIR%\qt-%QT_VERSION%-%INST_ARCH%.zip .\*
+%BASEDIR%wintools\7za.exe a -tzip %BASEDIR%\qt-%QT_FULL_VER%-%INST_ARCH%.zip .\*
 cd %BASEDIR%
 
 rm -Rf %OPENSSL%
diff --git a/buildqt64.bat b/buildqt64.bat
index 27e7c16..46407c5 100644
--- a/buildqt64.bat
+++ b/buildqt64.bat
@@ -85,7 +85,7 @@ call nmake install
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 cd %PREFIX%
-%BASEDIR%wintools\7za.exe a -tzip %BASEDIR%\qt-%QT_VERSION%-%INST_ARCH%.zip .\*
+%BASEDIR%wintools\7za.exe a -tzip %BASEDIR%\qt-%QT_FULL_VER%-%INST_ARCH%.zip .\*
 cd %BASEDIR%
 
 rm -Rf %OPENSSL%
-- 
cgit v0.12