diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 21:06:22 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 21:06:22 (GMT) |
| commit | 00cb6c2a59e2487472313179e848d78f2893952c (patch) | |
| tree | ff7599953ccfc24cb69fa7436720ff77824a93db | |
| parent | d1d8cddeb8a352e154656281f339cb22b98331cd (diff) | |
| download | Qt-00cb6c2a59e2487472313179e848d78f2893952c.zip Qt-00cb6c2a59e2487472313179e848d78f2893952c.tar.gz Qt-00cb6c2a59e2487472313179e848d78f2893952c.tar.bz2 | |
Several Fixes
Change-Id: I05e00c55fd07d748a6451eb8fd8ea713edd6f279
| -rw-r--r-- | Jenkinsfile | 6 | ||||
| -rw-r--r-- | Makefile.mingw64 | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 493f008..842b07c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,8 @@ stage('Build') { userRemoteConfigs: [[url: REPO]]]) stage ("Windows 64 Bit MinGW Build") { - sh ''' + sh '''#!/bin/bash + set -x echo "Cleanup prev. builds ..." WS=$(cygpath $WORKSPACE) rm -f openssl-1.0.2r/NUL @@ -67,7 +68,8 @@ stage('Build') { ''' } stage ("Windows 64 Bit MSVC Build") { - sh ''' + sh '''#!/bin/bash + set -x rm -f openssl-1.0.2r/NUL rm -Rf openssl-1.0.2r ''' diff --git a/Makefile.mingw64 b/Makefile.mingw64 index 74926ce..d22f02e 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -19,9 +19,14 @@ QT_SRC_PATH = $(QT_BUILD_PATH)/qt-src GCC = $(shell which g++) GCC_PATH = $(shell dirname $(GCC)) +7ZIP = $(TOP)/wintools/7za.exe) PACKAGE_NAME = qt-$(VERSION)-$(ARCH) +test: + echo $(ProgramW6432) + echo $(7ZIP) + all: download ssl qt ssl: ssl.$(ARCH) @@ -44,13 +49,13 @@ ssl.$(ARCH): qt.$(ARCH): mkdir -p $(LOCAL_BUILD_PATH) - rm -Rf $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) - if ! [ -d $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ]; then \ - cd $(LOCAL_BUILD_PATH); \ - tar -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz; \ - cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ; \ - patch -p1 < $(TOP)/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch ; \ + if [ -d $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ]; then \ + rm -Rf $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ; \ fi + cd $(LOCAL_BUILD_PATH); \ + $(7ZIP) x $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz -so | $(7ZIP) x -aoa -si -ttar -o"." + cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ;\ + patch -p1 < $(TOP)/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch rm -Rf $(QT_SRC_PATH) mv $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) $(QT_SRC_PATH) # be sure, that python, msys-tools and gcc are in PATH |