FGData fixes from Erik

FIxes non-web build of the installer

FlightGear-files.iss

@@ -1,7 +1,6 @@
 [Files]
 ; 32 bits install
 Source: "{#InstallDir32}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
-Source: "{#InstallCompositor32}\bin\fgfs.exe"; DestDir: "{app}\bin"; DestName: "fgfs-compositor.exe"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
 
 Source: "{#ThirdPartyDir}\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
@@ -16,7 +15,6 @@ Source: "{#ThirdPartyDir}\3rdParty\bin\liblzma.dll"; DestDir: "{app}\bin"; Check
 
 ; 64 bits install
 Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
-Source: "{#InstallCompositor64}\bin\fgfs.exe"; DestDir: "{app}\bin"; DestName: "fgfs-compositor.exe"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
 
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
@@ -34,6 +32,19 @@ Source: "{#ThirdPartyDir}\3rdParty.x64\bin\liblzma.dll"; DestDir: "{app}\bin"; C
 Source: "{#FgHarnessPath}\fgdata\*.*"; DestDir: "{app}\data"; Excludes: "{#FGDataExcludes}"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 #endif
 
+; Web installer for the base package
+#if IncludeWeb == "TRUE"
+; txz
+Source: "{#DecompressDir}\\xz.exe"; Flags: dontcopy
+Source: "{#DecompressDir}\\liblzma.dll"; Flags: dontcopy
+; tar
+Source: "{#DecompressDir}\\tar.exe"; Flags: dontcopy
+Source: "{#DecompressDir}\\libiconv-2.dll"; Flags: dontcopy
+Source: "{#DecompressDir}\\libintl-2.dll"; Flags: dontcopy
+; full code
+Source: "{tmp}\\fgdata-extracted\\fgdata\\*.*"; DestDir: "{app}\data"; Flags: external recursesubdirs
+#endif
+
 ; 32 bits install
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode

FlightGear-i18n.iss

@@ -5,6 +5,7 @@ es.ConfirmUninstall=¿ Estás seguro de que quieres borrar completamente %1 {#FG
 nl.ConfirmUninstall=Weet u zeker dat u %1 {#FGVersion} en alle bijbehorende onderdelen wilt verwijderen?
 de.ConfirmUninstall=Bist Du sicher, dass Du %1 {#FGVersion} und alle Komponenten entfernen willst?
 fr.ConfirmUninstall=Etes-vous certain de vouloir totalement désinstaller %1 {#FGVersion} et tous ses composants ?
+ru.ConfirmUninstall=Вы уверены, что хотите полностьюу удалить %1 {#FGVersion} и все его компоненты?
 
 [CustomMessages]
 CreateDesktopIcon=Create a &desktop icon
@@ -13,6 +14,13 @@ RemoveAllSettings=Remove all settings, downloaded scenery and aircraft
 RemoveAllSettingsDescription=FlightGear stores some settings in your user folder. In addition, scenery or aircraft data may have been downloaded to the download directory. To completely remove all these files, select this option.
 FirewallFgException=Allows FlightGear to send and receive data over the multiplayer network and to get METARs.
 FirewallFgcomException=Allows FGCom to establish a connection to FlightGear and the VoIP server for voice ATC communication.
+ExtractingDownloadContentTitle=Extracting downloaded content
+ExtractingDownloadContentMessage=This step will perform extraction of the downloaded content
+ExtractingDownloadedFile=Extracting file
+UntarringDownloadedFile=Untarring file
+ErrorDownloadingFile=Error downloading file from the web repository. Error details: %s
+NotEnoughSpaceOnInstallationDisk=Not enough space on the destination disk. At least 6GB is needed.
+NotEnoughSpaceOnTemporaryDisk=Not enough space on the temporary folder disk. At least 6GB is needed.
 
 pl.CreateDesktopIcon=Utwórz ikony na pulpicie
 pl.CreateDesktopIconGroup=Dodatkowe ikony:
@@ -20,6 +28,13 @@ pl.RemoveAllSettings=Usuń wszystkie ustawienia, pobraną scenerię i samoloty
 pl.RemoveAllSettingsDescription=FlightGear zapisuje niektóre ustawienia w katalogach użytkownika. Dodatkowo, sceneria lub dane statków powietrznych mogą być pobierane do katalogu pobrań. Aby całkowicie usunąć te ustawienia, wybierz tą opcję.
 pl.FirewallFgException=Pozwala aplikacji FlightGear na wysyłanie i pobieranie danych przez sieć multiplayer oraz aby pobrać dane pogodowe METAR.
 pl.FirewallFgcomException=Pozwala aplikacji FGCom na ustanowienie połączenia do aplikacji FlightGear i do serwerów VoIP dla komunikacji głosowej z ATC (kontrolerem lotów).
+pl.ExtractingDownloadContentTitle=Rozpakowywanie pobranej dodatkowej treści
+pl.ExtractingDownloadContentMessage=Ten krok rozpakuje pobraną dodatkową treść 
+pl.ExtractingDownloadedFile=Rozpakowywanie pliku
+pl.UntarringDownloadedFile=Roztarowanie pliku
+pl.ErrorDownloadingFile=Błąd pobierania pliku z repozytorium web. Szczegóły błędu: %s
+pl.NotEnoughSpaceOnInstallationDisk=Brak miejsca na dysku docelowym. Przynajmniej 6GB jest wymagane.
+pl.NotEnoughSpaceOnTemporaryDisk=Brak miejsca na dysku z folderem tymczasowym. Przynajmniej 6GB jest wymagane.
 
 es.CreateDesktopIcon=Crear icono en el escritorio
 es.RemoveAllSettings=Borrar todos los ajustes, escenarios y aviones descargados
@@ -28,10 +43,18 @@ es.FirewallFgException=Permite a FlightGear mandar y recibir datos a la red mult
 es.FirewallFgcomException=Permite a FGCom establecer una conexión con FlightGear y el servidor VoIP para comunicaciones de voz con el ATC.
 
 nl.CreateDesktopIcon=Maak een snelkoppeling op het &bureaublad
+nl.CreateDesktopIconGroup=Overige snelkoppelingen:
 nl.RemoveAllSettings=Verwijder alle instellingen en gedownloade data
-nl.RemoveAllSettingsDescription=FlightGear bewaart een aantal instellingen in uw gebruikersmap. Mogelijk is er ook data in de downloadmap opgeslagen. Selecteer deze optie om die bestanden definitief te verwijderen.
+nl.RemoveAllSettingsDescription=FlightGear bewaart een aantal instellingen in de gebruikersmap. Mogelijk is er ook data in de downloadmap opgeslagen. Selecteer deze optie om die bestanden definitief te verwijderen.
 nl.FirewallFgException=Sta FlightGear toe om data te verzenden en ontvangen via het multiplayernetwerk en om live weergegevens te downloaden.
 nl.FirewallFgcomException=Sta FGCom toe om verbinding met FlightGear en de VoIP server te maken voor op stem gebaseerde ATC-communicatie.
+nl.ExtractingDownloadContentTitle=Gedownloade bestanden uitpakken
+nl.ExtractingDownloadContentMessage=In deze stap worden de gedownloade bestanden uitgepakt
+nl.ExtractingDownloadedFile=Bestand uitpakken
+nl.UntarringDownloadedFile=Bestand uitpakken
+nl.ErrorDownloadingFile=Fout bij het downloaden van een bestand. Foutinformatie: %s
+nl.NotEnoughSpaceOnInstallationDisk=Onvoldoende vrije ruimte op de gekozen schijf. FlightGear vereist tenminste 6GB.
+nl.NotEnoughSpaceOnTemporaryDisk=Onvoldoende vrije ruimte op de tijdelijke schijf. FlightGear vereist tenminste 6GB.
 
 de.CreateDesktopIcon=Ein Desktop-Icon anlegen
 de.RemoveAllSettings=Alle Einstellungen und heruntergeladene Daten löschen
@@ -43,4 +66,18 @@ fr.CreateDesktopIcon=Créer une icône sur le bureau
 fr.RemoveAllSettings=Supprimer tous les paramètres, scènes et aéronefs téléchargés
 fr.RemoveAllSettingsDescription=FlightGear enregistre certains paramètres dans votre répertoire utilisateur. En complément, les scènes et les aéronefs peuvent avoir été installés dans le dossier Téléchargements. Pour supprimer totalement ces fichiers, choisissez cette option.
 fr.FirewallFgException=Autorise FlightGear à émettre et recevoir des données multijoueurs sur le réseau et à recevoir les METARs.
-fr.FirewallFgcomException=Autorise FGCom à établir une connexion vers FlightGear et le serveur VoIP pour les communications de contrôle aérien.
+fr.FirewallFgcomException=Autorise FGCom à établir une connexion vers FlightGear et le serveur VoIP pour les communications de contrôle aérien.
+
+ru.CreateDesktopIcon=Создать икноку на &рабочий стол
+ru.CreateDesktopIconGroup=Дополнительные иконки:
+ru.RemoveAllSettings=Удалить все установки, загруженные сценарии и летательный аппарат
+ru.RemoveAllSettingsDescription=FlightGear сохраняет некоторые настройки в вашей пользовательской папке. Кроме того, в каталог загрузки могли быть загружены данные о сценарии или летательном аппарате. Чтобы полностью удалить все эти файлы, выберите эту опцию.
+ru.FirewallFgException=Разрешить FlightGear посылать и принимать данные через многопользовательское соединение и получать данные METAR.
+ru.FirewallFgcomException=Разрешить FGCom устанавливать соединение с FlightGear и сервером VoIP для голосовой коммуникации с УВД.
+ru.ExtractingDownloadContentTitle=Извлечение загруженного контента
+ru.ExtractingDownloadContentMessage=На этом шаге будет выполнено извлечение загруженного контента.
+ru.ExtractingDownloadedFile=Извлечение файла
+ru.UntarringDownloadedFile=Несвязанный файл
+ru.ErrorDownloadingFile=Ошибка загрузки файла из репозитория. Детальный отчёт: %s
+ru.NotEnoughSpaceOnInstallationDisk=Недостаточно дискового пространства в выбранном диске. Требуется, как минимум 6GB свободного пространства.
+ru.NotEnoughSpaceOnTemporaryDisk=Не хватает дискового пространства во временной папке. Требуется, как минимум 6GB свободного пространства.

FlightGear.iss

@@ -33,6 +33,7 @@
 ;  #define OTSoNumber "3"
 ;  #define FGDetails "-nightly"
 ;  #define IncludeData "FALSE"
+;  #define IncludeWeb "FALSE"
 ;
 ; Uninstall procedure with --uninstall flag:
 ;  executed by fgfs.exe (fg_init.cxx):
@@ -46,16 +47,15 @@
 #define FGSourcePath FgHarnessPath + "\flightgear"
 
 #define InstallDir32 FgHarnessPath + "\install\msvc140"
-#define InstallCompositor32 FgHarnessPath + "\install\msvc140\compositor"
 #define OSGInstallDir InstallDir32 + "\OpenSceneGraph"
 #define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion
 
 #define InstallDir64 FgHarnessPath + "\install\msvc140-64"
-#define InstallCompositor64 FgHarnessPath + "\install\msvc140-64\compositor"
 #define OSG64InstallDir InstallDir64 + "\OpenSceneGraph"
 #define OSG64PluginsDir OSG64InstallDir + "\bin\osgPlugins-" + OSGVersion
 
 #define ThirdPartyDir FgHarnessPath + "\windows-3rd-party\msvc140"
+#define DecompressDir FgHarnessPath + "\windows-3rd-party\decompress"
 
 ; we copy everything in install/<arch>/bin except these, which aren't
 ; useful to the end-user to ship
@@ -77,7 +77,8 @@ AppPublisherURL=http://www.flightgear.org
 AppSupportURL=http://www.flightgear.org
 AppUpdatesURL=http://www.flightgear.org
 DefaultDirName={pf}\FlightGear {#FGVersionGroup}
-UsePreviousAppDir=no
+DirExistsWarning=auto
+UsePreviousAppDir=yes
 DefaultGroupName=FlightGear {#FGVersionGroup}
 UsePreviousGroup=no
 LicenseFile={#FGSourcePath}\COPYING
@@ -103,9 +104,10 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "en"; MessagesFile: "compiler:Default.isl"; InfoBeforeFile: "{#FgHarnessPath}\windows\info-before-en.txt"
 Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"; InfoBeforeFile: "{#FgHarnessPath}\windows\info-before-pl.txt"
 Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl"; 
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; 
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoBeforeFile: "{#FgHarnessPath}\windows\info-before-nl.txt"
 Name: "de"; MessagesFile: "compiler:Languages\German.isl"; 
 Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; 
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"; InfoBeforeFile: "{#FgHarnessPath}\windows\info-before-ru.txt"
 
 [Dirs]
 ; Make the user installable scenery directory
@@ -116,8 +118,7 @@ Name: "{%USERPROFILE}\FlightGear\Custom Scenery"; Permissions: creatorowner-modi
 [Icons]
 Name: "{userdesktop}\FlightGear {#FGVersionGroup}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Tasks: desktopicon;
 Name: "{group}\FlightGear {#FGVersionGroup}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
-Name: "{group}\FlightGear {#FGVersionGroup} - Compositor"; Filename: "{app}\bin\fgfs-compositor.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
-Name: "{group}\FlightGear Manual"; Filename: "http://flightgear.sourceforge.net/manual/2020.3/"
+Name: "{group}\FlightGear Manual"; Filename: "http://flightgear.sourceforge.net/manual/{#FGVersionGroup}/"
 Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
 Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
 Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin"
@@ -142,6 +143,32 @@ const
   NET_FW_PROFILE2_PRIVATE = 2;
   NET_FW_PROFILE2_PUBLIC = 4;
 
+var
+  UninstallCheckCleanPage: TNewNotebookPage;
+  UninstallBackButton: TNewButton;
+  UninstallNextButton: TNewButton;
+  DoCleanCheckbox : TNewCheckBox;
+  CleanHelp : TNewStaticText;
+  DownloadPage: TDownloadWizardPage;
+  DownloadPageId: Integer;
+  ExtractDownload: TOutputProgressWizardPage;
+
+  ResultCode: Integer;
+
+function OnDownloadProgress(const Url, FileName: String; const Progress, ProgressMax: Int64): Boolean;
+begin
+  if Progress = ProgressMax then
+    Log(Format('Successfully downloaded file to {tmp}: %s', [FileName]));
+  Result := True;
+end;
+
+procedure InitializeWizard;
+begin
+  DownloadPage := CreateDownloadPage(SetupMessage(msgWizardPreparing), SetupMessage(msgPreparingDesc), @OnDownloadProgress);
+  DownloadPageId := DownloadPage.ID;
+  ExtractDownload := CreateOutputProgressPage(ExpandConstant('{cm:ExtractingDownloadContentTitle}'), ExpandConstant('{cm:ExtractingDownloadContentMessage}'));
+end;
+
 procedure URLLabelOnClick(Sender: TObject);
 var
   ErrorCode: Integer;
@@ -245,12 +272,137 @@ begin
   end;
 end;
 
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin;
+  if (PageID = DownloadPageId) then
+  begin
+    if (ExpandConstant('{#IncludeWeb}') = 'FALSE') then begin
+      Result := True;
+    end else begin
+      Result := False;
+    end
+  end
+  else
+  begin
+    Result := False;
+  end;  
+end;
+
+function NextButtonClick(CurPageID: Integer): Boolean;
 var
-  UninstallCheckCleanPage: TNewNotebookPage;
-  UninstallBackButton: TNewButton;
-  UninstallNextButton: TNewButton;
-  DoCleanCheckbox : TNewCheckBox;
-  CleanHelp : TNewStaticText;
+  fgDataInstalled: Cardinal;
+  diskFreeMB, diskTotalMB: Cardinal;
+begin
+  if CurPageID = wpSelectDir then begin
+    // check disk free space - installationFolder
+    if GetSpaceOnDisk(ExpandConstant('{app}'), True, diskFreeMB, diskTotalMB) then
+    begin
+      if diskFreeMB < 6000 then begin
+        MsgBox(ExpandConstant('{cm:NotEnoughSpaceOnInstallationDisk}'), mbError, MB_OK);
+        Result := False;
+      end
+      else begin
+        Result := True;
+      end;      
+    end;
+
+    // check disk free space - tempFolder
+    if GetSpaceOnDisk(ExpandConstant('{tmp}'), True, diskFreeMB, diskTotalMB) then
+    begin
+      if diskFreeMB < 6000 then begin
+        MsgBox(ExpandConstant('{cm:NotEnoughSpaceOnTemporaryDisk}'), mbError, MB_OK);
+        Result := False;
+      end
+      else begin
+        Result := True;
+      end;      
+    end;
+    
+    // if cannot determine disk size, defaults to move on
+    if diskFreeMB = 0 then begin
+      Result := True;
+    end;
+  end
+  else if CurPageID = wpReady then begin
+
+    if ShouldSkipPage(DownloadPageId) = false then begin
+      DownloadPage.Clear;
+      
+      fgDataInstalled := 0;
+
+      // checking registry entry, if fgdata was installed
+      if RegKeyExists(HKEY_LOCAL_MACHINE, ExpandConstant('Software\FlightGear\{#FGVersionGroup}')) then
+      begin
+        if RegQueryDWordValue(HKEY_LOCAL_MACHINE, ExpandConstant('Software\FlightGear\{#FGVersionGroup}'), 'fgdata-installed', fgDataInstalled) then
+        begin
+          Log('Previous fgdata installed. Downloading delta package');
+        end;
+      end;
+
+      // selecting fgdata installation packages
+      if (fgDataInstalled = 1) then
+      begin   
+        DownloadPage.Add('https://sourceforge.net/projects/flightgear/files/release-{#FGVersionGroup}/FlightGear-{#FGVersion}-update-data.txz/download', 'fgdata-downloaded.txz', '');
+      end
+      else
+      begin
+        DownloadPage.Add('https://sourceforge.net/projects/flightgear/files/release-{#FGVersionGroup}/FlightGear-{#FGVersion}-data.txz/download', 'fgdata-downloaded.txz', '');
+      end;
+
+      DownloadPage.Show;
+      try
+        try
+          DownloadPage.Download;
+          // show extract progress page
+          try
+            ExtractDownload.Show;
+            ExtractDownload.SetText(ExpandConstant('{cm:ExtractingDownloadedFile}'), 'fgdata-downloaded.txz');
+            ExtractTemporaryFile('xz.exe');
+            ExtractTemporaryFile('liblzma.dll');
+            if Exec(ExpandConstant('{tmp}\xz.exe'), ExpandConstant('-d "{tmp}\fgdata-downloaded.txz"'), ExpandConstant('{tmp}'), SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+            begin
+                Log(Format('Successfully expanded file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.txz')]));
+                ExtractDownload.SetText(ExpandConstant('{cm:UntarringDownloadedFile}'), ExpandConstant('fgdata-downloaded.tar'));
+                ExtractTemporaryFile('tar.exe');
+                ExtractTemporaryFile('libiconv-2.dll');
+                ExtractTemporaryFile('libintl-2.dll');
+                CreateDir(ExpandConstant('{tmp}\fgdata-extracted'));
+                if Exec(ExpandConstant('{tmp}\tar.exe'), ExpandConstant('-xf fgdata-downloaded.tar -C fgdata-extracted'), ExpandConstant('{tmp}'), SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+                begin
+                  Log(Format('Successfully untarred file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.tar')]));
+                end
+                else begin
+                  Log(Format('ERROR untarring file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.tar')]));
+                end;
+            end
+            else begin
+              Log(Format('ERROR expanding file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.txz')]));
+            end;
+          finally
+            ExtractDownload.Hide;
+          end;
+          Result := True;
+        except
+          // FIXME - available in IS 6.1.3-dev
+          //if DownloadPage.AbortedByUser then
+          //  Log('Aborted by user.')
+          //else
+          SuppressibleMsgBox(Format(ExpandConstant('{cm:ErrorDownloadingFile}'), [AddPeriod(GetExceptionMessage)]), mbCriticalError, MB_OK, IDOK);
+          Result := False;
+        end;
+      finally
+        DownloadPage.Hide;
+      end;
+    end
+    else
+    begin 
+      // skipping downloading
+      Result := True;
+    end;
+  end   
+  else
+    Result := True;
+end;
 
 procedure InitializeUninstallProgressForm();
 begin
@@ -307,6 +459,7 @@ var
 begin
   if CurStep = ssPostInstall then
     begin
+      // firewall rules
       GetWindowsVersionEx(Version);
       if (Version.Major >= 6) then
         begin
@@ -322,6 +475,9 @@ begin
           AddBasicFirewallException('FlightGear', ExpandConstant('{app}') + '\bin\fgfs.exe');
           AddBasicFirewallException('FlightGear FGCom', ExpandConstant('{app}') + '\bin\fgcom.exe');
         end;
+      
+      // registry entries
+      RegWriteDWordValue(HKEY_LOCAL_MACHINE, ExpandConstant('Software\FlightGear\{#FGVersionGroup}'), 'fgdata-installed', 1);
     end;
 end;
 
@@ -342,5 +498,8 @@ begin
     begin
       RemoveFirewallException('FlightGear', ExpandConstant('{app}') + '\bin\fgfs.exe');
       RemoveFirewallException('FlightGear FGCom', ExpandConstant('{app}') + '\bin\fgcom.exe');
+
+      // registry entries
+      RegDeleteValue(HKEY_LOCAL_MACHINE, ExpandConstant('Software\FlightGear\{#FGVersionGroup}'), 'fgdata-installed');
     end;
 end;

build_appimage.sh

@@ -54,14 +54,16 @@ patchelf --set-rpath \$ORIGIN/../ appdir/usr/lib/osgPlugins-3.4.2/*.so
 
 cp -r dist/share appdir/usr
 
-cp -a /usr/lib64/qt5/qml/QtQuick.2 appdir/usr/qml
-
 cp /usr/lib64/libsoftokn3.* appdir/usr/lib
 cp /usr/lib64/libnsspem.so appdir/usr/lib
 cp /usr/lib64/libfreebl* appdir/usr/lib
 cp -a /usr/lib64/liblzma* appdir/usr/lib
 cp /etc/pki/tls/certs/ca-bundle.crt appdir/usr/ssl/cacert.pem
 
+# HarfBuzz is in /lib64 on CentOS, but still copy it: see
+# https://sourceforge.net/p/flightgear/codetickets/2590/
+cp -a /lib64/libharfbuzz.so* appdir/usr/lib
+
 #modify the desktop file so that linuxdeployqt doesn't barf (version to 1.0, add semicolon to end of certain line types)
 sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/applications/org.flightgear.FlightGear.desktop
 
@@ -90,10 +92,12 @@ EOF
 chmod +x appdir/AppRun
 
 #grab continuous linuxdeployqt
-wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
-chmod +x linuxdeployqt-continuous-x86_64.AppImage
+wget -c https://github.com/probonopd/linuxdeployqt/releases/download/7/linuxdeployqt-7-x86_64.AppImage
+#wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+chmod +x linuxdeployqt-7-x86_64.AppImage
 
 #set VERSION for AppImage creation
 export VERSION=`cat flightgear/flightgear-version`
 
-./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/org.flightgear.FlightGear.desktop -appimage
+./linuxdeployqt-7-x86_64.AppImage appdir/usr/share/applications/org.flightgear.FlightGear.desktop -appimage -qmldir=flightgear/src/GUI/qml/
+

build_release_windows.bat

@@ -20,7 +20,6 @@ SET OSG64=%WORKSPACE%\install\msvc140-64\OpenSceneGraph
 REM 32bits
 md build-sg32
 md build-fg32
-md build-fg32-compositor
 
 cd build-sg32
 cmake ..\simgear -G "Visual Studio 14" ^
@@ -42,25 +41,11 @@ cmake ..\flightgear -G "Visual Studio 14" ^
                     -DENABLE_SWIFT:BOOL=ON ^
                     -DENABLE_COMPOSITOR:BOOL=OFF
 cmake --build . --config RelWithDebInfo --target INSTALL
-
-cd ..\build-fg32-compositor
-cmake ..\flightgear -G "Visual Studio 14" ^
-                    -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
-                    -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140/compositor ^
-                    -DCMAKE_PREFIX_PATH:PATH=%QT5SDK32%;%OSG32%;%WORKSPACE%/install/msvc140/ ^
-                    -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-                    -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-                    -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-                    -DENABLE_SWIFT:BOOL=ON ^
-                    -DENABLE_COMPOSITOR:BOOL=ON
-cmake --build . --config RelWithDebInfo --target INSTALL
-
 cd ..
 
 REM 64 bits
 md build-sg64
 md build-fg64
-md build-fg64-compositor
 
 cd build-sg64
 cmake ..\SimGear -G "Visual Studio 14 Win64" ^
@@ -82,26 +67,12 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
                     -DENABLE_SWIFT:BOOL=ON ^
                     -DENABLE_COMPOSITOR:BOOL=OFF
 cmake --build . --config RelWithDebInfo --target INSTALL
-
-cd ..\build-fg64-compositor
-cmake ..\flightgear -G "Visual Studio 14 Win64" ^
-                    -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
-                    -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-                    -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64/compositor ^
-                    -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64%;%WORKSPACE%/install/msvc140-64/ ^
-                    -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-                    -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-                    -DENABLE_SWIFT:BOOL=ON ^
-                    -DENABLE_COMPOSITOR:BOOL=ON
-cmake --build . --config RelWithDebInfo --target INSTALL
 cd ..
 
 REM Qt5 deployment
 SET QMLDIR=%WORKSPACE%/flightgear/src/GUI/qml
 %QT5SDK32%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140/bin/fgfs.exe
-%QT5SDK32%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140/compositor/bin/fgfs.exe
 %QT5SDK64%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140-64/bin/fgfs.exe
-%QT5SDK64%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140-64/compositor/bin/fgfs.exe
 
 REM build setup
 ECHO Packaging root is %WORKSPACE%
@@ -120,8 +91,6 @@ REM ensure SENTRY_AUTH_TOKEN is set in the environment
 
 sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg32\%FGFS_PDB%
 sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg64\%FGFS_PDB%
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg32-compositor\%FGFS_PDB%
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg64-compositor\%FGFS_PDB%
 
 REM indirect way to get command output into an environment variable
 set PATH=%OSG32%\bin;%PATH%
@@ -155,6 +124,11 @@ IF %IS_NIGHTLY_BUILD% EQU 1 (
   CALL :writeBaseConfig
   CALL :writeReleaseConfig
   iscc /Q FlightGear.iss
+
+  REM FlightGear release: with fgdata web installer, output filename would be "FlightGear-x.x.x-web.exe"
+  CALL :writeBaseConfig
+  CALL :writeReleaseWebConfig
+  iscc /Q FlightGear.iss
 )
 GOTO End
 
@@ -171,6 +145,14 @@ GOTO End
 CALL :writeBaseConfig
 ECHO #define FGDetails "" >> InstallConfig.iss
 ECHO #define IncludeData "TRUE" >> InstallConfig.iss
+ECHO #define IncludeWeb "FALSE" >> InstallConfig.iss
+GOTO End
+
+:writeReleaseWebConfig
+CALL :writeBaseConfig
+ECHO #define FGDetails "-web" >> InstallConfig.iss
+ECHO #define IncludeData "FALSE" >> InstallConfig.iss
+ECHO #define IncludeWeb "TRUE" >> InstallConfig.iss
 GOTO End
 
 :writeNightlyFullConfig

release_builder/create_base_package.sh

@@ -31,7 +31,7 @@ mkdir -p staging
 # wipe existing data TXZs
 rm output/FlightGear-$VERSION*data.txz
 
-rsync -az --exclude=".git" fgdata staging/
+rsync -az --exclude=".git" --exclude="Textures/Unused" --exclude="*.xcf" fgdata staging/
 
 # add all the scenery pack files into it
 
@@ -39,14 +39,13 @@ SCENERY_PACK_NAME=SceneryPack_${SCENERY_PACK_AIRPORT}.tgz
 
 # Should we re-download the SceneryPack periodically? Or just rely on doing a workspace wipe?
 if [ ! -f $SCENERY_PACK_NAME ]; then
-    echo "Downlaod scenery pack from ${SCENERY_PACK_URI}"
+    echo "Downloading scenery pack from ${SCENERY_PACK_URI}"
     # -L to follow the SF redirect
     curl -L $SCENERY_PACK_URI --output $SCENERY_PACK_NAME
 fi
 
-tar -xf $SCENERY_PACK_NAME --directory staging/fgdata
-pushd staging/fgdata
-mv SceneryPack.${SCENERY_PACK_AIRPORT} Scenery
+pushd staging/fgdata/Scenery
+tar -xf $WORKSPACE/$SCENERY_PACK_NAME --strip-components=1
 popd
 
 # Creating full base package TXZ 

version

@@ -1 +1 @@
-2020.3.7
+2020.3.12

windows/info-before-nl.txt

@@ -0,0 +1,23 @@
+FlightGear LTS
+==============
+
+Dit is de installatie voor de FlightGear versie met langdurige ondersteuning (LTS).
+Het bevat de meest stabiele en zorgvuldig geteste versie van FlightGear. Veel plezier!
+
+Op zoek naar de laatste ontwikkelingen?
+---------------------------------------
+
+Installeer hiervoor de onstabiele versie. Maar let op, deze bevat nieuwe, niet goed
+geteste code. Blijf de huidige LTS versie gebruiken voor de meest stabiele ervaring.
+
+
+Ik heb een fout gevonden!
+-------------------------
+
+Als er een fout, instabiliteit of prestatieprobleem optreedt:
+
+- kijk op de Tickets pagina op de SourceForge website van het project
+- vraag om hulp op het FlightGear forum (en vermeld daarbij dat om welke LTS versie het gaat)
+- kijk op de flightgear-devel mailinglijst
+
+De ontwikkelaars zijn misschien al bezig met het oplossen van het probleem!

windows/info-before-ru.txt

@@ -0,0 +1,22 @@
+FlightGear LTS
+==============
+
+Содержит стабильный исходный код из репозитория (ветвь 'release').
+Установщик FlightGear с версией долгосрочной поддержки (LTS). Содержит проверенный и наиболее стабильный исходный код. Приятного использования!
+
+Новые функции ?
+-----------------
+
+Обратите внимание на установщик FlightGear нестабильной версии, будьте осторожны, в нём может содержаться непроверенный код. Если вам требуется основательный и стабильный лётный опыт, придерживайтесь версии FlightGear LTS.
+
+
+Я нашел ошибку !
+--------------------
+
+Если найдена серьезная ошибка, нестабильность, падение производительности:
+
+- Посетите страницу FlightGear Tickets (На странице проекта в SourceForge)
+- Спросите на форуме FlightGear (укажите, что вы используете  версиюю LTS)
+- Изучите страницу запросов разработки flightgear-devel
+
+Есть вероятность, что разработчики работают над ее решением прямо сейчас! !