Modified Windows Build Environment

- Removed commandline switch "version"
- Added MinGit for determining version information during compile process
- Added sigcheck to determine version of the executable

build_scripts/Windows/tools/download-file-wildcard.bat.bat

@@ -1,46 +1,46 @@
-:: Usage:
-:: call download-file-wildcard.bat url file-wildcard download-path variable
-
-if "%~4"=="" (
-	echo.
-	echo Parameter error.
-	exit /B 1
-)
-
-if "%EnvTempPath%"=="" (
-	echo.
-	echo Environment error.
-	exit /B 1
-)
-
-setlocal
-
-set Url=%~1
-set FileWildcard=%~2
-set DownloadPath=%~3
-set Var=%~4
-set File=
-
-call "%~dp0remove-dir.bat" "%EnvTempPath%"
-mkdir "%EnvTempPath%"
-
-"%EnvWgetExe%" --recursive --continue --no-directories --no-parent -A "%FileWildcard%" --directory-prefix="%EnvTempPath%" "%Url%"
-
-if errorlevel 1 (
-	call "%~dp0remove-dir.bat" "%EnvTempPath%"
-	endlocal & set %Var%=
-	exit /B %ERRORLEVEL%
-)
-
-for %%A in (%EnvTempPath%\%FileWildcard%) do set File=%%~nxA
-if "%File%"=="" (
-	call "%~dp0remove-dir.bat" "%EnvTempPath%"
-	endlocal & set %Var%=
-	exit /B %ERRORLEVEL%
-)
-
-move "%EnvTempPath%\%File%" "%DownloadPath%"
-call "%~dp0remove-dir.bat" "%EnvTempPath%"
-
-endlocal & set %Var%=%File%
-exit /B 0
+:: Usage:
+:: call download-file-wildcard.bat url file-wildcard download-path variable
+
+if "%~4"=="" (
+	echo.
+	echo Parameter error.
+	exit /B 1
+)
+
+if "%EnvTempPath%"=="" (
+	echo.
+	echo Environment error.
+	exit /B 1
+)
+
+setlocal
+
+set Url=%~1
+set FileWildcard=%~2
+set DownloadPath=%~3
+set Var=%~4
+set File=
+
+call "%~dp0remove-dir.bat" "%EnvTempPath%"
+mkdir "%EnvTempPath%"
+
+"%EnvWgetExe%" --recursive --continue --no-directories --no-parent -A "%FileWildcard%" --directory-prefix="%EnvTempPath%" "%Url%"
+
+if errorlevel 1 (
+	call "%~dp0remove-dir.bat" "%EnvTempPath%"
+	endlocal & set %Var%=
+	exit /B %ERRORLEVEL%
+)
+
+for %%A in (%EnvTempPath%\%FileWildcard%) do set File=%%~nxA
+if "%File%"=="" (
+	call "%~dp0remove-dir.bat" "%EnvTempPath%"
+	endlocal & set %Var%=
+	exit /B %ERRORLEVEL%
+)
+
+move "%EnvTempPath%\%File%" "%DownloadPath%"
+call "%~dp0remove-dir.bat" "%EnvTempPath%"
+
+endlocal & set %Var%=%File%
+exit /B 0

build_scripts/Windows/tools/download-file.bat

@@ -1,13 +1,13 @@
-:: Usage:
-:: call download-file.bat url file
-
-if "%~2"=="" (
-	echo.
-	echo Parameter error.
-	exit /B 1
-)
-
-::"%EnvCurlExe%" -L -k "%~1" -o "%~2"
-"%EnvWgetExe%" --no-check-certificate --continue "%~1" --output-document="%~2"
-
-exit /B %ERRORLEVEL%
+:: Usage:
+:: call download-file.bat url file
+
+if "%~2"=="" (
+	echo.
+	echo Parameter error.
+	exit /B 1
+)
+
+::"%EnvCurlExe%" -L -k "%~1" -o "%~2"
+"%EnvWgetExe%" --no-check-certificate --continue "%~1" --output-document="%~2"
+
+exit /B %ERRORLEVEL%

build_scripts/Windows/tools/get-rs-version.bat

@@ -1,9 +1,14 @@
 :: Usage:
-:: call get-rs-version.bat Define Variable
+:: call get-rs-version.bat Executable Variable
+::
+:: Variable.Major
+:: Variable.Minor
+:: Variable.Mini
+:: Variable.Extra
 
 setlocal
 
-set Define=%~1
+set Executable=%~1
 set Variable=%~2
 if "%Variable%"=="" (
 	echo.
@@ -11,23 +16,23 @@ if "%Variable%"=="" (
 	exit /B 1
 )
 
-set Result=
-set VersionFile="%~dp0..\..\..\libretroshare\src\retroshare\rsversion.h"
-
-if not exist "%VersionFile%" (
+if not exist "%Executable%" (
 	echo.
-	echo Version file doesn't exist.
-	echo %VersionFile%
+	echo File %Executable% doesn't exist.
 	exit /B1
 )
 
-for /F "usebackq tokens=1,2,3" %%A in (%VersionFile%) do (
-	if "%%A"=="#define" (
-		if "%%B"=="%Define%" (
-			set Result=%%~C
-		)
-	)
+set VersionMajor=
+set VersionMinor=
+set VersionMini=
+set VersionExtra=
+
+for /F "tokens=1,2,3,* delims=.-" %%A in ('%EnvToolsPath%\sigcheck.exe -nobanner -n %Executable%') do (
+	set VersionMajor=%%A
+	set VersionMinor=%%B
+	set VersionMini=%%C
+	set VersionExtra=%%D
 )
 
-endlocal & set %Variable%=%Result%
+endlocal & set %Variable%.Major=%VersionMajor%& set %Variable%.Minor=%VersionMinor%& set %Variable%.Mini=%VersionMini%& set %Variable%.Extra=%VersionExtra%&
 exit /B 0

build_scripts/Windows/tools/remove-dir.bat

@@ -1,15 +1,15 @@
-:: Usage:
-:: call remove-dir.bat path
-
-if "%~1"=="" (
-	echo.
-	echo Parameter error.
-	exit /B 1
-)
-
-if exist %1 (
-	del /s /f /q %1 >nul
-	rmdir /s /q %1
-)
-
-exit /B 0
+:: Usage:
+:: call remove-dir.bat path
+
+if "%~1"=="" (
+	echo.
+	echo Parameter error.
+	exit /B 1
+)
+
+if exist %1 (
+	del /s /f /q %1 >nul
+	rmdir /s /q %1
+)
+
+exit /B 0