Next Stagerefs/changes/90/7690/1

Change-Id: I4f8f0b472eca3bfc0a51c6857489f114441801d0

1 files changed, 36 insertions, 57 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 30f1c4e..d65800e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,18 +29,11 @@ stage('Build') {
 		    submoduleCfg: [], 
 		    userRemoteConfigs: [[url: REPO]]])
 
-	    stage("Linux 32 Bit Build") {
-		sh '''#!/bin/bash
-		GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux/gcc-8.2.0 make -f Makefile.x86-linux
-		'''
-	    }
 	    stage("Linux 64 Bit Build") {
 		sh '''#!/bin/bash
-		GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux64/gcc-8.2.0 make
+		GCC_PATH=/master/DEV-Tools/gcc-suite/1.3.0/x86-linux64/gcc-8.2.0 make
 		'''
 	    }
-
-
         }
     },
     windows: {
@@ -54,24 +47,11 @@ stage('Build') {
         		    submoduleCfg: [], 
         		    userRemoteConfigs: [[url: REPO]]])
 
-		    stage ("Windows 32 Bit Build") {
-			bat '''@echo off
-			    set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\
-			    set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_32\\
-			    set MSYSDIR=C:\\dev-tools\\msys\\x86\\
-			    set PERLDIR=C:\\dev-tools\\perl\\x86_64-msvc\\
-			    set PATH=%PATH%;C:\\dev-tools\\Python\\2.7\\x86-windows\\
-			    buildqt32.bat
+		    stage ("Windows 64 Bit MSVC Build") {
+			sh '''
+			    rm -f openssl-1.0.2r/NUL
+			    rm -Rf openssl-1.0.2r
 			'''
-		    }
-        	    
-        	    bat '''
-            		set MSYSDIR=C:\\dev-tools\\msys\\x86
-			set PATH=%MSYSDIR%\\usr\\bin;%PATH%
-			sh.exe -c "rm -f openssl-1.0.2r/NUL"
-			sh.exe -c "rm -Rf openssl-1.0.2r*"
-        	    '''
-		    stage ("Windows 64 Bit Build") {
 			bat '''@echo off
 			    set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\
 			    set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_64
@@ -81,18 +61,33 @@ stage('Build') {
 			    buildqt64.bat
 			'''
 		    }
-		    stash name: "qtwin", includes: "*-msvc.zip"
+		    stage ("Windows 64 Bit MinGW Build") {
+			sh '''
+			    echo "Cleanup prev. builds ..."
+			    export PATH=/c/dev-tools/msys/x86/usr/bin:$PATH
+			    rm -f openssl-1.0.2r/NUL
+			    rm -Rf openssl-1.0.2r
+			    cp -Rf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 ./
+			    echo "Done."
+			'''
+			sh '''
+			export PATH=$PWD/gcc-8.2.0/bin:/c/dev-tools/msys/x86/usr/bin:$PATH
+			make -f Makefile.mingw64 all
+			rm -Rf build.$(ARCH)
+			rm -Rf install.$(ARCH)
+			'''
+		    }
+		    stash name: "qtwin", includes: "*-msvc.zip, *-x86-mingw64.tgz"
             } catch (e) {
                 echo 'Windows build failed'
 		setBuildResult('FAILURE')
             } finally {
-        	    bat '''
-            		set PATH=C:\\dev-tools\\msys\\x86\\usr\\bin;%PATH%
-            		cd %WORKSPACE%\\openssl-1.0.2r
-            		sh.exe -c "rm -f NUL"
-            		cd %WORKSPACE%
-        	    '''
-        	    deleteDir()
+		sh '''
+		    export PATH=/c/dev-tools/msys/x86/usr/bin:$PATH
+		    rm -Rf openssl-1.0.2r
+		    cd $WORKSPACE
+		'''
+		deleteDir()
             }
         }
     }
@@ -102,41 +97,25 @@ stage ("Post processing") {
 	unstash name: 'qtwin'
 	sh '''
 	    QT_VER=5.12.3
-	    #
-	    # remove temporary folder ...
-	    rm -Rf $WORKSPACE/tmp
-	    BASE_PATH=$WORKSPACE/tmp/$QT_VER/x86-msvc
-	    mkdir -p $BASE_PATH
-	    unzip -o $WORKSPACE/qt-$QT_VER-x86-msvc.zip -d $BASE_PATH
-	    rm -f $WORKSPACE/qt-$QT_VER-x86-msvc.zip
-	    make GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux/xgcc-8.2.0-mingw DLL_DIR=$BASE_PATH/bin XPREFIX=i686-w64-mingw32- LIBDIR=$BASE_PATH/lib dll2a
-	    BASE_PATH=$WORKSPACE/tmp/$QT_VER/x86_64-msvc
-	    mkdir -p $BASE_PATH
-	    unzip -o $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $BASE_PATH
-	    rm -f $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip 
-	    make GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux64/xgcc-8.2.0-mingw DLL_DIR=$BASE_PATH/bin XPREFIX=x86_64-w64-mingw32- LIBDIR=$BASE_PATH/lib dll2a
 	    # 
 	    # cleanup temporary destination folder for final distribution ...
-	    rm -Rf $WORKSPACE/INST
-	    # 
 	    # unpack Linux archives ...
-	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux
-	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-linux.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux
-	    rm -f $WORKSPACE/qt-$QT_VER-x86-linux.tgz 
 	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-linux64
 	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-linux64.tgz -C $WORKSPACE/INST/$QT_VER/x86-linux64
-	    rm -f $WORKSPACE/qt-$QT_VER-x86-linux64.tgz
-	    mv $WORKSPACE/tmp/$QT_VER/* $WORKSPACE/INST/$QT_VER/
-	    cd $WORKSPACE/INST/$QT_VER/ && ln -s x86_64-msvc x86-mingw64
-	    cd $WORKSPACE/INST/$QT_VER/ && ln -s x86-msvc x86-mingw32
+
+	    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_64-msvc
+
+	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64
+	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64
 	    # 
 	    # remove temporary folder ...
 	    rm -Rf $WORKSPACE/tmp
 	    # 
 	    # finally create the whole archive ...
-	    cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-bin.tgz ./
+	    cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-bin_64.tgz ./
 	    rm -Rf $WORKSPACE/INST
 	'''
-	archiveArtifacts artifacts: 'qt-5.12.3-bin.tgz'
+	archiveArtifacts artifacts: '*.tgz, *.zip'
     }
 }