diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-16 21:06:57 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-16 21:06:57 (GMT) |
| commit | 6c19897c1c1d5d1cdfc1429845fba1ff3bf118c0 (patch) | |
| tree | 4ddf559298a7695ed18423c2277fc57510aaef26 /Jenkinsfile | |
| parent | a1c543ef2d11442b76fa6106dfa0f55c74049877 (diff) | |
| download | Qt-6c19897c1c1d5d1cdfc1429845fba1ff3bf118c0.zip Qt-6c19897c1c1d5d1cdfc1429845fba1ff3bf118c0.tar.gz Qt-6c19897c1c1d5d1cdfc1429845fba1ff3bf118c0.tar.bz2 | |
Next dev stage
Change-Id: I5d1cf803de2f7e1891fe7ba9e5d43aba8d33a650
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 621838e..2d1e32b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,9 +25,19 @@ stage('Build') { extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: REPO]]]) - sh '''#!/bin/bash - GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux64/gcc-8.0.1 make - ''' + + stage("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("64 Bit Build") { + sh '''#!/bin/bash + GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux64/gcc-8.2.0 make + ''' + } + + archiveArtifacts artifacts: 'qt-*-x86-linux64.tgz' } }, @@ -41,15 +51,17 @@ stage('Build') { extensions: [], submoduleCfg: [], userRemoteConfigs: [[url: REPO]]]) - - 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 ("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 + ''' + } bat ''' set MSYSDIR=C:\\dev-tools\\msys\\x86 @@ -57,14 +69,16 @@ stage('Build') { sh.exe -c "rm -f openssl-1.0.2r/NUL" sh.exe -c "rm -Rf openssl-1.0.2r*" ''' - bat '''@echo off - set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\ - set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_64 - 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\\ - buildqt64.bat - ''' + stage ("64 Bit Build") { + bat '''@echo off + set SDKDIR=C:\\dev-tools\\WinSDK\\VS2019BT\\ + set NASMDIR=C:\\dev-tools\\nasm\\2.12.01_64 + 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\\ + buildqt64.bat + ''' + } archiveArtifacts artifacts: '*-msvc.zip' } catch (e) { |