From c92b86017486dc676f4d738c402ef29fa5168ebf Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 4 Mar 2018 20:08:15 +0100 Subject: [PATCH] Windows build environment: - Updated external libraries - Added compile of plugins to build.bat - Added copy of Qt style DLL to pack.bat and Windows Installer - Removed "CONFIG=console" for release build --- build_scripts/Windows/build-libs/Makefile | 23 +++++++++--------- .../build-libs/libxslt-1.1.28-fix.tar.gz | Bin 3009 -> 0 bytes build_scripts/Windows/build/build.bat | 2 +- build_scripts/Windows/build/pack.bat | 6 +++++ .../Windows/env/tools/prepare-tools.bat | 6 ++--- .../Windows/installer/retroshare-Qt5.nsi | 8 ++++-- plugins/VOIP/VOIP.pro | 4 +-- retroshare-gui/src/retroshare-gui.pro | 2 ++ 8 files changed, 31 insertions(+), 20 deletions(-) delete mode 100755 build_scripts/Windows/build-libs/libxslt-1.1.28-fix.tar.gz diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile index 11b60f77d..4d7339149 100755 --- a/build_scripts/Windows/build-libs/Makefile +++ b/build_scripts/Windows/build-libs/Makefile @@ -1,17 +1,17 @@ ZLIB_VERSION=1.2.3 BZIP2_VERSION=1.0.6 MINIUPNPC_VERSION=2.0 -OPENSSL_VERSION=1.0.2k +OPENSSL_VERSION=1.0.2n SPEEX_VERSION=1.2.0 SPEEXDSP_VERSION=1.2rc3 -OPENCV_VERSION=3.2.0 -LIBXML2_VERSION=2.9.4 -LIBXSLT_VERSION=1.1.28 -CURL_VERSION=7.53.1 +OPENCV_VERSION=3.4.1 +LIBXML2_VERSION=2.9.7 +LIBXSLT_VERSION=1.1.32 +CURL_VERSION=7.58.0 TCL_VERSION=8.6.2 SQLCIPHER_VERSION=2.2.1 -LIBMICROHTTPD_VERSION=0.9.52 -FFMPEG_VERSION=3.2.4 +LIBMICROHTTPD_VERSION=0.9.59 +FFMPEG_VERSION=3.4 MAKEFILE_PATH=$(dir $(MAKEFILE_LIST)) LIBS_PATH?=$(MAKEFILE_PATH)../../../../libs @@ -137,7 +137,7 @@ libs/openssl-$(OPENSSL_VERSION): $(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar speex: libs/speex-$(SPEEX_VERSION) $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz: - wget http://downloads.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz -O $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz + wget --no-check-certificate http://downloads.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz -O $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz libs/speex-$(SPEEX_VERSION): $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz # prepare @@ -158,7 +158,7 @@ libs/speex-$(SPEEX_VERSION): $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz speexdsp: libs/speexdsp-$(SPEEXDSP_VERSION) $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz: - wget http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz -O $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz + wget --no-check-certificate http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz -O $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz libs/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz # prepare @@ -187,7 +187,7 @@ libs/opencv-$(OPENCV_VERSION): $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz # build mkdir -p opencv-$(OPENCV_VERSION)/build #cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/../../libs" - cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/install" + cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_CXX11=ON -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DSTRSAFE_NO_DEPRECATE" -DCMAKE_INSTALL_PREFIX="`pwd`/install" cd opencv-$(OPENCV_VERSION)/build && make install # copy files mkdir -p libs/opencv-$(OPENCV_VERSION).tmp/include @@ -228,7 +228,6 @@ libs/libxslt-$(LIBXSLT_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar rm -r -f libs/libxslt-* tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz - tar xvf $(MAKEFILE_PATH)libxslt-$(LIBXSLT_VERSION)-fix.tar.gz # build cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC cd libxslt-$(LIBXSLT_VERSION) && make @@ -245,7 +244,7 @@ libs/libxslt-$(LIBXSLT_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar curl: libs/curl-$(CURL_VERSION) $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz: - wget --no-check-certificate http://curl.haxx.se/$(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz -O $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz + wget --no-check-certificate http://curl.haxx.se/download/curl-$(CURL_VERSION).tar.gz -O $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz libs/curl-$(CURL_VERSION): $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz # prepare diff --git a/build_scripts/Windows/build-libs/libxslt-1.1.28-fix.tar.gz b/build_scripts/Windows/build-libs/libxslt-1.1.28-fix.tar.gz deleted file mode 100755 index af1bada8f0069b853007b5cff8a0c0818ca040fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3009 zcmV;y3qJH8iwFQJxh_-y1MM1XQ`<CUG4Y$~MWSZns>* z8U+=y*zDnHa*|fe8;8vcz-jn;{F$pFB=D|_#gg(|6jM?>=yq2Ga$$R9-RiR>EG9HZ+7>k|94rOw41x_H*2K%0((CS|L6X1Y?sM4iQIia`m?!3XVmsJ-*jx^ z7{tG(yl6AQ>nRLH=fc43ws&HADw(cyrc}>H{{rZDXozwpDwGVgLQ*xHnRKo%x!@V7BeG0a~vPF#h_*{D1D)En|eqKZ|ytKC<*TtRX4L@z^r2UDL+kjY5Axp1lBk>8nj)b;K)o!$_aYWj(3(ZihgQ$X

i~45**?dI7&u_Wt1zHGq0LB`F0ie3vaAQ$q`q${mrx<>@I_14%5D7FSG$iN6m-U-0mz1-ltK2%KUd@QO z(2*{BJAB=T^6|lPt{@dERk02j;MGbNb(KJpooN8U;m*X+ASLu)?G4zehGc;$8okw8uhXjTZ*pd@; z7i=#$d_Me=%Nm;BYMhw?2E8%NZ2!u!!GKl3l}(V(RQB0Ct`BMrVs4G+>4)!-r83o*fqZoPiq9G73PRu88vCd3vZR%kn#L0oTtS9HD_? z?+xcv%x*iKz_IZ(N9@>?DqNgrk1V%${k!M+oV=R?DIjS!zb^9SFv@R|rVb3}cYY!| zvaE@t3ygGgIyDVAGsXFQJw6UV(W z^&f72gNd=s{>^3f=UV)Q9ncIN@G_8b^&zjSe#qqqo5pbTu(cTvl)2_#i)g}M(bsGk z6mAVCJhsU0FFiQ_LcL*>crB?BFf9ay=LGJQF|8P|102yICaGVq*Q>0${&IFIui?k% z$L9xN^OK?ly zmh{}*y6MuX@3{9dx!NFC*nt#j`S%TR6(|!jZq16CC+OB{`S-k}{C+c<^hdCD$Vog` z6fSkopUfPcR#nL&sbUg|9|}f`6|yY1f5y4|0)$>Rg_IsCxB?|BaF|Mv$!`8NH7h1! zEMc@^NQ+ot2oMRG=SFr!%sF-`LBe^gE4P*WB9yIjCQK6|f~%xla5fo!s_XC@PEHlS z;go%9gWZg3KY3sW1H0(2_C~Z-qUD4E#uGsr0}U{7Ozy3B_tA;MQ_ zeN*`!VdrYy*cP34n}3%I+3ODVuxQaclR2JUd4Znn42si$AZzen9`$3H^}FRKUum#x zr{;Mzres>nm7E)TH*$egIK#^-g>*RIPTbtaMN7s41Vf2OgM6hrG0NUNU8Sjnx=@Cs zjb=B17~dT>$&^Ym_!-O<3s+Y;&@UfdBXM)bR(>_(tvIn>4o?Lmm-3+l=YcDpc0QF8 zDK9mq5yv#e8G?_s5mAjDfGJF49)7KzX*ZO~#YYpDTIS5O@eTe70!$M(RD^*2H8j7; zNTO*N4kN&n7lUYDJSvK-H01AEy^{Urm*UQA;SY?tYFWq z%V8hMV5diFIC~4rO05FgN^GR4;zm(nX4p{%%hnb$;a}pAi;Tns#R|F0(>4)~#0h+y z3Hb+Uk-@A!b3xU3XXj^36Odu&Et`3dunaN1K-iJ*>cPAcY4{N8Sz#m|7z#ot6#tJu z%B2b??ENRutjhb&@ub@sjfsL@BjM@>4t^U|HU+FYW<^r4I<&bNJ^Z`*+tJZhV+$5T z4=8V2zpWo_{o34$)3lN1V5?eHzAG-TOd;(*8+w#3*1ufRxdFjJY1LTC~d8L!BnaPcGD@klqpVbRleuVVT8gImft5hc4 z2_v7RnqgKtCL4w5iz^L0kBmEFqf*+=CAH&;Zug+%Pl_VlYEr#sNVWVMl60&2mQI7$ z_$ljIg(6lnU!p+piyU@&!L)m+D)A%hvHB_PuT_o*Lcf={_fxC# zkN)H00tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>{xtX>GilDK08jt` DKW^3- diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat index 5367efa97..d4f2ab7ba 100644 --- a/build_scripts/Windows/build/build.bat +++ b/build_scripts/Windows/build/build.bat @@ -52,7 +52,7 @@ echo. title Build - %SourceName%-%RsBuildConfig% [qmake] -qmake "%SourcePath%\RetroShare.pro" -r "CONFIG+=%RsBuildConfig% version_detail_bash_script rs_autologin" +qmake "%SourcePath%\RetroShare.pro" -r "CONFIG+=%RsBuildConfig% version_detail_bash_script rs_autologin retroshare_plugins" if errorlevel 1 goto error echo. diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat index d52377d9f..49dff68b3 100644 --- a/build_scripts/Windows/build/pack.bat +++ b/build_scripts/Windows/build/pack.bat @@ -128,6 +128,12 @@ if "%QtMainVersion%"=="5" ( copy "%QtPath%\..\plugins\audio\qtaudio_windows.dll" "%RsDeployPath%\audio" %Quite% ) +if exist "%QtPath%\..\plugins\styles\qwindowsvistastyle.dll" ( + echo Copy styles + mkdir "%RsDeployPath%\styles" %Quite% + copy "%QtPath%\..\plugins\styles\qwindowsvistastyle.dll" "%RsDeployPath%\styles" %Quite% +) + copy "%QtPath%\..\plugins\imageformats\*.dll" "%RsDeployPath%\imageformats" %Quite% del /Q "%RsDeployPath%\imageformats\*d?.dll" %Quite% diff --git a/build_scripts/Windows/env/tools/prepare-tools.bat b/build_scripts/Windows/env/tools/prepare-tools.bat index 94ad1ae8b..2295d0ca3 100644 --- a/build_scripts/Windows/env/tools/prepare-tools.bat +++ b/build_scripts/Windows/env/tools/prepare-tools.bat @@ -8,7 +8,7 @@ set SevenZipUrl=http://7-zip.org/a/7z1602.msi set SevenZipInstall=7z1602.msi ::set CurlUrl=https://bintray.com/artifact/download/vszakats/generic/curl-7.50.1-win32-mingw.7z ::set CurlInstall=curl-7.50.1-win32-mingw.7z -set WgetUrl=https://eternallybored.org/misc/wget/current/wget.exe +set WgetUrl=https://eternallybored.org/misc/wget/1.19.4/32/wget.exe set WgetInstall=wget.exe set JomUrl=http://download.qt.io/official_releases/jom/jom.zip set JomInstall=jom.zip @@ -118,7 +118,7 @@ if not exist "%EnvToolsPath%\cut.exe" ( %cecho% info "Download Unix Tools installation" if not exist "%EnvDownloadPath%\%UnixToolsInstall%" call "%ToolsPath%\winhttpjs.bat" %UnixToolsUrl% -saveTo "%EnvDownloadPath%\%UnixToolsInstall%" - if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error ""Cannot download Unix Tools installation" & goto error + if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error %cecho% info "Unpack Unix Tools" "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" @@ -134,7 +134,7 @@ if not exist "%EnvToolsPath%\sed.exe" ( %cecho% info "Download Unix Tools installation" if not exist "%EnvDownloadPath%\%UnixToolsInstall%" call "%ToolsPath%\winhttpjs.bat" %UnixToolsUrl% -saveTo "%EnvDownloadPath%\%UnixToolsInstall%" - if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error ""Cannot download Unix Tools installation" & goto error + if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error %cecho% info "Unpack Unix Tools" "%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi index d847cc3ae..94dae3603 100644 --- a/build_scripts/Windows/installer/retroshare-Qt5.nsi +++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi @@ -195,11 +195,15 @@ Section $(Section_Main) Section_Main ; Qt audio SetOutPath "$INSTDIR\audio" - File /r "${QTDIR}\plugins\audio\qtaudio_windows.dll" + File "${QTDIR}\plugins\audio\qtaudio_windows.dll" ; Qt platforms SetOutPath "$INSTDIR\platforms" - File /r "${QTDIR}\plugins\platforms\qwindows.dll" + File "${QTDIR}\plugins\platforms\qwindows.dll" + + ; Qt styles + SetOutPath "$INSTDIR\styles" + File /NONFATAL "${QTDIR}\plugins\styles\qwindowsvistastyle.dll" ; MinGW binaries SetOutPath "$INSTDIR" diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index c178332a0..ccf7f00f9 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -35,7 +35,7 @@ win32 { DEPENDPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR - OPENCV_VERSION = "320" + OPENCV_VERSION = "341" USE_PRECOMPILED_LIBS = for(lib, LIB_DIR) { #message(Scanning $$lib) @@ -76,7 +76,7 @@ win32 { message(Use system opencv libraries.) LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc } - LIBS += -lz -lole32 -loleaut32 -luuid -lvfw32 -llibjpeg -llibtiff -llibpng -llibjasper -lIlmImf + LIBS += -lzlib -lole32 -loleaut32 -luuid -lvfw32 -llibjpeg -llibtiff -llibpng -llibjasper -lIlmImf LIBS += -lavifil32 -lavicap32 -lavcodec -lavutil -lswresample } diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 2fa5aafca..7a6d8d2a9 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -169,6 +169,8 @@ win32 { CONFIG(debug, debug|release) { # show console output CONFIG += console + } else { + CONFIG -= console } # Switch on extra warnings