Windows build environment:

- Fixed download of Tor binaries
- Fixed download of doxygen
- Updated MSYS2 installer
- Changed build of WebUI

build_scripts/Windows/build/build.bat

@@ -71,14 +71,6 @@ title Build - %SourceName%-%RsBuildConfig% [make]
 mingw32-make -j %CoreCount%
 if errorlevel 1 goto error
 
-:: Webui
-if "%ParamWebui%"=="1" (
-	call :build-webui
-	if errorlevel 1 goto error
-) else (
-	if exist "%RsWebuiBuildPath%" call "%ToolsPath%\remove-dir.bat" "%RsWebuiBuildPath%"
-)
-
 echo.
 echo === Changelog
 echo.
@@ -98,37 +90,3 @@ exit /B %ERRORLEVEL%
 echo Failed to initialize environment.
 endlocal
 exit /B 1
-
-:build-webui
-echo.
-echo === webui
-echo.
-title Build webui
-
-if not exist "%RsWebuiPath%" (
-	echo Checking out webui source into %RsWebuiPath%
-	git clone https://github.com/RetroShare/RSNewWebUI.git "%RsWebuiPath%"
-	if errorlevel 1 exit /B 1
-) else (
-	echo Webui source found at %RsWebuiPath%
-	pushd "%RsWebuiPath%"
-	git pull
-	popd
-	if errorlevel 1 exit /B 1
-)
-
-pushd "%RsWebuiPath%\webui-src\make-src"
-call build.bat
-popd
-if errorlevel 1 exit /B 1
-
-if not exist "%RsWebuiPath%\webui" (
-	%cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui"
-	exit /B 1
-)
-
-if exist "%RsWebuiBuildPath%" call "%ToolsPath%\remove-dir.bat" "%RsWebuiBuildPath%"
-move "%RsWebuiPath%\webui" "%RsWebuiBuildPath%"
-if errorlevel 1 exit /B 1
-
-exit /B 0

build_scripts/Windows/build/env.bat

@@ -105,8 +105,7 @@ set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%
 set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%GCCArchitecture%%RsType%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
-set RsWebuiPath=%RootPath%\%SourceName%-webui
-set RsWebuiBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%\webui
+set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"
@@ -138,6 +137,7 @@ if "%Module%"=="build" (
 )
 if "%Module%"=="pack" (
 	echo Optional parameter
+	echo webui                 Pack webui
 	echo service               Pack service
 	echo friendserver          Pack Friend Server ^(needs Tor^)
 	echo tor                   Pack Tor version

build_scripts/Windows/build/pack.bat

@@ -181,10 +181,11 @@ copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite%
 echo copy changelog.txt
 copy "%RsBuildPath%\changelog.txt" "%RsDeployPath%" %Quite%
 
-if exist "%RsWebuiBuildPath%" (
+if defined ParamWebui (
 	echo copy webui
 	mkdir "%RsDeployPath%\webui"
 	xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
+	if errorlevel 1 %cecho% error "WebUi not found"& goto error
 )
 
 if "%ParamTor%"=="1" (