From 270950f492f0c5d328a9736a26b8996c9ae99465 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Sat, 1 Jun 2019 06:03:10 +0200
Subject: Fixed PATH in MinGW environment

Change-Id: Ic3b1c996eebff3788494c0c98f1a8257bd5015fa
---
 Jenkinsfile | 9 +++++----
 1 file 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()
             }
         }
     }
-- 
cgit v0.12