From 31bda0bdc7b971fbce477a1f69af73e077f082ba Mon Sep 17 00:00:00 2001 From: Slawek Mikula Date: Sun, 17 Jan 2021 10:30:02 +0100 Subject: [PATCH] - #2524 - added version generation (FGVersionGroup) and harness root path (FGHarnessPath) to build_release_windows.bat --- build_release_windows.bat | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build_release_windows.bat b/build_release_windows.bat index d6785d9..1045719 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -134,6 +134,12 @@ SET /P OSG_VERSION=<%TEMP%\osg-version.txt SET /P OSG_SO_NUMBER=<%TEMP%\osg-so-number.txt SET /P OT_SO_NUMBER=<%TEMP%\openthreads-so-number.txt +for /F "tokens=1,2,3 delims=." %%a in ("%FLIGHTGEAR_VERSION%") do ( + set FLIGHTGEAR_VERSION_MAJOR=%%a + set FLIGHTGEAR_VERSION_MINOR=%%b + set FLIGHTGEAR_VERSION_PATCH=%%c +) + IF %IS_NIGHTLY_BUILD% EQU 1 ( REM FlightGear nightly: with fgdata, output filename would be "FlightGear-x.x.x-nightly-full.exe" CALL :writeBaseConfig @@ -153,7 +159,9 @@ IF %IS_NIGHTLY_BUILD% EQU 1 ( GOTO End :writeBaseConfig +ECHO #define FGHarnessPath "x:" > InstallConfig.iss ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss +ECHO #define FGVersionGroup "%FLIGHTGEAR_VERSION_MAJOR%.%FLIGHTGEAR_VERSION_MINOR%" > InstallConfig.iss ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss ECHO #define OTSoNumber "%OT_SO_NUMBER%" >> InstallConfig.iss