Windows MinGW build:

- Upgraded MSYS2
- Upgraded OpenSSL-1.1.1p
- Added build of WebUI
This commit is contained in:
thunder2 2022-06-22 01:38:47 +02:00
parent 52dffddf64
commit f4f799ec58
20 changed files with 124 additions and 30 deletions

View file

@ -52,6 +52,7 @@ title Build - %SourceName%-%RsBuildConfig% [qmake]
set RS_QMAKE_CONFIG=%RsBuildConfig%
if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_autologin
if "%ParamJsonApi%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_jsonapi
if "%ParamWebui%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_webui
if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
if "%ParamUseNativeDialogs%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_use_native_dialogs
if "%ParamService%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_service
@ -70,6 +71,14 @@ 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.
@ -89,3 +98,37 @@ 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