From c8381bd2993211a1f1ebf846553983f5941f2d55 Mon Sep 17 00:00:00 2001 From: "Koenig, Joerg" Date: Thu, 5 Dec 2019 12:59:49 +0100 Subject: Update to 5.13.2 Change-Id: I0989e133308870f80dddc10c0e24502443733ee1 --- Jenkinsfile | 9 ++++++--- Makefile | 14 +++++++------- Makefile.mingw64 | 23 ++++++++++++++--------- SOURCE/Makefile | 2 +- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 493f008..3517728 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 ''' @@ -112,7 +114,8 @@ stage ("Post processing") { tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64 mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin - cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin + cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-shared/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin + # generate qt.conf for linux to windows cross builds ... rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf echo "[Paths]" > $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf diff --git a/Makefile b/Makefile index fa9185c..5bc98d5 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) VERSION_SHORT=5.13 -VERSION_RELEASE=1 +VERSION_RELEASE=2 VERSION=$(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION=1.0.2r @@ -16,7 +16,7 @@ SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz PACKAGE_NAME = qt-$(VERSION) -GCC_PATH ?= /opt/dev-tools/gcc-suite/1.3.0/x86-linux64/gcc-8.2.0 +GCC_PATH ?= /opt/dev-tools/gcc-suite/1.5.0/x86-linux64/gcc CC ?= $(GCC_PATH)/bin/gcc CXX ?= $(GCC_PATH)/bin/g++ @@ -65,7 +65,7 @@ ssl.$(ARCH): make -j$(JOBS) && \ make install -qt.x86-linux64: qt.x86-linux64.shared qt.x86-linux64.static merge +qt.x86-linux64: qt.x86-linux64.shared qt.x86-linux64.static qt.x86-linux64.shared: # shared @@ -150,10 +150,10 @@ qt.x86-linux64.static: cd $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \ tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./ merge: - cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/lib/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/lib/ - cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/plugins/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/plugins/ - cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/qml/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/qml/ - cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ + #cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/lib/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/lib/ + #cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/plugins/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/plugins/ + #cp -nr $(LOCAL_INST_PATH)/qt-$(VERSION)-static/qml/* $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/qml/ + #cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ tar -zcf $(TOP)/qt-$(VERSION)-$(ARCH).tgz ./ clean: diff --git a/Makefile.mingw64 b/Makefile.mingw64 index bbd0280..d0a76f9 100644 --- a/Makefile.mingw64 +++ b/Makefile.mingw64 @@ -6,7 +6,7 @@ LOCAL_BUILD_PATH = $(TOP)/build.$(ARCH) LOCAL_INST_PATH = $(TOP)/install.$(ARCH) VERSION_SHORT = 5.13 -VERSION_RELEASE = 1 +VERSION_RELEASE = 2 VERSION = $(VERSION_SHORT).$(VERSION_RELEASE) SSL_VERSION = 1.0.2r @@ -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) @@ -34,7 +39,7 @@ ssl.$(ARCH): rm -Rf $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) mkdir -p $(LOCAL_BUILD_PATH)/ cd $(LOCAL_BUILD_PATH) && \ - tar --force-local -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) + tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS="-m64 -fpic" && \ ./Configure --prefix=$(QT_INST_PATH) shared mingw64 && \ @@ -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 --force-local -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 @@ -92,7 +97,7 @@ qt.$(ARCH): $(QT_INST_PATH)/bin/qt-openssl.exe cp -f $(GCC_PATH)/../x86_64-w64-mingw32/bin/libwinpthread-1.dll $(QT_INST_PATH)/bin/ cd $(QT_INST_PATH)/ && \ - tar --force-local -zcf $(TOP)/$(PACKAGE_NAME).tgz ./ + tar -czf $(TOP)/$(PACKAGE_NAME).tgz . rm -Rf $(QT_INST_PATH) rm -Rf $(QT_SRC_PATH) diff --git a/SOURCE/Makefile b/SOURCE/Makefile index fa9f6ea..8b5c481 100644 --- a/SOURCE/Makefile +++ b/SOURCE/Makefile @@ -1,7 +1,7 @@ CWD = $(shell readlink -f .) VERSION_SHORT = 5.13 -RELEASE = 1 +RELEASE = 2 VERSION = $(VERSION_SHORT).$(RELEASE) QT_SOURCE_ARCHIVE=qt-everywhere-src-$(VERSION).tar.xz DL_URL="https://download.qt.io/official_releases/qt/$(VERSION_SHORT)/$(VERSION)/single/$(QT_SOURCE_ARCHIVE)" -- cgit v0.12