diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-06-01 04:03:10 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-06-01 04:03:10 (GMT) |
| commit | 270950f492f0c5d328a9736a26b8996c9ae99465 (patch) | |
| tree | 37b50f8ad258560922d6a782941ecaf22d630066 | |
| parent | 2566efd82335e6135ab9de22567b83a612397548 (diff) | |
| download | Qt-270950f492f0c5d328a9736a26b8996c9ae99465.zip Qt-270950f492f0c5d328a9736a26b8996c9ae99465.tar.gz Qt-270950f492f0c5d328a9736a26b8996c9ae99465.tar.bz2 | |
Fixed PATH in MinGW environmentrefs/changes/97/7697/1
Change-Id: Ic3b1c996eebff3788494c0c98f1a8257bd5015fa
| -rw-r--r-- | Jenkinsfile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 8f5b5b8..e8c5ad7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,11 +65,12 @@ stage('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 -Rf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 ./ + cp -Rvf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 $WS/ echo "Done." - make GCC_PATH=$PWD/gcc-8.2.0 -f Makefile.mingw64 all + make GCC_PATH=$WS/gcc-8.2.0 -f Makefile.mingw64 all rm -Rf build.$(ARCH) rm -Rf install.$(ARCH) ''' @@ -80,11 +81,11 @@ stage('Build') { setBuildResult('FAILURE') } finally { sh ''' - export PATH=/c/dev-tools/msys/x86/usr/bin:$PATH + export PATH=/c/dev-tools/msys/x86/usr/bin rm -Rf openssl-1.0.2r cd $WORKSPACE ''' - deleteDir() + #deleteDir() } } } |