add propmerge utility, which merges <PropertyList> XML files. Writes

[flightgear.git] / package / Win32-Inno / FlightGear-0.9.3.iss

diff --git a/package/Win32-Inno/FlightGear-0.9.3.iss b/package/Win32-Inno/FlightGear-0.9.3.iss
index e726e260747f353ad4c06094bd4e1be9f056fbe9..8a72d7221c177cedf58681ac82d2c85170c82f57 100755 (executable)
--- a/package/Win32-Inno/FlightGear-0.9.3.iss
+++ b/package/Win32-Inno/FlightGear-0.9.3.iss
@@ -19,13 +19,13 @@
 
 [Setup]
 AppName=FlightGear
-AppVerName=FlightGear 0.9.3
+AppVerName=FlightGear v0.9.3
 AppPublisher=The FlightGear Organization
 AppPublisherURL=http://www.flightgear.org
 AppSupportURL=http://www.flightgear.org
 AppUpdatesURL=http://www.flightgear.org
 DefaultDirName={pf}\FlightGear-0.9.3
-DefaultGroupName=FlightGear-0.9.3
+DefaultGroupName=FlightGear v0.9.3
 LicenseFile=X:\data\COPYING
 Uninstallable=yes
 
@@ -34,27 +34,40 @@ Uninstallable=yes
 Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
 
 [Files]
+; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at)
 Source: "X:\*.*"; DestDir: "{app}"; Flags: ignoreversion
 Source: "X:\bin\*.*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs
 Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs
 Source: "X:\docs\*.*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs
-Source: "X:\bin\Win32\fgrun.prefs"; DestDir: "{userappdata}\flightgear.org"; Flags: ignoreversion
+; Source: "X:\bin\Win32\fgrun.prefs"; DestDir: "{userappdata}\flightgear.org"; Flags: ignoreversion
+; Source: "X:\bin\Win32\fgadmin.prefs"; DestDir: "{userappdata}\flightgear.org"; Flags: ignoreversion
 ; Source: "X:\src\*.*"; DestDir: "{app}\src"; Flags: ignoreversion recursesubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\FlightGear"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}";
-Name: "{group}\Fgrun FlightGear"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}";
+Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}";
+; Name: "{group}\FlightGear"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}";
+Name: "{group}\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}";
 Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\docs\index.html"
 Name: "{group}\Explore Documentation Folder"; Filename: "{app}\docs"
-Name: "{group}\Uninstall FlightGear-0.9.3"; Filename: "{uninstallexe}"
-Name: "{userdesktop}\FlightGear-0.9.3"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
+Name: "{group}\Uninstall FlightGear v0.9.3"; Filename: "{uninstallexe}"
+Name: "{userdesktop}\FlightGear v0.9.3"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
 ; For running flightgear directly
-; Name: "{userdesktop}\FlightGear-0.9.3"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}"; Tasks: desktopicon
+; Name: "{userdesktop}\FlightGear v0.9.3"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}"; Tasks: desktopicon
 
 [Run]
-; Put installation directory in the fgrun.prefs
-filename: "{app}\bin\win32\mkfgrunp.bat"; WorkingDir: "{app}\bin\win32"; Parameters: """{app}"" ""{userappdata}"""
+; Put installation directory into the fgrun.prefs
+; filename: "{app}\bin\Win32\mkfgrunp.bat"; WorkingDir: "{app}\bin\Win32"; Parameters: """{app}"" ""{userappdata}"""
+filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery"""
+
+; Put installation and source directories into the fgadmin.prefs
+; filename: "{app}\bin\Win32\mkfgadminp.bat"; WorkingDir: "{app}\bin\Win32"; Parameters: """{src}"" ""{app}"" ""{userappdata}"""
+filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--install-source={src}\."" ""--scenery-dest={app}\scenery"""
+; filename: "{app}\bin\Win32\testbatch.bat"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--install-source={src}"" ""--scenery-dest={app}\scenery"""
+
+; Make the user installable scenery directory
+filename: "{app}\bin\Win32\mkscenerydir.bat"; WorkingDir: "{app}"
+
 ; NOTE: The following entry contains an English phrase ("Launch"). You are free to translate it into another language if required.
 Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Description: "Launch FlightGear"; Flags: postinstall skipifsilent
 ; For running flightgear directly