chore: Improve version number code

Author: twpol

Build.cmd

@@ -86,17 +86,10 @@ IF "%Mode%" == "Stable" (
 	)
 )
 
-REM Get code revision.
-SET Revision=000
-IF EXIST ".svn" (
-	FOR /F "usebackq tokens=1" %%R IN (`svn --non-interactive info --show-item revision .`) DO SET Revision=%%R
-)
-IF EXIST ".git" (
-	FOR /F "usebackq tokens=1" %%R IN (`git describe --first-parent --always`) DO SET Revision=%%R
-)
-IF "%Revision%" == "000" (
-	>&2 ECHO WARNING: No Subversion or Git revision found.
-)
+REM Get product version and code revision.
+FOR /F "usebackq tokens=1* delims==" %%A IN (`CALL GetVersion.cmd`) DO SET %%A=%%B
+SET Version=%OpenRails_Version%
+SET Revision=%OpenRails_Revision%
 
 REM Recreate Program directory for output.
 CALL :recreate "Program" || GOTO :error
@@ -113,16 +106,16 @@ REM Set update channel.
 ECHO Set update channel to "%Mode%".
 
 REM Set version number.
-IF NOT "%Version%" == "" (
-	>Program\Version.txt ECHO %Version%. || GOTO :error
+IF "%Mode%" == "Stable" (
+	>Program\Version.txt ECHO %Version% || GOTO :error
 	ECHO Set version number to "%Version%".
 ) ELSE (
-	>Program\Version.txt ECHO X || GOTO :error
-	ECHO Set version number to none.
+	>Program\Version.txt ECHO %Mode:~0,1%%Version% || GOTO :error
+	ECHO Set version number to "%Mode:~0,1%%Version%".
 )
 
 REM Set revision number.
->Program\Revision.txt ECHO $Revision: %Revision% $ || GOTO :error
+>Program\Revision.txt ECHO %Revision% || GOTO :error
 ECHO Set revision number to "%Revision%".
 
 REM Build locales.
@@ -139,11 +132,7 @@ ECHO Created large address aware version of RunActivity.exe.
 
 REM Copy version number from OpenRails.exe into all other 1st party files
 SET VersionInfoVersion=0.0.0.0
-IF NOT "%Version%" == "" (
-	SET VersionInfoVersion=%Version%.%Revision%
-) ELSE (
-	FOR /F "usebackq tokens=1" %%V IN (`rcedit-x86.exe "Program\OpenRails.exe" --get-version-string FileVersion`) DO SET VersionInfoVersion=%%V
-)
+FOR /F "usebackq tokens=1 delims=-" %%V IN (`ECHO %Revision%`) DO SET VersionInfoVersion=%Version%.%%V
 IF "%VersionInfoVersion%" == "0.0.0.0" (
 	>&2 ECHO ERROR: No VersionInfoVersion found in "Program\OpenRails.exe".
 	GOTO :error

GetVersion.cmd

@@ -1,26 +1,26 @@
 @ECHO OFF
 SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 
-REM Parse command line.
-SET Mode=%~1
-
-REM Get product version.
-REM TODO!
-
-REM Get code revision.
-REM   For Subversion, this is a positive integer.
-REM   For Git, this is the stable version, new commits, and latest commit ID hyphenated.
+REM Get product version and code revision.
+SET Version=
 SET Revision=
-IF EXIST ".svn" (
-	FOR /F "usebackq tokens=1" %%R IN (`svn --non-interactive info --show-item revision .`) DO SET Revision=%%R
+FOR /F "usebackq tokens=2" %%B IN (`git branch --points-at HEAD`) DO SET Branch=%%B
+FOR /F "usebackq tokens=1* delims=-" %%V IN (`git describe --first-parent --always --long`) DO (
+	SET Version=%%V
+	SET Revision=%%W
 )
-IF EXIST ".git" (
-	FOR /F "usebackq tokens=1" %%R IN (`git describe --first-parent --always`) DO SET Revision=%%R
+IF "%Branch%" == "unstable" (
+	SET TZ=UTC
+	FOR /F "usebackq tokens=1* delims=-" %%V IN (`git log -1 --pretty^=format:^%%ad --date^=format-local:^%%Y^.%%m^.%%d-^%%H^%%M`) DO (
+		SET Version=%%V
+		SET Revision=%%W
+	)
 )
-IF "%Revision%" == "" (
-	>&2 ECHO WARNING: No Subversion or Git revision found.
+IF "%Version%" == "" (
+	>&2 ECHO WARNING: No Git repository found.
 )
 
 REM Output version numbers.
+ECHO OpenRails_Branch=%Branch%
 ECHO OpenRails_Version=%Version%
 ECHO OpenRails_Revision=%Revision%

Source/ORTS.Common/VersionInfo.cs

@@ -46,8 +46,15 @@ static string GetRevision(string fileName)
                 using (var f = new StreamReader(Path.Combine(ApplicationPath, fileName)))
                 {
                     var revision = f.ReadLine().Trim();
-                    if (revision.StartsWith("$Revision:") && revision.EndsWith("$") && !revision.Contains(" 000 "))
-                        return revision.Substring(10, revision.Length - 11).Trim();
+                    if (revision.StartsWith("$Revision:") && revision.EndsWith("$"))
+                    {
+                        if (!revision.Contains(" 000 "))
+                            return revision.Substring(10, revision.Length - 11).Trim();
+                    }
+                    else
+                    {
+                        return revision;
+                    }
                 }
             }
             catch
@@ -64,7 +71,7 @@ static string GetVersion(string fileName)
                 {
                     var version = f.ReadLine().Trim();
                     if (!String.IsNullOrEmpty(Revision))
-                        return version + Revision;
+                        return version + "-" + Revision;
                 }
             }
             catch