summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorJoerg Koenig <Joerg.Koenig@techsat.com>2019-06-01 08:14:16 (GMT)
committerJoerg Koenig <Joerg.Koenig@techsat.com>2019-06-01 08:14:16 (GMT)
commit790559e3c45729d36948cf76d32bf1dd1cba32af (patch)
treebdce04654f0f9d6221ec0719ffdbb8ec496736ed /Jenkinsfile
parent3ea670adb3e066103b5912127db56759d236420a (diff)
downloadQt-790559e3c45729d36948cf76d32bf1dd1cba32af.zip
Qt-790559e3c45729d36948cf76d32bf1dd1cba32af.tar.gz
Qt-790559e3c45729d36948cf76d32bf1dd1cba32af.tar.bz2
Fixed PATH in MinGW environmentrefs/changes/99/7699/1
Change-Id: I2fbfad4b1a6a8b3040877b97f224a084c98c24c6
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile31
1 files changed, 17 insertions, 14 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 81bc8a4..a270e31 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,23 @@ stage('Build') {
submoduleCfg: [],
userRemoteConfigs: [[url: REPO]]])
+ stage ("Windows 64 Bit MinGW Build") {
+ sh '''
+ echo "Cleanup prev. builds ..."
+ WS=$(cygpath $WORKSPACE)
+ rm -f openssl-1.0.2r/NUL
+ rm -Rf openssl-1.0.2r
+ echo "Done."
+ cp -Rvf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 $WS/
+ export PATH=$WS/gcc-8.2.0/bin:/c/dev-tools/msys/x86/usr/bin:$PATH
+ export CC=$WS/gcc-8.2.0/bin/gcc
+ export CXX=$WS/gcc-8.2.0/bin/g++
+ gcc -v
+ make -f Makefile.mingw64 all
+ rm -Rf build.$(ARCH)
+ rm -Rf install.$(ARCH)
+ '''
+ }
stage ("Windows 64 Bit MSVC Build") {
sh '''
rm -f openssl-1.0.2r/NUL
@@ -61,20 +78,6 @@ stage('Build') {
buildqt64.bat
'''
}
- stage ("Windows 64 Bit MinGW Build") {
- sh '''
- echo "Cleanup prev. builds ..."
- export PATH=/c/dev-tools/msys/x86/usr/bin:$PATH
- WS=$(cygpath $WORKSPACE)
- rm -f openssl-1.0.2r/NUL
- rm -Rf openssl-1.0.2r
- cp -Rvf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 $WS/
- echo "Done."
- make GCC_PATH=$WS/gcc-8.2.0 -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'