From b446022222b3e98b53ef9682132f67b041b701cb Mon Sep 17 00:00:00 2001 From: Christian Kurz Date: Mon, 14 Dec 2020 04:42:27 +0100 Subject: [PATCH] update build --- Dockerfile | 21 +++++++++++---------- build | 4 +--- copy.sh | 21 +++++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc659d5..c1b4c8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ # -FROM debian:jessie +FROM debian:buster RUN apt-get update RUN apt-get install -y --no-install-recommends \ @@ -59,7 +59,7 @@ RUN apt-get install -y --no-install-recommends \ subversion \ texinfo \ unzip \ - wget + wget lzip liblz-dev libssl-dev openssl # see http://stackoverflow.com/questions/10934683/how-do-i-configure-qt-for-cross-compilation-from-linux-to-windows-target @@ -69,13 +69,14 @@ WORKDIR /build RUN git clone https://github.com/mxe/mxe.git # Build cross environment -RUN cd mxe -j8 && make MXE_TARGETS=i686-w64-mingw32.shared qtbase -RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared qtmultimedia -RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared libzip -RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared yaml-cpp -RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared qtsvg -RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared file -RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared openssl +RUN cd mxe && make -j MXE_VERBOSE=1 V=1 VERBOSE=1 MXE_TARGETS=i686-w64-mingw32.shared cmake +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared qtbase +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared qtmultimedia +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared libzip +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared yaml-cpp +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared qtsvg +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared file +RUN cd mxe && make -j MXE_TARGETS=i686-w64-mingw32.shared openssl #COPY qtwebkit.diff /build/qtwebkit.diff #RUN patch /build/mxe/src/qtwebkit.mk qdigi.zip +bash -c "cd ../ && zip qdigi/qdigi.zip qdigi/modules/*.lua" diff --git a/copy.sh b/copy.sh index 8eb5f90..1dfcf9a 100755 --- a/copy.sh +++ b/copy.sh @@ -2,19 +2,20 @@ set -e #ls /build/mxe/usr/i686-w64-mingw32.shared/qt5/bin/*.dll qdigi #ls /build/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/* qdigi #mkdir -p qdigi/additional -rm -rf qdigi/* - +rm -rf qdigi +mkdir -p qdigi ls /build/mxe/usr/i686-w64-mingw32.shared/bin/*.dll #cp -r /build/mxe/usr/i686-w64-mingw32.shared/bin/*.dll qdigi #cp -r /build/mxe/usr/i686-w64-mingw32.shared/qt5/bin/*.dll qdigi #cp -r /build/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/* qdigi +find /build/mxe/usr/i686-w64-mingw32.shared|grep libwinpthread-1.dll cp -r /build/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms qdigi cp -r /build/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/imageformats qdigi -#cp -r /build/mxe/usr/i686-w64-mingw32.shared/bin/*.dll qdigi +cp -r /build/mxe/usr/i686-w64-mingw32.shared/bin/*.dll qdigi cp -r release/qdigi.exe qdigi #cp /build/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5WebKit.dll qdigi #cp /build/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5WebKitWidgets.dll qdigi @@ -32,11 +33,11 @@ cp /build/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Multimedia.dll qdigi #cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libssl.dll qdigi #cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libcrypto.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libbz2.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/icuin56.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/icuuc56.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/icudt56.dll qdigi +cp /build/mxe/usr/i686-w64-mingw32.shared/bin/icuin*.dll qdigi +cp /build/mxe/usr/i686-w64-mingw32.shared/bin/icuuc*.dll qdigi +cp /build/mxe/usr/i686-w64-mingw32.shared/bin/icudt*.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libsqlite3-0.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libeay32.dll qdigi +#cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libeay32.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libfreetype-6.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libgcc_s_sjlj-1.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libglib-2.0-0.dll qdigi @@ -46,13 +47,13 @@ cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libiconv-2.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libintl-8.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libjpeg-9.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/liblzo2-2.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libnettle-6.dll qdigi +#cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libnettle-6.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libpcre-1.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libpcre16-0.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libpcre2-16-0.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libstdc++-6.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libzip-4.dll qdigi -cp /build/mxe/usr/i686-w64-mingw32.shared/bin/ssleay32.dll qdigi +cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libzip*.dll qdigi +#cp /build/mxe/usr/i686-w64-mingw32.shared/bin/ssleay32.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/zlib1.dll qdigi cp /build/mxe/usr/i686-w64-mingw32.shared/bin/libpng16-16.dll qdigi TZ="Europe/Berlin" date "+%A, %d. %B %Y %H:%M:%S.%N %Z (%::z)" > qdigi/buildDate.txt