Merge branch 'next' of gitorious.org:fg/flightgear into next

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

diff --git a/package/Win32-Inno/FlightGear.iss b/package/Win32-Inno/FlightGear.iss
index c0222e861aa6e01a9020fa86b54af02f76c7d909..3b65deff740f810223e6b8174b1d6057ea3256bb 100644 (file)
--- a/package/Win32-Inno/FlightGear.iss
+++ b/package/Win32-Inno/FlightGear.iss
@@ -22,17 +22,17 @@
 AppId=FlightGear
 AppName=FlightGear
 AppPublisher=The FlightGear Team
-OutputBaseFilename=fgsetup-2.0.0-RC3
-AppVerName=FlightGear v2.0.0-RC3
+OutputBaseFilename=fgsetup-2.0.0
+AppVerName=FlightGear v2.0.0
 AppPublisherURL=http://www.flightgear.org
 AppSupportURL=http://www.flightgear.org
 AppUpdatesURL=http://www.flightgear.org
 DefaultDirName={pf}\FlightGear
-DefaultGroupName=FlightGear v2.0.0-RC3
+DefaultGroupName=FlightGear v2.0.0
 LicenseFile=X:\data\COPYING
 Uninstallable=yes
 SetupIconFile=x:\flightgear.ico
-VersionInfoVersion=1.9.9.993
+VersionInfoVersion=2.0.0.0
 WizardImageFile=X:\setupimg.bmp
 WizardImageStretch=No
 WizardSmallImageFile=X:\setupsmall.bmp
@@ -64,7 +64,7 @@ Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; Work
 Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf"
 Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html"
 Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
-Name: "{userdesktop}\FlightGear v2.0.0-RC3"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
+Name: "{userdesktop}\FlightGear v2.0.0"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
 
 Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}";
 Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}";
@@ -94,6 +94,9 @@ filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Paramete
 Filename: "{app}\bin\OpenAL\oalinst.exe"; WorkingDir: "{app}"; Description: "Installing OpenAL"; Tasks: insoal
 ;Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Description: "Launch FlightGear"; Flags: postinstall skipifsilent
 
+[Registry]
+Root: HKLM; Subkey: "Software\flightgear.org"; ValueType: string; ValueName: "TerrasyncDir"; ValueData: "{code:TerrasyncDir}"
+
 [Code]
 var
   TerrasyncDirPage: TInputDirWizardPage;
@@ -126,7 +129,7 @@ begin
   TerrasyncDirPage := CreateInputDirPage(wpSelectDir,
     'Select Terrasync Directory', 'Where should scenery downloaded by Terrasync be put?',
     'Select the folder in which Terrasync would download additional scenery, then click Next.',
-    False, 'New Folder');
+    False, 'Terrasync Folder');
   TerrasyncDirPage.Add('');
 
   CreateURLLabel(WizardForm, WizardForm.CancelButton);
@@ -135,7 +138,7 @@ end;
 function NextButtonClick(CurPageID: Integer): Boolean;
 begin
   if CurPageID = wpSelectDir then begin
-    TerrasyncDirPage.Values[0] := GetPreviousData( 'TerrasyncDir', ExpandConstant('{app}\terrasync') );
+    TerrasyncDirPage.Values[0] := GetPreviousData( 'TerrasyncDir', ExpandConstant('{reg:HKLM\Software\flightgear.org,TerrasyncDir|{app}\terrasync}') );
   end;
   Result := True;
 end;
@@ -151,3 +154,17 @@ begin
   SetPreviousData(PreviousDataKey, 'TerrasyncDir', TerrasyncDirPage.Values[0]);
 end;
 
+function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
+var
+  S: String;
+begin
+  S := '';
+  S := S + MemoDirInfo + NewLine + NewLine;
+  S := S + 'Terrasync folder:' + NewLine;
+  S := S + Space + TerrasyncDirPage.Values[0] + NewLine + NewLine;
+  S := S + MemoGroupInfo + NewLine + NewLine;
+  S := S + MemoTasksInfo + NewLine + NewLine;
+
+  Result := S;
+end;
+