Windows build environment

- Fixed pack of tor bundle
- Removed external tool jom.exe
- Added parameter "singlethread" for build from MSYS2 build
This commit is contained in:
thunder2 2020-08-11 11:41:10 +02:00
parent fe5a0e023e
commit 532c114048
5 changed files with 8 additions and 25 deletions

View file

@ -63,11 +63,7 @@ echo.
title Build - %SourceName%-%RsBuildConfig% [make]
if exist "%EnvJomExe%" (
"%EnvJomExe%"
) else (
mingw32-make
)
mingw32-make -j %CoreCount%
if errorlevel 1 goto error
echo.

View file

@ -6,6 +6,7 @@ set ParamPlugins=0
set ParamJsonApi=0
set ParamTor=0
set NonInteractive=0
set CoreCount=%NUMBER_OF_PROCESSORS%
:parameter_loop
if "%~1" NEQ "" (
@ -24,6 +25,8 @@ if "%~1" NEQ "" (
set ParamTor=1
) else if "%%~a"=="non-interactive" (
set NonInteractive=1
) else if "%%~a"=="singlethread" (
set CoreCount=1
) else (
echo.
echo Unknown parameter %1
@ -103,6 +106,9 @@ echo autologin Build with autologin
echo jsonapi Build with jsonapi
echo plugins Build plugins
echo.
echo Optional parameter
echo singlethread Use only 1 thread for building
echo.
echo Parameter for pack
echo tor Pack tor version
echo.

View file

@ -167,7 +167,7 @@ if exist "%SourcePath%\libresapi\src\webui" (
if "%ParamTor%"=="1" (
echo copy tor
echo n | copy /-y "%EnvTorPath%\*.*" "%RsDeployPath%" %Quite%
echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%" %Quite%
)
rem pack files