summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 039cdfc..630e789 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -77,7 +77,7 @@ stage('Build') {
export CXX=$WS/gcc/bin/g++
gcc -v
mkdir -p /c/tmp
- make -f Makefile.mingw64 all
+ make -f Makefile.mingw64 RESERVE_INSTDIR=1 all
'''
}
stage ("MinGW Qt-Creator Build") {
@@ -92,9 +92,13 @@ stage('Build') {
export CC=$WS/gcc/bin/gcc
export CXX=$WS/gcc/bin/g++
gcc -v
- export LIBRARY_PATH=$LIBRARY_PATH:/c/tmp/qt/lib
- make -f Makefile.qtcreator ARCH=x86-mingw64 GCC_PATH=$WS/gcc QTDIR=/c/tmp/qt clean
- make -f Makefile.qtcreator ARCH=x86-mingw64 GCC_PATH=$WS/gcc QTDIR=/c/tmp/qt all
+ make -f Makefile.qtcreator ARCH=x86-mingw64 GCC_PATH=$WS/gcc QTDIR=/c/tmp/qt clean all
+ '''
+ }
+ stage ("Cleanup") {
+ sh '''#!/bin/bash
+ set -x
+ rm -Rf /c/tmp/qt
'''
}