Windows build environment

- Fixed pack of tor bundle
- Removed external tool jom.exe
- Added parameter "singlethread" for build from MSYS2 build

build_scripts/Windows/build/build.bat

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

build_scripts/Windows/build/env.bat

@@ -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.

build_scripts/Windows/build/pack.bat

@@ -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

build_scripts/Windows/env/env.bat

@@ -9,7 +9,6 @@ set EnvDownloadPath=%EnvRootPath%\download
 set EnvTorPath=%EnvDownloadPath%\tor
 
 set EnvSevenZipExe=%EnvToolsPath%\7z.exe
-set EnvJomExe=%EnvToolsPath%\jom.exe
 set EnvSedExe=%EnvToolsPath%\sed.exe
 set EnvCutExe=%EnvToolsPath%\cut.exe
 set EnvDependsExe=%EnvToolsPath%\depends.exe

build_scripts/Windows/env/tools/prepare-tools.bat

@@ -6,8 +6,6 @@ set CEchoUrl=https://github.com/lordmulder/cecho/releases/download/2015-10-10/ce
 set CEchoInstall=cecho.2015-10-10.zip
 set SevenZipUrl=https://sourceforge.net/projects/sevenzip/files/7-Zip/19.00/7z1900.msi/download
 set SevenZipInstall=7z1900.msi
-set JomUrl=http://download.qt.io/official_releases/jom/jom.zip
-set JomInstall=jom.zip
 set DependsUrl=http://www.dependencywalker.com/depends22_x86.zip
 set DependsInstall=depends22_x86.zip
 set UnixToolsUrl=http://unxutils.sourceforge.net/UnxUpdates.zip
@@ -58,22 +56,6 @@ if not exist "%EnvToolsPath%\cecho.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 )
 
-if not exist "%EnvToolsPath%\jom.exe" (
-	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
-	mkdir "%EnvTempPath%"
-
-	%cecho% info "Download jom installation"
-
-	if not exist "%EnvDownloadPath%\%JomInstall%" call "%ToolsPath%\download-file.bat" %JomUrl% "%EnvDownloadPath%\%JomInstall%"
-	if not exist "%EnvDownloadPath%\%JomInstall%" %cecho% error "Cannot download jom installation" & goto error
-
-	%cecho% info "Unpack jom"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%JomInstall%"
-	copy "%EnvTempPath%\jom.exe" "%EnvToolsPath%"
-
-	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
-)
-
 if not exist "%EnvToolsPath%\depends.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"