Windows build environment:

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

build_scripts/Windows-msys2/build/build.bat

@@ -97,11 +97,6 @@ title Build - %SourceName%-%RsBuildConfig% [make]
 %EnvMSYS2Cmd% "make -j %CoreCount%"
 if errorlevel 1 goto error
 
-:: Webui
-if "%ParamWebui%"=="1" (
-	call "%~dp0..\tools\webui.bat"
-)
-
 :error
 popd
 

build_scripts/Windows-msys2/build/env.bat

@@ -18,7 +18,7 @@ set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsCompiler%-%RsBuildCo
 set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
-set RsWebuiPath=%RootPath%\%SourceName%-webui
+set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"

build_scripts/Windows-msys2/build/pack.bat

@@ -187,12 +187,12 @@ echo copy buildinfo.txt
 copy "%RsBuildPath%\buildinfo.txt" "%RsDeployPath%" %Quite%
 
 if "%ParamWebui%"=="1" (
-	if exist "%RsWebuiPath%\webui" (
+	if exist "%RsWebuiBuildPath%" (
 		echo copy webui
 		mkdir "%RsDeployPath%\webui"
-		xcopy /S "%RsWebuiPath%\webui" "%RsDeployPath%\webui" %Quite%
+		xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
 	) else (
-		%cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui"
+		%cecho% error "Webui is enabled, but no webui data found at %RsWebuiBuildPath%"
 		goto error
 	)
 )

build_scripts/Windows-msys2/tools/webui.bat

@@ -1,22 +0,0 @@
-setlocal
-
-echo.
-echo === webui
-echo.
-title Build webui
-
-if not exist "%RsWebuiPath%" (
-	echo Checking out webui source into %RsWebuiPath%
-	if not "%ParamNoupdate%"=="1" (
-		%EnvMSYS2Cmd% "pacman --noconfirm --needed -S git"
-	)
-	git clone https://github.com/RetroShare/RSNewWebUI.git "%RsWebuiPath%"
-) else (
-	echo Webui source found at %RsWebuiPath%		
-)
-
-pushd "%RsWebuiPath%\webui-src\make-src"
-%EnvMSYS2Cmd% "sh build.sh"
-popd
-
-endlocal