From bd219dee5210e48a7805af42011213fc20b64b2c Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Fri, 24 Apr 2020 08:49:08 +0200
Subject: Fixed PATH handling in MinGW build

Change-Id: I76e192c243465b1a7963b6cd6669f87c3e0ee86e
---
 Jenkinsfile        | 12 ++++++++----
 Makefile.mingw64   |  4 ++++
 Makefile.qtcreator | 11 +++++++++--
 3 files changed, 21 insertions(+), 6 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
                        '''
                     }
 
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 78978ef..fed71f4 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -21,6 +21,8 @@ GCC			= $(shell which g++)
 GCC_PATH		= $(shell dirname $(GCC))
 7ZIP			= $(TOP)/wintools/7za.exe
 
+RESERVE_INSTDIR		= 0
+
 PACKAGE_NAME 		= qt-$(VERSION)-$(ARCH)
 
 test:
@@ -104,7 +106,9 @@ qt.$(ARCH):
 	cp -f $(GCC_PATH)/../x86_64-w64-mingw32/bin/libwinpthread-1.dll $(QT_INST_PATH)/bin/
 	cd  $(QT_INST_PATH)/ && \
 	    tar -czf $(TOP)/$(PACKAGE_NAME).tgz .
+ifeq ($(RESERVE_INSTDIR),0)
 	rm -Rf $(QT_INST_PATH)
+endif
 	rm -Rf $(QT_SRC_PATH)
 
 clean:
diff --git a/Makefile.qtcreator b/Makefile.qtcreator
index 9dd025d..a1e11e7 100644
--- a/Makefile.qtcreator
+++ b/Makefile.qtcreator
@@ -1,7 +1,7 @@
 #
 # Makefile to compile QT-Creator
 #
-CWD		= $(shell readlink -f .)
+TOP		= $(shell readlink -f .)
 
 VERSION 	= 4.11
 RELEASE 	= 2
@@ -30,6 +30,11 @@ BUILD_OS	= $(shell uname -s)
 QTDIR   	= $(PWD)/install.$(ARCH)/qt-5.14.2-shared
 BUILDDIR	= $(PWD)/build-qtcreator.$(ARCH)
 INSTDIR		= $(PWD)/inst-qtcreator.$(ARCH)
+MY_PATH		= $(PATH)
+
+ifneq ($(BUILD_OS),Linux)
+    MY_PATH	= $(shell cygpath -p -C ANSI "$(PATH)")
+endif
 
 ifeq ($(ARCH),x86-linux64)
     MKSPEC	  = linux-g++-64
@@ -41,6 +46,8 @@ ifeq ($(BUILD_OS),Linux)
 endif
 endif
 
+
+
 PKGNAME	= qtcreator-$(VERSION)-$(RELEASE)-$(BUILD)-$(ARCH)
 
 # ---------------------------------------------------------------------------
@@ -79,7 +86,7 @@ $(PWD)/SOURCE/qt-creator-opensource-src-$(VERSION).$(RELEASE).zip:
 #
 build:
 	cd $(BUILDDIR)/qt-creator-opensource-src-$(VERSION).$(RELEASE) && \
-	    export PATH=$(GCC_PATH):$(PATH) && \
+	    export PATH="$(GCC_PATH):$(QTDIR)/bin:$(MY_PATH)" && \
 	    CROSS_COMPILE=$(CROSS_COMPILE) \
 		$(QTDIR)/bin/qmake -o Makefile -spec $(MKSPEC) && \
 	    make
-- 
cgit v0.12