chore: New stable and testing version number calculations

Author: twpol

Build.cmd

@@ -105,19 +105,6 @@ REM Set update channel.
 >>Program\Updater.ini ECHO Channel=string:%Mode% || GOTO :error
 ECHO Set update channel to "%Mode%".
 
-REM Set version number.
-IF "%Mode%" == "Stable" (
-	>Program\Version.txt ECHO %Version% || GOTO :error
-	ECHO Set version number to "%Version%".
-) ELSE (
-	>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% || GOTO :error
-ECHO Set revision number to "%Revision%".
-
 REM Build locales.
 PUSHD Source\Locales && CALL Update.bat non-interactive && POPD || GOTO :error
 
@@ -131,16 +118,10 @@ copy "Program\RunActivity.exe.config" "Program\RunActivityLAA.exe.config" || GOT
 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
-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
-)
 FOR %%F IN ("Program\*.exe", "Program\Orts.*.dll", "Program\Contrib.*.dll", "Program\Tests.dll") DO (
-	rcedit-x86.exe "%%~F" --set-product-version %VersionInfoVersion% --set-file-version %VersionInfoVersion% --set-version-string ProductVersion %VersionInfoVersion% --set-version-string FileVersion %VersionInfoVersion% || GOTO :error
+	rcedit-x86.exe "%%~F" --set-product-version %Revision% --set-version-string ProductVersion %Version% || GOTO :error
 )
-ECHO Set product and file version information to "%VersionInfoVersion%".
+ECHO Set product version information to "%Version%".
 
 REM *** Special build step: signs binaries ***
 IF NOT "%JENKINS_TOOLS%" == "" (
@@ -174,7 +155,7 @@ IF "%Mode%" == "Stable" (
 	IF %ERRORLEVEL% GEQ 8 GOTO :error
 	ROBOCOPY /MIR /NJH /NJS "Program\Documentation" "Open Rails\Documentation"
 	IF %ERRORLEVEL% GEQ 8 GOTO :error
-	>"Source\Installer\OpenRails shared\Version.iss" ECHO #define MyAppVersion "%Version%.%Revision%" || GOTO :error
+	>"Source\Installer\OpenRails shared\Version.iss" ECHO #define MyAppVersion "%Version%" || GOTO :error
 	iscc "Source\Installer\OpenRails from download\OpenRails from download.iss" || GOTO :error
 	iscc "Source\Installer\OpenRails from DVD\OpenRails from DVD.iss" || GOTO :error
 	CALL :move "Source\Installer\OpenRails from download\Output\OpenRailsTestingSetup.exe" "OpenRails-%Mode%-Setup.exe" || GOTO :error

GetVersion.cmd

@@ -1,24 +1,34 @@
 @ECHO OFF
 SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 
-REM Get product version and code revision.
-SET Version=
-SET Revision=
-FOR /F "usebackq tokens=1* delims=-" %%V IN (`git describe --first-parent --always --long`) DO (
-	SET Version=%%V
-	SET Revision=%%W
+SET Mode=%~1%
+FOR /F "usebackq tokens=1-2 delims=-" %%A IN (`git describe --long --exclude=*-*`) DO (
+	SET Git.Tag=%%A
+	SET Git.Commits=%%B
 )
-IF "%~1%" == "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 "%Version%" == "" (
-	>&2 ECHO WARNING: No Git repository found.
+FOR /F "usebackq tokens=1-4 delims=." %%A IN (`ECHO %Git.Tag%.0.0`) DO SET Revision=%%A.%%B.%%C.%Git.Commits%
+GOTO %Mode%
+
+
+:stable
+FOR /F "usebackq tokens=* delims=-" %%A IN (`git describe`) DO SET Version=%%A
+GOTO :done
+
+
+:testing
+FOR /F "usebackq tokens=* delims=-" %%A IN (`git describe --long --exclude=*-*`) DO SET Version=%Mode:~0,1%%%A
+GOTO :done
+
+
+:unstable
+SET TZ=UTC
+FOR /F "usebackq tokens=1-4 delims=." %%A IN (`git log -1 --pretty^=format:%%ad --date=format-local:%%Y.%%m.%%d.%%H%%M`) DO (
+	SET Version=%Mode:~0,1%%%A.%%B.%%C-%%D
+	SET Revision=0.%%A.%%B%%C.%%D
 )
+GOTO :done
+
 
-REM Output version numbers.
+:done
 ECHO OpenRails_Version=%Version%
 ECHO OpenRails_Revision=%Revision%

Source/Launcher/Launcher.csproj

@@ -62,8 +62,7 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>echo $Revision: 000 $&gt;Revision.txt
-date /t&gt;&gt;Revision.txt
-time /t&gt;&gt;Revision.txt</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>

Source/Menu/Menu.csproj

@@ -196,8 +196,7 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>echo $Revision: 000 $&gt;Revision.txt
-date /t&gt;&gt;Revision.txt
-time /t&gt;&gt;Revision.txt</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>

Source/RunActivity/RunActivity.csproj

@@ -320,9 +320,6 @@
     <Content Include="Readme.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Version.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj">
@@ -387,8 +384,7 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>echo $Revision: 000 $&gt;Revision.txt
-date /t&gt;&gt;Revision.txt
-time /t&gt;&gt;Revision.txt</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>