From aed93a226761b985008132f66af73eac261db26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Mon, 9 Mar 2015 22:38:42 +0100 Subject: [PATCH] Windows: add shortcut for the new Qt launcher + implement diet & full nightlies --- FlightGear.iss | 21 ++++++++++---------- build_release_windows.bat | 42 ++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/FlightGear.iss b/FlightGear.iss index 136b09c..01ce747 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -37,7 +37,7 @@ AppId=FlightGear AppName=FlightGear AppPublisher=The FlightGear Team -OutputBaseFilename=fgsetup-{#FGVersion} +OutputBaseFilename=FlightGear-{#FGVersion}{#FGDetails} AppVerName=FlightGear v{#FGVersion} AppPublisherURL=http://www.flightgear.org AppSupportURL=http://www.flightgear.org @@ -118,10 +118,10 @@ Source: "{#VCInstallDir}\redist\x64\Microsoft.VC100.CRT\*.dll"; DestDir: "{app}\ Source: "X:\install\msvc100\FlightGear\bin\fgpanel.exe"; DestDir: "{app}\bin"; Flags: ignoreversion Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin"; Flags: ignoreversion skipifsourcedoesntexist -; NOTE: tar.gz file uses name 'fgdata', to avoid renaming it, look for both names. -; assuming no setup has both names and hence we don't package twice :) -Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist -Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist +; Include the base package +#if IncludeData == "TRUE" +Source: "X:\fgdata\*.*"; DestDir: "{app}\fgdata"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist +#endif ; 32 bits install Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode @@ -208,14 +208,15 @@ Name: "{userdocs}\FlightGear\Custom Scenery"; Permissions: everyone-modify; Chec [Icons] Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\fgrun.exe"; WorkingDir: "{app}"; -Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf" -Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html" +Name: "{group}\FlightGear Launcher (new)"; Filename: "{app}\bin\fgfs.exe --launcher"; WorkingDir: "{app}"; +Name: "{group}\FlightGear Manual"; Filename: "{app}\fgdata\Docs\getstart.pdf" +Name: "{group}\FlightGear Documentation"; Filename: "{app}\fgdata\Docs\index.html" Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org" Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\fgadmin.exe"; WorkingDir: "{app}" Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\terrasync.exe"; Parameters: "-S -p 5505 -d ""{userdocs}\FlightGear\TerraSync"""; WorkingDir: "{app}" Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}" Name: "{group}\Tools\js_demo"; Filename: "{app}\bin\js_demo.exe" -Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin" +Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\fgdata"""; WorkingDir: "{app}\bin" Name: "{group}\Tools\GPSsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\GPSsmooth.exe"" -h"; WorkingDir: "{app}\bin" Name: "{group}\Tools\UGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\UGsmooth.exe"" -h"; WorkingDir: "{app}\bin" Name: "{group}\Tools\MIDGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\MIDGsmooth.exe"" -h"; WorkingDir: "{app}\bin" @@ -224,7 +225,7 @@ Name: "{group}\Tools\yasim"; Filename: "cmd"; Parameters: "/k ""{app}\bin\yasim. Name: "{group}\Tools\fgpanel"; Filename: "cmd"; Parameters: "/k ""{app}\bin\fgpanel.exe"" -h"; WorkingDir: "{app}\bin" Name: "{group}\Tools\FGCom"; Filename: "{app}\bin\fgcom.exe"; WorkingDir: "{app}\bin" Name: "{group}\Tools\FGCom-testing"; Filename: "{app}\bin\fgcom.exe"; Parameters: "--frequency=910"; WorkingDir: "{app}\bin" -Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs" +Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\fgdata\Docs" [Run] filename: "cmd.exe"; WorkingDir: "{app}\bin"; Parameters: "/C del msvc*.dll"; Check: FileExists(ExpandConstant('{app}\bin\vcredist_x86.exe')) @@ -233,7 +234,7 @@ filename: "{app}\bin\vcredist_x86.exe"; WorkingDir: "{app}\bin"; Parameters: "/p filename: "{app}\bin\vcredist_x64.exe"; WorkingDir: "{app}\bin"; Parameters: "/passive /norestart"; Description: "Installing MS Visual C++ runtime components"; Check: Is64BitInstallMode and FileExists(ExpandConstant('{app}\bin\vcredist_x64.exe')) filename: "{app}\bin\oalinst.exe"; WorkingDir: "{app}\bin"; Description: "Installing OpenAL"; Check: IsTaskSelected('insoal') and FileExists(ExpandConstant('{app}\bin\oalinst.exe')) ; Put installation directory into the fgrun.prefs -filename: "{app}\bin\fgrun.exe"; WorkingDir: "{app}\bin"; Parameters: "--silent ""--fg-exe={app}\bin\fgfs.exe"" ""--fg-root={app}\data"" ""--fg-scenery={userdocs}\FlightGear\Custom Scenery;{app}\data\Scenery;{userdocs}\FlightGear\TerraSync"" ""--fg-aircraft={userdocs}\FlightGear\Aircraft"" ""--terrasync-dir={userdocs}\FlightGear\TerraSync"" --version={#FGVersion}" +filename: "{app}\bin\fgrun.exe"; WorkingDir: "{app}\bin"; Parameters: "--silent ""--fg-exe={app}\bin\fgfs.exe"" ""--fg-root={app}\fgdata"" ""--fg-scenery={userdocs}\FlightGear\Custom Scenery;{app}\fgdata\Scenery;{userdocs}\FlightGear\TerraSync"" ""--fg-aircraft={userdocs}\FlightGear\Aircraft"" ""--terrasync-dir={userdocs}\FlightGear\TerraSync"" --version={#FGVersion}" ; Put installation and source directories into the fgadmin.prefs filename: "{app}\bin\fgadmin.exe"; WorkingDir: "{app}\bin"; Parameters: "--silent ""--install-source={src}\..\Scenery"" ""--scenery-dest={userdocs}\FlightGear\Custom Scenery""" diff --git a/build_release_windows.bat b/build_release_windows.bat index 0c41288..e964cfe 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -1,12 +1,7 @@ - +@ECHO off IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0 -REM SET /P SIMGEAR_VERSION=<%WORKSPACE%\simgear\version -REM ECHO #define SIMGEAR_VERSION "%SIMGEAR_VERSION%" > %WORKSPACE%\simgear\simgear\version.h - - - REM 32bits md build-sg32 md build-fg32 @@ -60,11 +55,44 @@ 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 + +REM we have to handle a set of case: +REM 1) FlightGear release: with fgdata, output filename would be "FlightGear-x.x.x.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 for case 1) +SET "FG_DETAILS=" + +IF "IS_NIGHTLY_BUILD"=="TRUE" ( + REM only for case 2) + SET "FG_DETAILS=-nightly-full" +) + ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss +ECHO #define FGDetails "%FG_DETAILS%" >> InstallConfig.iss +ECHO #define IncludeData "TRUE" >> 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 -REM run Inno-setup! +REM run Inno-setup for case 1) and 2) REM use iscc instead of compil32 for better error reporting iscc FlightGear.iss + + +REM only for case 3) +IF "IS_NIGHTLY_BUILD"=="TRUE" ( + SET "DETAILS=-nightly" + + ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss + ECHO #define FGDetails "%FG_DETAILS%" >> InstallConfig.iss + ECHO #define IncludeData "FALSE" >> 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 + + iscc FlightGear.iss +) +