update build

chriku · Dec 14, 2020 · b446022 · b446022
1 parent 91cbd3a
commit b446022
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git 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 </build/qtwebkit.diff
 #RUN cd mxe && make MXE_TARGETS=i686-w64-mingw32.shared qtwebkit
@@ -101,7 +102,7 @@ COPY . /src
 WORKDIR /src
 
 # Now build the project
-RUN qmake qdigi.pro && make -j 8
+RUN qmake qdigi.pro && make -j
 #RUN cp -r /build/mxe/usr/i686-w64-mingw32.shared/qt5/bin/*.dll qdigi
 #RUN cp -r /build/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/* qdigi
 #RUN cp -r /build/mxe/usr/i686-w64-mingw32.shared/bin/*.dll qdigi

diff --git a/build b/build
@@ -6,9 +6,6 @@
 make clean
 rm -rf qdigi.zip
 rm -rf qdigi.exe
-rm -rf qdigi
-rm -f qdigi
-mkdir  qdigi
 # Build the image
 set -e
 docker build -t qtdyn .
@@ -18,3 +15,4 @@ docker build -t qtdyn .
 
 # Now extract the generated binary
 docker run qtdyn cat qdigi.zip > qdigi.zip
+bash -c "cd ../ && zip qdigi/qdigi.zip qdigi/modules/*.lua"
diff --git 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