fly/fgmeta
1
0
Fork 0
Code Activity

Windows release build: try to simplify this spaghetti code

Browse source
This commit is contained in:
otto 2015-03-13 14:51:49 +01:00
parent d4b6eae8ee
commit f16cdc0c80
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
build_release_windows.bat
View file

@ -91,47 +91,50 @@ REM 1) FlightGear release: with fgdata, output filename would be "FlightGear-x.x
REM 2) FlightGear nightly: with fgdata, output filename would be "FlightGear-x.x.x-nightly-full.exe" REM 2) FlightGear nightly: with fgdata, output filename would be "FlightGear-x.x.x-nightly-full.exe"
REM 3) FlightGear nightly: without fgdata, output filename would be "FlightGear-x.x.x-nightly.exe" REM 3) FlightGear nightly: without fgdata, output filename would be "FlightGear-x.x.x-nightly.exe"
IF "%IS_NIGHTLY_BUILD%" EQU 1 (
REM Case 2)
CALL :writeBaseConfig
CALL :writeNightlyFullConfig
iscc FlightGear.iss
REM for case 1) REM Case 3)
SET "FG_DETAILS=" CALL :writeBaseConfig
CALL :writeNightlyDietConfig
iscc FlightGear.iss
ECHO "%IS_NIGHTLY_BUILD%" GOTO End
)ELSE(
REM Case 1)
CALL :writeBaseConfig
CALL :writeReleaseConfig
iscc FlightGear.iss
IF "%IS_NIGHTLY_BUILD%"=="TRUE" ( GOTO End
REM only for case 2)
SET "FG_DETAILS=-nightly-full"
) )
ECHO "%FG_DETAILS%" :writeBaseConfig
ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss
ECHO #define FGDetails "%FG_DETAILS%" >> 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
GOTO End
:writeReleaseConfig
CALL :writeBaseConfig
ECHO #define FGDetails "" >> InstallConfig.iss
ECHO #define IncludeData "TRUE" >> InstallConfig.iss ECHO #define IncludeData "TRUE" >> InstallConfig.iss
ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss GOTO End
ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss
ECHO #define OTSoNumber "%OT_SO_NUMBER%" >> InstallConfig.iss
REM run Inno-setup for case 1) and 2) :writeNightlyFullConfig
REM use iscc instead of compil32 for better error reporting CALL :writeBaseConfig
iscc FlightGear.iss ECHO #define FGDetails "-nightly-full" >> InstallConfig.iss
ECHO #define IncludeData "TRUE" >> InstallConfig.iss
GOTO End
:writeNightlyDietConfig
REM only for case 3) CALL :writeBaseConfig
IF "%IS_NIGHTLY_BUILD%"!="TRUE" ( ECHO #define FGDetails "-nightly" >> InstallConfig.iss
GOTO end
)
SET "FG_DETAILS=-nightly"
ECHO "%FG_DETAILS%"
ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss
ECHO #define FGDetails "%FG_DETAILS%" >> InstallConfig.iss
ECHO #define IncludeData "FALSE" >> InstallConfig.iss ECHO #define IncludeData "FALSE" >> InstallConfig.iss
ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss GOTO End
ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss
ECHO #define OTSoNumber "%OT_SO_NUMBER%" >> InstallConfig.iss
iscc FlightGear.iss
:end
:End