Windows build environment:

- Renamed folder build_libs to build-libs - Removed old file stripSVN.sh - Fixed some batch files - Switch from curl to wget - Added Qt environment - Added build.bat to build everything
2025-05-02 06:06:10 -04:00 · 2016-11-03 08:32:15 +01:00 · 2016-11-03 08:32:15 +01:00 · eb95c6895a
commit eb95c6895a
parent 00085728ae
19 changed files with 430 additions and 67 deletions
--- a/build_scripts/Windows/env/tools/prepare-msys.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys.bat
@ -9,7 +9,7 @@ if not exist "%EnvRootPath%"=="" exit /B 1
 copy "%~dp0root\update-msys.bat" "%EnvRootPath%" >nul

 if "%~1"=="clean" (
-	echo Clean MSYS
+	%cecho% info "Clean MSYS"
 	call "%ToolsPath%\remove-dir.bat" "%EnvMSYSPath%"
 	goto exit
 )
@ -24,23 +24,25 @@ if exist "%EnvMSYSPath%\bin\mingw-get.exe" (
 )

 set MSYSInstall=mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip
+set MSYSUrl=http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/%MSYSInstall%/download
 set CMakeInstall=cmake-3.1.0-win32-x86.zip
+set CMakeUrl=http://www.cmake.org/files/v3.1/%CMakeInstall%
 set CMakeUnpackPath=%EnvMSYSPath%\msys\1.0

-echo Remove previous MSYS version
+%cecho% info "Remove previous MSYS version"
 call "%ToolsPath%\remove-dir.bat" "%EnvMSYSPath%"

-echo Download installation files
-if not exist "%EnvDownloadPath%\%MSYSInstall%" "%EnvCurlExe%" -L -k http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/%MSYSInstall%/download -o "%EnvDownloadPath%\%MSYSInstall%"
-if not exist "%EnvDownloadPath%%\MSYSInstall%" echo Cannot download MSYS& goto error
+%cecho% info "Download installation files"
+if not exist "%EnvDownloadPath%\%MSYSInstall%" call "%ToolsPath%\download-file.bat" "%MSYSUrl%" "%EnvDownloadPath%\%MSYSInstall%"
+if not exist "%EnvDownloadPath%\%MSYSInstall%" %cecho% error "Cannot download MSYS" & goto error

-if not exist "%EnvDownloadPath%\%CMakeInstall%" "%EnvCurlExe%" -L -k http://www.cmake.org/files/v3.1/cmake-3.1.0-win32-x86.zip -o "%EnvDownloadPath%\%CMakeInstall%"
-if not exist "%EnvDownloadPath%\%CMakeInstall%" echo Cannot download CMake& goto error
+if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\download-file.bat" "%CMakeUrl%" "%EnvDownloadPath%\%CMakeInstall%"
+if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download CMake" & goto error

-echo Unpack MSYS
+%cecho% info "Unpack MSYS"
 "%EnvSevenZipExe%" x -o"%EnvMSYSPath%" "%EnvDownloadPath%\%MSYSInstall%"

-echo Install MSYS
+%cecho% info "Install MSYS"
 if not exist "%EnvMSYSPath%\var\lib\mingw-get\data\profile.xml" copy "%EnvMSYSPath%\var\lib\mingw-get\data\defaults.xml" "%EnvMSYSPath%\var\lib\mingw-get\data\profile.xml"
 pushd "%EnvMSYSPath%\bin"
 mingw-get.exe install mingw32-mingw-get
@ -53,14 +55,14 @@ mingw-get.exe install msys-mktemp
 mingw-get.exe install msys-wget
 popd

-echo Unpack CMake
+%cecho% info "Unpack CMake"
 "%EnvSevenZipExe%" x -o"%CMakeUnpackPath%" "%EnvDownloadPath%\%CMakeInstall%"

-echo Install CMake
+%cecho% info "Install CMake"
 set CMakeVersion=
 for /D %%F in (%CMakeUnpackPath%\cmake*) do set CMakeVersion=%%~nxF
-if "%CMakeVersion%"=="" echo CMake version not found.& goto :exit
-echo Found CMake version %CMakeVersion%
+if "%CMakeVersion%"=="" %cecho% error "CMake version not found." & goto :exit
+%cecho% info "Found CMake version %CMakeVersion%"

 set FoundProfile=
 for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%EnvMSYSPath%\msys\1.0\etc\profile"') do set FoundProfile=%%F
@ -76,8 +78,3 @@ exit /B 0
 :error
 endlocal
 exit /B 1
-
-:error_vars
-echo Failed to initialize variables.
-endlocal
-exit /B 1
--- a/build_scripts/Windows/env/tools/prepare-qt.bat
+++ b/build_scripts/Windows/env/tools/prepare-qt.bat
@ -0,0 +1,204 @@
+:: Usage:
+:: call prepare-qt.bat version [reinstall|clean]
+
+setlocal enabledelayedexpansion
+
+if "%EnvQtBasePath%"=="" exit /B 1
+if not exist "%EnvRootPath%"=="" exit /B 1
+
+set EnvQtVersion=%~1
+if "%EnvQtVersion%"=="" (
+	%cecho% error "Please specify Qt version"
+	goto error
+)
+
+for /f "tokens=1,2 delims=." %%A in ("%EnvQtVersion%") do set EnvQtMainVersion=%%A& set EnvQtBaseVersion=%%A.%%B
+set EnvQtPath=%EnvQtBasePath%\%EnvQtVersion%
+
+if "%~2"=="clean" (
+	%cecho% info "Clean Qt %EnvQtVersion%"
+	call "%ToolsPath%\remove-dir.bat" "%EnvQtPath%"
+	goto exit
+)
+
+set CheckQmakeExe=
+if "%EnvQtMainVersion%"=="4" (
+	set CheckQmakeExe=%EnvQtPath%\Qt\bin\qmake.exe
+) else (
+	if "%EnvQtMainVersion%" GEQ "5" (
+		call :get_mingw_version EnvQtMinGWVersion "%EnvQtPath%\%EnvQtBaseVersion%"
+		if "!EnvQtMinGWVersion!" NEQ "" (
+			set CheckQmakeExe=%EnvQtPath%\%EnvQtBaseVersion%\!EnvQtMinGWVersion!\bin\qmake.exe
+		)
+	)
+)
+
+if "%CheckQmakeExe%" NEQ "" (
+	if exist "%CheckQmakeExe%" (
+		if "%~2"=="reinstall" (
+			choice /M "Found existing Qt %EnvQtVersion% version. Do you want to proceed?"
+			if !ERRORLEVEL!==2 goto exit
+		) else (
+			goto exit
+		)
+	)
+)
+
+set QtInstall=qt-opensource-windows-x86-mingw-%EnvQtVersion%.exe
+set QtInstallWildcard=qt-opensource-windows-x86-mingw*-%EnvQtVersion%.exe
+set QtUrl=http://download.qt.io/official_releases/qt/%EnvQtBaseVersion%/%EnvQtVersion%
+
+%cecho% info "Remove previous Qt %EnvQtVersion% version"
+call "%ToolsPath%\remove-dir.bat" "%EnvQtPath%"
+
+%cecho% info "Download Qt installation files"
+if not exist "%EnvDownloadPath%\%QtInstall%" (
+	call "%ToolsPath%\download-file-wildcard.bat" "%QtUrl%" "%QtInstallWildcard%" "%EnvDownloadPath%" QtInstallDownload
+	if "!QtInstallDownload!"=="" %cecho% error "Cannot download Qt %EnvQtVersion%" & goto error
+	ren "%EnvDownloadPath%\!QtInstallDownload!" "%QtInstall%"
+)
+if not exist "%EnvDownloadPath%\%QtInstall%" %cecho% error "Cannot download Qt %EnvQtVersion%" & goto error
+
+mkdir "%EnvQtPath%"
+
+if "%EnvQtMainVersion%"=="4" (
+	rem Qt 4
+	goto install_qt4
+)
+if "%EnvQtMainVersion%" GEQ "5" (
+	rem Qt >= 5
+	goto install_qt5
+)
+
+%cecho% error "Unknown Qt version %EnvQtVersion%"
+
+:error
+endlocal & set QtDir=& set MinGWDir=
+exit /B 1
+
+:exit
+set QtDir=
+set MinGWDir=
+
+if "%EnvQtMainVersion%"=="4" (
+	rem Qt 4
+	set QtDir=%EnvQtBasePath%\%EnvQtVersion%\Qt
+	set MinGWDir=%EnvQtBasePath%\%EnvQtVersion%\mingw32
+) else (
+	if "%EnvQtMainVersion%" GEQ "5" (
+		call :get_mingw_version EnvQtToolsMinGWVersion "%EnvQtPath%\Tools"
+
+		set QtDir=%EnvQtPath%\%EnvQtBaseVersion%\!EnvQtMinGWVersion!
+		set MinGWDir=%EnvQtPath%\Tools\!EnvQtToolsMinGWVersion!
+	)
+)
+
+endlocal & set QtDir=%QtDir%& set MinGWDir=%MinGWDir%
+exit /B 0
+
+:get_mingw_version
+setlocal enabledelayedexpansion
+set Variable=%~1
+set Result=
+
+for /D %%A in (%~2\*) do set Name=%%~nA& if "!Name:~0,5!"=="mingw" set Result=!Name!
+endlocal & set %Variable%=%Result%
+goto :EOF
+
+:replace
+set InFile=%~1
+set InFileName=%~nx1
+set OutFile=%~1.tmp
+set SearchText=%~2
+set ReplaceText=%~3
+
+if exist "%OutFile%" del /Q "%OutFile%"
+
+for /f "tokens=1* delims=]" %%A in ('find /n /v ""^<%InFile%') do (
+	set string=%%B
+
+	if "!string!"=="" (
+		echo.>>%OutFile%
+	) else (
+		set modified=!string:%SearchText%=%ReplaceText%!
+		echo !modified!>> %OutFile%
+	)
+)
+del "%InFile%"
+rename "%OutFile%" "%InFileName%"
+goto :EOF
+
+:install_qt4
+set MinGWInstall=i686-4.8.2-release-posix-dwarf-rt_v3-rev3.7z
+set MinGWUrl=http://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/Personal Builds/mingw-builds/4.8.2/threads-posix/dwarf/%MinGWInstall%/download
+
+%cecho% info "Download MinGW installation files"
+if not exist "%EnvDownloadPath%\%MinGWInstall%" call "%ToolsPath%\download-file.bat" "%MinGWUrl%" "%EnvDownloadPath%\%MinGWInstall%"
+if not exist "%EnvDownloadPath%\%MinGWInstall%" %cecho% error "Cannot download MinGW" & goto error
+
+%cecho% info "Unpack Qt %EnvQtVersion%"
+call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+mkdir "%EnvTempPath%"
+"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%QtInstall%" $_14_
+move "%EnvTempPath%\$_14_" "%EnvQtPath%\Qt"
+call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+
+%cecho% info "Unpack MinGW"
+"%EnvSevenZipExe%" x -o"%EnvQtPath%" "%EnvDownloadPath%\%MinGWInstall%"
+
+echo Prepare Qt %EnvQtVersion%
+echo [Paths]>"%EnvQtPath%\Qt\bin\qt.conf"
+echo Prefix=..>>"%EnvQtPath%\Qt\bin\qt.conf"
+
+goto exit
+
+:install_qt5
+set EnvQtInstallerFrameworkVersion=2.0.3
+
+set QtInstallerFrameworkInstall=QtInstallerFramework-%EnvQtInstallerFrameworkVersion%-win-x86.exe
+set QtInstallerFrameworkUrl=http://download.qt.io/official_releases/qt-installer-framework/%EnvQtInstallerFrameworkVersion%/QtInstallerFramework-win-x86.exe
+
+%cecho% info "Download QtInstallerFramework installation files"
+if not exist "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" call "%ToolsPath%\download-file.bat" "%QtInstallerFrameworkUrl%" "%EnvDownloadPath%\%QtInstallerFrameworkInstall%"
+if not exist "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" %cecho% error "Cannot download Qt Installer Framework %EnvQtInstallerFrameworkVersion%" & goto error
+
+%cecho% info "Unpack Qt Installer Framework"
+call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+mkdir "%EnvTempPath%"
+"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%QtInstallerFrameworkInstall%" bin\devtool.exe
+move "%EnvTempPath%\bin\devtool.exe" "%EnvQtPath%"
+call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+
+%cecho% info "Unpack Qt %EnvQtVersion%"
+call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+mkdir "%EnvTempPath%"
+"%EnvQtPath%\devtool.exe" "%EnvDownloadPath%\%QtInstall%" --dump "%EnvTempPath%"
+
+pushd "%EnvTempPath%"
+del /S *vcredist*.7z
+del /S *qtcreator*.7z
+del /S *1installer-changelog.7z
+for /R %%F in (*.7z) do "%EnvSevenZipExe%" x -y -o"%EnvQtPath%" "%%F"
+popd
+
+call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+
+call :get_mingw_version EnvQtMinGWVersion "%EnvQtPath%\%EnvQtBaseVersion%"
+
+%cecho% info "Prepare Qt %EnvQtVersion%"
+echo [Paths]>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf"
+echo Documentation=../../Docs/Qt-%EnvQtBaseVersion%>>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf"
+echo Examples=../../Examples/Qt-%EnvQtBaseVersion%>>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf"
+echo Prefix=..>>"%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\bin\qt.conf"
+
+call :replace "%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\mkspecs\qconfig.pri" "Enterprise" "OpenSource"
+
+for /R "%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\lib" %%A in (*.pc) do (
+	call :replace "%%A" "c:/Users/qt/work/install" "%EnvQtPath:\=\\%\%EnvQtBaseVersion%\\%EnvQtMinGWVersion%"
+	call :replace "%%A" "c:\Users\qt\work\install" "%EnvQtPath:\=/%\%EnvQtBaseVersion%/%EnvQtMinGWVersion%"
+)
+for /R "%EnvQtPath%\%EnvQtBaseVersion%\%EnvQtMinGWVersion%\lib" %%A in (*.prl) do (
+	call :replace "%%A" "c:/Users/qt/work/install" "%EnvQtPath:\=\\%\%EnvQtBaseVersion%\\%EnvQtMinGWVersion%"
+	call :replace "%%A" "c:\Users\qt\work\install" "%EnvQtPath:\=/%\%EnvQtBaseVersion%/%EnvQtMinGWVersion%"
+)
+goto exit
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@ -2,10 +2,14 @@ setlocal

 if "%EnvRootPath%"=="" exit /B 1

+set CEchoUrl=https://github.com/lordmulder/cecho/releases/download/2015-10-10/cecho.2015-10-10.zip
+set CEchoInstall=cecho.2015-10-10.zip
 set SevenZipUrl=http://7-zip.org/a/7z1602.msi
 set SevenZipInstall=7z1602.msi
-set CurlUrl=https://bintray.com/artifact/download/vszakats/generic/curl-7.50.1-win32-mingw.7z
-set CurlInstall=curl-7.50.1-win32-mingw.7z
+::set CurlUrl=https://bintray.com/artifact/download/vszakats/generic/curl-7.50.1-win32-mingw.7z
+::set CurlInstall=curl-7.50.1-win32-mingw.7z
+set WgetUrl=https://eternallybored.org/misc/wget/current/wget.exe
+set WgetInstall=wget.exe
 set JomUrl=http://download.qt.io/official_releases/jom/jom.zip
 set JomInstall=jom.zip
 set DependsUrl=http://www.dependencywalker.com/depends22_x86.zip
@ -33,32 +37,58 @@ if not exist "%EnvToolsPath%\7z.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 )

-if not exist "%EnvToolsPath%\curl.exe" (
+if not exist "%EnvToolsPath%\cecho.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"

-	echo Download Curl installation
+	echo Download cecho installation

-	if not exist "%EnvDownloadPath%\%CurlInstall%" call "%ToolsPath%\winhttpjs.bat" %CurlUrl% -saveTo "%EnvDownloadPath%\%CurlInstall%"
-	if not exist "%EnvDownloadPath%\%CurlInstall%" echo Cannot download Curl installation& goto error
+	if not exist "%EnvDownloadPath%\%CEchoInstall%" call "%ToolsPath%\winhttpjs.bat" "%CEchoUrl%" -saveTo "%EnvDownloadPath%\%CEchoInstall%"
+	if not exist "%EnvDownloadPath%\%cCEhoInstall%" echo Cannot download cecho installation& goto error

-	echo Unpack Curl
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CurlInstall%"
-	copy "%EnvTempPath%\curl-7.50.1-win32-mingw\bin\curl.exe" "%EnvToolsPath%"
+	echo Unpack cecho
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%"
+	copy "%EnvTempPath%\cecho.exe" "%EnvToolsPath%"

 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 )

+::if not exist "%EnvToolsPath%\curl.exe" (
+::	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+::	mkdir "%EnvTempPath%"
+::
+::	echo Download Curl installation
+::
+::	if not exist "%EnvDownloadPath%\%CurlInstall%" call "%ToolsPath%\winhttpjs.bat" %CurlUrl% -saveTo "%EnvDownloadPath%\%CurlInstall%"
+::	if not exist "%EnvDownloadPath%\%CurlInstall%" echo Cannot download Curl installation& goto error
+::
+::	echo Unpack Curl
+::	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CurlInstall%"
+::	copy "%EnvTempPath%\curl-7.50.1-win32-mingw\bin\curl.exe" "%EnvToolsPath%"
+::
+::	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
+::)
+
+if not exist "%EnvToolsPath%\wget.exe" (
+	%cecho% info "Download Wget installation"
+
+	if not exist "%EnvDownloadPath%\%WgetInstall%" call "%ToolsPath%\winhttpjs.bat" %WgetUrl% -saveTo "%EnvDownloadPath%\%WgetInstall%"
+	if not exist "%EnvDownloadPath%\%WgetInstall%" %cecho% error "Cannot download Wget installation" & goto error
+
+	%cecho% info "Copy Wget"
+	copy "%EnvDownloadPath%\wget.exe" "%EnvToolsPath%"
+)
+
 if not exist "%EnvToolsPath%\jom.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"

-	echo Download jom installation
+	%cecho% info "Download jom installation"

 	if not exist "%EnvDownloadPath%\%JomInstall%" call "%ToolsPath%\winhttpjs.bat" %JomUrl% -saveTo "%EnvDownloadPath%\%JomInstall%"
-	if not exist "%EnvDownloadPath%\%JomInstall%" echo Cannot download jom installation& goto error
+	if not exist "%EnvDownloadPath%\%JomInstall%" %cecho% error "Cannot download jom installation" & goto error

-	echo Unpack jom
+	%cecho% info "Unpack jom"
 	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%JomInstall%"
 	copy "%EnvTempPath%\jom.exe" "%EnvToolsPath%"

@ -69,12 +99,12 @@ if not exist "%EnvToolsPath%\depends.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"

-	echo Download Dependency Walker installation
+	%cecho% info "Download Dependency Walker installation"

 	if not exist "%EnvDownloadPath%\%DependsInstall%" call "%ToolsPath%\winhttpjs.bat" %DependsUrl% -saveTo "%EnvDownloadPath%\%DependsInstall%"
-	if not exist "%EnvDownloadPath%\%DependsInstall%" echo Cannot download Dependendy Walker installation& goto error
+	if not exist "%EnvDownloadPath%\%DependsInstall%" %cecho% error "Cannot download Dependendy Walker installation" & goto error

-	echo Unpack Dependency Walker
+	%cecho% info "Unpack Dependency Walker"
 	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%DependsInstall%"
 	copy "%EnvTempPath%\*" "%EnvToolsPath%"

@ -85,12 +115,12 @@ if not exist "%EnvToolsPath%\cut.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"

-	echo Download Unix Tools installation
+	%cecho% info "Download Unix Tools installation"

 	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" call "%ToolsPath%\winhttpjs.bat" %UnixToolsUrl% -saveTo "%EnvDownloadPath%\%UnixToolsInstall%"
-	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" echo Cannot download unix Tools installation& goto error
+	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error ""Cannot download Unix Tools installation" & goto error

-	echo Unpack Unix Tools
+	%cecho% info "Unpack Unix Tools"
 	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%"
 	copy "%EnvTempPath%\cut.exe" "%EnvToolsPath%"

@ -101,12 +131,12 @@ if not exist "%EnvToolsPath%\sed.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"

-	echo Download Unix Tools installation
+	%cecho% info "Download Unix Tools installation"

 	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" call "%ToolsPath%\winhttpjs.bat" %UnixToolsUrl% -saveTo "%EnvDownloadPath%\%UnixToolsInstall%"
-	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" echo Cannot download Unix Tools installation& goto error
+	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error ""Cannot download Unix Tools installation" & goto error

-	echo Unpack Unix Tools
+	%cecho% info "Unpack Unix Tools"
 	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%"
 	copy "%EnvTempPath%\sed.exe" "%EnvToolsPath%"

@ -117,12 +147,12 @@ if not exist "%EnvToolsPath%\NSIS\nsis.exe" (
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 	mkdir "%EnvTempPath%"

-	echo Download NSIS installation
+	%cecho% info "Download NSIS installation"

-	if not exist "%EnvDownloadPath%\%NSISInstall%" "%EnvCurlExe%" -L -k %NSISUrl% -o "%EnvDownloadPath%\%NSISInstall%"
-	if not exist "%EnvDownloadPath%\%NSISInstall%" echo Cannot download NSIS installation& goto error
+	if not exist "%EnvDownloadPath%\%NSISInstall%" call "%ToolsPath%\download-file.bat" "%NSISUrl%" "%EnvDownloadPath%\%NSISInstall%"
+	if not exist "%EnvDownloadPath%\%NSISInstall%" %cecho% error "Cannot download NSIS installation" & goto error

-	echo Unpack NSIS
+	%cecho% info "Unpack NSIS"
 	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%NSISInstall%"
 	if not exist "%NSISInstallPath%" mkdir "%NSISInstallPath%"
 	xcopy /s "%EnvTempPath%" "%NSISInstallPath%"