New version: 2018.3.3

Update for 2018.3.2
Remove -j option to Cmake --build
2019-07-28 22:45:07 +02:00 · 2019-01-06 16:16:10 +00:00 · 2018-11-26 13:54:12 +00:00 · 2018-10-23 12:10:01 +01:00 · 2018-10-05 13:14:27 +01:00 · 2018-09-21 17:22:27 +02:00
68 changed files with 1070 additions and 3754 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 dist
 .DS_Store
-install*/
+install
 3rdParty
 3rdParty.x64
 boost_1_44_0
@@ -22,6 +22,3 @@ CMakeCache.txt
 *.pyc
 build-*
 testOutput*
-md5sum.xml
-staging
-
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = ../simgear
-	branch = release/2020.3
+	branch = release/2018.3
 [submodule "flightgear"]
 	path = flightgear
 	url = ../flightgear
-	branch = release/2020.3
+	branch = release/2018.3
 [submodule "fgrun"]
 	path = fgrun
 	url = ../fgrun
@@ -13,12 +13,12 @@
 [submodule "fgdata"]
 	path = fgdata
 	url = ../fgdata
-	branch = release/2020.3
+	branch = release/2018.3
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = ../windows-3rd-party
-	branch = release/2020.3
+	branch = master
 [submodule "getstart"]
 	path = getstart
 	url = ../getstart
-	branch = release/2020.3
+	branch = release/2018.3
--- a/FlightGear-files.iss
+++ b/FlightGear-files.iss
@@ -1,85 +0,0 @@
-[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
-Source: "{#ThirdPartyDir}\3rdParty\bin\libpng.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\sentry.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\crashpad_handler.exe"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\dbus-1-3.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\event_core.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty\bin\liblzma.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-
-; 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
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libpng.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\sentry.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\crashpad_handler.exe"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\dbus-1-3.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\event_core.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#ThirdPartyDir}\3rdParty.x64\bin\liblzma.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-
-; Include the base package
-#if IncludeData == "TRUE"
-Source: "{#FgHarnessPath}\fgdata\*.*"; DestDir: "{app}\data"; Excludes: "{#FGDataExcludes}"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
-#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
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-Source: "{#OSGInstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
-
-Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_tiff.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
-
-; 64 bits install
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-Source: "{#OSG64InstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
-
-Source: "{#OSG64PluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_tiff.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
-Source: "{#OSG64PluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
--- a/FlightGear-i18n.iss
+++ b/FlightGear-i18n.iss
@@ -1,46 +0,0 @@
-[Messages]
-ConfirmUninstall=Are you sure you want to completely remove %1 {#FGVersion} and all of its components?
-pl.ConfirmUninstall=Czy na pewno chcesz całkowicie usunąć %1 {#FGVersion} i wszystkie jego komponenty?
-es.ConfirmUninstall=¿ Estás seguro de que quieres borrar completamente %1 {#FGVersion} y todos sus componentes ?
-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 ?
-
-[CustomMessages]
-CreateDesktopIcon=Create a &desktop icon
-CreateDesktopIconGroup=Additional icons:
-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.
-
-pl.CreateDesktopIcon=Utwórz ikony na pulpicie
-pl.CreateDesktopIconGroup=Dodatkowe ikony:
-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).
-
-es.CreateDesktopIcon=Crear icono en el escritorio
-es.RemoveAllSettings=Borrar todos los ajustes, escenarios y aviones descargados
-es.RemoveAllSettingsDescription=FlightGear almacena algunos ajustes en tu carpeta de usuario. Adicionalmente, los datos de escenarios y aviones pueden haber sido descargados en el directorio de descargas. Para borrar completamente todos esos archivos, selecciona esta opción.
-es.FirewallFgException=Permite a FlightGear mandar y recibir datos a la red multijugador y obtener METAR.
-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.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.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.
-
-de.CreateDesktopIcon=Ein Desktop-Icon anlegen
-de.RemoveAllSettings=Alle Einstellungen und heruntergeladene Daten löschen
-de.RemoveAllSettingsDescription=FlightGear speichert seine Einstellungen in deinem User-Verzeichnis. Zusätzlich heruntergeladene Flugzeuge und Szenerie-Daten können sich im Download-Verzeichnis befinden. Wähle diese Option, um alle Daten zu löschen.
-de.FirewallFgException=Erlaubt FlightGear die Verbindung zum Multiplayer-Netzwerk und den Download von METAR-Daten.
-de.FirewallFgcomException=Erlaubt FGCom die Verbindung zu FlightGear- und VoIP-Servern für den ATC-Sprechfunk.
-
-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.
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -1,4 +1,4 @@
-; Script generated by the Inno Setup Script Wizard.
+; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 ;
 ; This script creates an installable FlightGear package for Win32 using the
@@ -7,9 +7,7 @@
 ;
 ;     http://www.jrsoftware.org/isinfo.php
 ;
-; Note: Files root path is defined in the FgHarnessPath (in InstallConfig.iss)
-;
-; For example if You want to use X: drive as a root path 
+; Note: the files must appear in the X: drive.
 ; You can do this with the command below:
 ;
 ;     subst X: path_to_files
@@ -19,74 +17,44 @@
 ;     C:\> subst X: F:\Path\to\FlightGear\root
 ;     C:\> subst X: F:\
 ;
-; TRANSLATION NOTE:
-;  - external i18n files HAVE to be UTF-8 with BOM encoded. Otherwise the installer can
-;    not detect correct file encoding
-;
-; InstallConfig.iss example content:
-;
-;  #define FGHarnessPath "x:"
-;  #define FGVersion "2020.4.1"
-;  #define FGVersionGroup "2020.4"
-;  #define OSGVersion "3.0.0"
-;  #define OSGSoNumber "2"
-;  #define OTSoNumber "3"
-;  #define FGDetails "-nightly"
-;  #define IncludeData "FALSE"
-;
-; Uninstall procedure with --uninstall flag:
-;  executed by fgfs.exe (fg_init.cxx):
-;  - removes all under the FG_HOME directory
-;  - removes all from Download dir/Terrasync
-;  - removes all from Download dir/Aircraft

 #include "InstallConfig.iss"
-#include "FlightGear-i18n.iss"
-                               
-#define FGSourcePath FgHarnessPath + "\flightgear"

-#define InstallDir32 FgHarnessPath + "\install\msvc140"
-#define InstallCompositor32 FgHarnessPath + "\install\msvc140\compositor"
+#define InstallDir32 "X:\install\msvc140"
 #define OSGInstallDir InstallDir32 + "\OpenSceneGraph"
 #define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion

-#define InstallDir64 FgHarnessPath + "\install\msvc140-64"
-#define InstallCompositor64 FgHarnessPath + "\install\msvc140-64\compositor"
+#define InstallDir64 "X:\install\msvc140-64"
 #define OSG64InstallDir InstallDir64 + "\OpenSceneGraph"
 #define OSG64PluginsDir OSG64InstallDir + "\bin\osgPlugins-" + OSGVersion

-#define ThirdPartyDir FgHarnessPath + "\windows-3rd-party\msvc140"
+#define ThirdPartyDir "X:\windows-3rd-party\msvc140"

 ; we copy everything in install/<arch>/bin except these, which aren't
 ; useful to the end-user to ship
-#define ExcludedBinaries "*smooth.exe,metar.exe"
-
-; Exclude XCF files from FGData to keep the size down
-#define FGDataExcludes "*.xcf,*.xcf.gz"
-
-#include "FlightGear-files.iss"
+#define ExcludedBinaries "*smooth.exe,metar.exe,js_demo.exe"

 [Setup]
-AppId=FlightGear_{#FGVersionGroup}
+AppId=FlightGear
 AppName=FlightGear
 AppPublisher=The FlightGear Team
 OutputBaseFilename=FlightGear-{#FGVersion}{#FGDetails}
 AppVerName=FlightGear v{#FGVersion}
-AppVersion={#FGVersion}
 AppPublisherURL=http://www.flightgear.org
 AppSupportURL=http://www.flightgear.org
 AppUpdatesURL=http://www.flightgear.org
-DefaultDirName={pf}\FlightGear {#FGVersionGroup}
+DefaultDirName={pf}\FlightGear {#FGVersion}
 UsePreviousAppDir=no
-DefaultGroupName=FlightGear {#FGVersionGroup}
+DefaultGroupName=FlightGear {#FGVersion}
 UsePreviousGroup=no
-LicenseFile={#FGSourcePath}\COPYING
+LicenseFile=X:\flightgear\COPYING
 Uninstallable=yes
-SetupIconFile={#FgHarnessPath}\windows\flightgear.ico
+SetupIconFile=X:\flightgear\package\flightgear.ico
 VersionInfoVersion={#FGVersion}.0
-WizardImageFile={#FgHarnessPath}\windows\setupimg.bmp
+InfoBeforeFile=X:\flightgear\package\windows\infobefore.txt
+WizardImageFile=X:\flightgear\package\windows\setupimg.bmp
 WizardImageStretch=No
-WizardSmallImageFile={#FgHarnessPath}\windows\setupsmall.bmp
+WizardSmallImageFile=X:\flightgear\package\windows\setupsmall.bmp
 VersionInfoCompany=The FlightGear Team
 UninstallDisplayIcon={app}\bin\fgfs.exe
 ArchitecturesInstallIn64BitMode=x64
@@ -97,27 +65,133 @@ ArchitecturesAllowed=x86 x64
 ; SignTool=fg_code_sign1

 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:CreateDesktopIconGroup}"
+; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required.
+Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"

-[Languages]
-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: "de"; MessagesFile: "compiler:Languages\German.isl"; 
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; 
+[Files]
+; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at)
+;Source: "X:\*.txt"; DestDir: "{app}"; Flags: ignoreversion
+; 32 bits install
+
+Source: "{#InstallDir32}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode
+;locale only exists for fgrun - which has been disabled
+;Source: "{#InstallDir32}\share\locale\*"; DestDir: "{app}\bin\locale"; 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
+Source: "{#ThirdPartyDir}\3rdParty\bin\libpng.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty\bin\CrashRpt1403.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty\bin\CrashSender1403.exe"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+
+; 64 bits install
+Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
+;locale only exists for fgrun - which has been disabled
+;Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; 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
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libpng.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\CrashRpt1403.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#ThirdPartyDir}\3rdParty.x64\bin\CrashSender1403.exe"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+
+; Include the base package
+#if IncludeData == "TRUE"
+Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
+#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
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#OSGInstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+
+Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_tiff.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+;Source: "{#OSGPluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode
+
+; 64 bits install
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#OSG64InstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+
+Source: "{#OSG64PluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_tiff.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+Source: "{#OSG64PluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode
+;Source: "{#OSG64PluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode

 [Dirs]
 ; Make the user installable scenery directory
-Name: "{%USERPROFILE}\FlightGear\Downloads"; Permissions: creatorowner-modify; Check: not DirExists(ExpandConstant('{%USERPROFILE}\FlightGear\Downloads'))
-Name: "{%USERPROFILE}\FlightGear\Custom Aircraft"; Permissions: creatorowner-modify; Check: not DirExists(ExpandConstant('{%USERPROFILE}\FlightGear\Custom Aircraft'))
-Name: "{%USERPROFILE}\FlightGear\Custom Scenery"; Permissions: creatorowner-modify; Check: not DirExists(ExpandConstant('{%USERPROFILE}\FlightGear\Custom Scenery'))
+Name: "{userdocs}\FlightGear\Aircraft"; Permissions: everyone-modify; Check: not DirExists(ExpandConstant('{userdocs}\FlightGear\Aircraft'))
+Name: "{userdocs}\FlightGear\TerraSync"; Permissions: everyone-modify; Check: not DirExists(ExpandConstant('{userdocs}\FlightGear\TerraSync'))
+Name: "{userdocs}\FlightGear\Custom Scenery"; Permissions: everyone-modify; Check: not DirExists(ExpandConstant('{userdocs}\FlightGear\Custom Scenery'))

 [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: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Tasks: desktopicon;
+Name: "{group}\FlightGear"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
+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: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
 Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin"
@@ -254,6 +328,8 @@ var

 procedure InitializeUninstallProgressForm();
 begin
+  UninstallProgressForm
+
  UninstallCheckCleanPage := TNewNotebookPage.Create(UninstallProgressForm);
  UninstallCheckCleanPage.Notebook := UninstallProgressForm.InnerNotebook;
  UninstallCheckCleanPage.Parent := UninstallProgressForm.InnerNotebook;
@@ -261,7 +337,7 @@ begin

  DoCleanCheckbox := TNewCheckBox.Create(UninstallProgressForm);
  DoCleanCheckbox.Parent := UninstallCheckCleanPage;
-  DoCleanCheckbox.Caption := ExpandConstant('{cm:RemoveAllSettings}');
+  DoCleanCheckbox.Caption := 'Remove all settings, downloaded scenery and aircraft';
  DoCleanCheckbox.Left := ScaleX(10);
  DoCleanCheckbox.Top := ScaleY(10);

@@ -276,7 +352,9 @@ begin
  CleanHelp.Height := CleanHelp.AdjustHeight();

  CleanHelp.WordWrap := True;
-  CleanHelp.Caption := ExpandConstant('{cm:RemoveAllSettingsDescription}');
+  CleanHelp.Caption := '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.';

  UninstallProgressForm.InnerNotebook.ActivePage := UninstallCheckCleanPage;

@@ -311,10 +389,10 @@ begin
      if (Version.Major >= 6) then
        begin
          { IN and OUT rules must be specified separately, otherwise the firewall will create only the IN rule }
-          AddAdvancedFirewallException('FlightGear', ExpandConstant('{cm:FirewallFgException}'), ExpandConstant('{app}') + '\bin\fgfs.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_IN);
-          AddAdvancedFirewallException('FlightGear', ExpandConstant('{cm:FirewallFgException}'), ExpandConstant('{app}') + '\bin\fgfs.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_OUT);
-          AddAdvancedFirewallException('FlightGear FGCom', ExpandConstant('{cm:FirewallFgcomException}'), ExpandConstant('{app}') + '\bin\fgcom.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_IN);
-          AddAdvancedFirewallException('FlightGear FGCom', ExpandConstant('{cm:FirewallFgcomException}'), ExpandConstant('{app}') + '\bin\fgcom.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_OUT);
+          AddAdvancedFirewallException('FlightGear', 'Allows FlightGear to send and receive data over the multiplayer network and to get METARs.', ExpandConstant('{app}') + '\bin\fgfs.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_IN);
+          AddAdvancedFirewallException('FlightGear', 'Allows FlightGear to send and receive data over the multiplayer network and to get METARs.', ExpandConstant('{app}') + '\bin\fgfs.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_OUT);
+          AddAdvancedFirewallException('FlightGear FGCom', 'Allows FGCom to establish a connection to FlightGear and the VoIP server for voice ATC communication.', ExpandConstant('{app}') + '\bin\fgcom.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_IN);
+          AddAdvancedFirewallException('FlightGear FGCom', 'Allows FGCom to establish a connection to FlightGear and the VoIP server for voice ATC communication.', ExpandConstant('{app}') + '\bin\fgcom.exe', NET_FW_IP_PROTOCOL_ALL, '', '', NET_FW_RULE_DIR_OUT);
        end
      else if (Version.Major = 5) and (((Version.Minor = 1) and (Version.ServicePackMajor >= 2)) or ((Version.Minor = 2) and (Version.ServicePackMajor >= 1))) then
        begin
--- a/Info.plist.in
+++ b/Info.plist.in
@@ -15,7 +15,7 @@
 	<key>CFBundleExecutable</key>
 	<string>fgfs</string>
 	<key>CFBundleIdentifier</key>
-	<string><%= fgBundleIdentifier %></string>
+	<string>org.flightgear.FlightGear</string>
 	<key>CFBundleVersion</key>
 	<string><%= fgVersion %></string>
 	<key>CFBundleShortVersionString</key>
--- a/Nasa2FGearthview/README.md
+++ b/Nasa2FGearthview/README.md
@@ -1,123 +1,96 @@
 # Nasa2FGearthview
 A bash-script to convert NASA satellite images to ready-to-use
-textures for FG's EarthView using ImageMagick and normalmap
+textures for FG's EarthView using ImageMagick.

-You can get "normalmap" there:
-  https://github.com/planrich/normalmap
-
-For info about FGearthview, see the forum thread:\
+For info about FGearthview, see the forum thread:
  https://forum.flightgear.org/viewtopic.php?f=6&t=15754
-
-or this FG-wiki-page:\
+or this FG-wiki-page:
  http://wiki.flightgear.org/Earthview

-### Caution!
-Don't use this script on a server! It will most likely cause
-Denial-of-service (DoS). When working on these huge images, the
-harddisk throughput will cease occasionally and CPU / RAM usage will
-spike tremendously! So, only use this script on your home desktop
-computer, or if you don't mind several long server-outages...
-

 ------------------------------------
-## About:
+About:

 This script runs on Linux (maybe Mac also?) in a Bash
 (Bourne Again Shell) - Windows is not supported (by the nature of the
 script). Maybe it works on windows as well, I don't know, feel free
 to try, and please let me know! :)

+This will download the raw images from http://visibleearth.nasa.gov - 
+their server is not very fast, so I provide an alternative download
+location: https://musicchris.de/download/FG/EarthView/raw-data-NASA.7z
+This one is much quicker! If you really want the images directly from
+NASA, then provide "nasa" to the script (see below)
+
 In the end you will have 8 world-textures in .png and .dds format.
 Generally .dds is better in performance, but it won't work on some
 graphics cards. If this is the case for you, then try the .png files.
-For further information see:\
+For further information see:
 http://wiki.flightgear.org/index.php?title=DDS_Textures_in_FlightGear&redirect=no

-If you also converted the clouds and the height maps, then you'll also
-find 8 cloud- and 8 height textures (as well as their conversion to
-normal maps) in the format .png. Because the .dds-format has trouble
-with rendering heavy alpha images, which is because of it's
-compression algorythm [1], I think it's useless to also build faulty
-files.  However, this is not entirely true! It is possible to switch
-off the .dds/DXT compression. But this results in huge files and is
-rather heavy on the GPU's RAM.
+If you also converted the clouds, then you'll also find 8 cloud-
+textures in the format .png. Because the .dds-format has trouble with
+rendering heavy alpha images, which is because of it's compression
+algorythm [1], I think it's useless to also build faulty files.
+However, this is not entirely true! It is possible to switch off the
+.dds/DXT compression. But this results in huge files and is rather
+heavy on the GPU's RAM.

 Buckaroo has created a nice overview on dds-compression:
 [1] http://www.buckarooshangar.com/flightgear/tut_dds.html

 ------------------------------------
-## Installation and usage:
+Installation and usage:

 Simply copy "convert.sh" into a folder of your liking and run it:

-```shell
-./convert.sh
-```
+$ ./convert.sh

 This will show a help text, since you didn't specify any target(s).
 Possible targets are:
 * world
 * clouds
-* heights
 * all

 Additionally, there are some options you could specify (further
 explained below):
 * 1k | 2k | 4k | 8k | 16k
-* download | no-download
-* world
-* clouds
-* heights
+* nasa
+* no-download
 * cleanup
 * rebuild
 * check

 So your call could look sth like this:

-```shell
-./convert.sh world download alt cleanup 8k
-```
+$ ./convert.sh world no-download cleanup 8k


 ------------------------------------
-## Requirements:
+Requirements:

 WARNING!

-This script uses a *lot* disk space! In my last test run, which
-generated all maps in all resolutions, the disk usage was about 330GB!
-Beware!\
-Also, I wouldn't recommend doing this on a SSD! While SSDs are
-generally faster, they also get more wear-and-tear when write such
-huge files. So this script might cause your SSD to die earlier as it
-should. Generally speaking, this won't kill your SSD, but it might
-cause it to die earlier. HDDs are much more robust in that respect.
+This script uses a *lot* disk space! Make sure you have at least 90GB
+available!

 Also, this script will run for a *very long* time! It might be best to
 let it run over night - your computer might become unresponsive from
 time to time, due to the heavy CPU and memory load, which tends to
 occur, when converting 54000x27000 images. ;-)
-
 I also recommend to deactivate swapping!
-```shell
-  sudo swapoff -a
- ```
+  $ sudo swapoff -a
 To reactivate swapping do:
-```shell
  $ sudo swapon -a
-```

-This script relies on wget, ImageMagick and, for converting the height
-maps to normal maps, on "normalmap". Some of these programs are easily
-installed by your systems package-management-system.\ (On
-Debian/Ubuntu this is "apt-get").
+This script relies on wget and imagemagick. Both are easily installed
+by your systems package-management-system.
+(On Debian/Ubuntu this is "apt-get")

 So, on Debian for instance, you only need to put the following into
 the console:

-```shell
-sudo apt-get install wget imagemagick
-```
+  $ sudo apt-get install wget imagemagick

 Depending on your distro, the package names might differ slightly! Use
 a search engine of your choice to find out, how the packages are named
@@ -125,92 +98,70 @@ in your distro!

 You may want to check:

-```shell
-apt search imagemagick
-```
+  $ apt search imagemagick

-### IMPORTANT!
-Check out your ```/etc/ImageMagick-6/policy.xml```
-On some distros, there are limits set, which will cause IM to abort
-the conversion of images larger than
-[rediculously small images](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860763).
-Edit and set to our needs:
-* width: at least 55000
-* height: at least 55000
-* area: less than your free RAM
-
-### Normalmap
-For normalmap, you can download and compile it from
-  https://github.com/planrich/normalmap
-
-You can install the binary into your system, or just copy it next to
-convert.sh - both should work.

 ------------------------------------
-## Targets:
+Targets:

-**world**\
-        Generates the world tiles, needed to run FG with EarthView.
-        You will find the results in output/[$resolution]/\*. Copy
-        these into $FGDATA/Models/Astro/\*. More about the installation
-        of these textures can be found here:
-        http://wiki.flightgear.org/Earthview#Customization
+world
+	Generates the world tiles, needed to run FG with EarthView.
+	You will find the results in output/[$resolution]/*. Copy
+	these into $FGDATA/Models/Astro/*. More about the installation
+	of these textures can be found here:
+	http://wiki.flightgear.org/Earthview#Customization

-**clouds**\
-        Generates the cloud tiles, needed to run FG with EarthView.
-        The locations are the same as the other textures mentioned
-        above. Note that clouds are only available with up to 8k
-        resolution, due to the available data at NASA.
+clouds
+	Generates the cloud tiles, needed to run FG with EarthView.
+	The locations are the same as the other textures mentioned
+	above. Note that clouds are only available with up to 8k
+	resolution, due to the available data at NASA.

-**heights**\
-        Generates the height tiles, which are then converted to the
-        normal maps needed to run FG with EarthView. The locations are
-        the same as the other textures mentioned above. Note that
-        heights are only available with up to 8k resolution, due to the
-        available data at NASA.
-
-**all**\
-        Converts everything needed for a full-blown earthview texture
-        set. Does the same as:
-        ```./convert.sh world clouds heights```
+all
+	Converts everything needed for a full-blown earthview texture
+	set. Does the same as:
+	  $ ./convert.sh world clouds


-## Options:
+Options:

-**1k | 2k | 4k | 8k | 16k**\
-        Lets you specify a desired resolution of the textures.
-        Possible values are 1k, 2k, 4k, 8k and 16k. If nothing is
-        specified, the script will generate all of the resolutions.
-        16k is recommended only for earth textures, it will induce
-        oversampling from clouds and height maps.
+1k | 2k | 4k | 8k | 16k
+	Lets you specify a desired resolution of the textures.
+	Possible values are 1k, 2k, 4k, 8k and 16k. If nothing is
+	specified, the script will generate all of the resolutions.
+	16k is only available for earth textures.

-**download**\
-        Causes the script to download the needed data, this is the
-        default behavior (and can be omitted).
+nasa
+	Causes the script to download directly from 
+	http://visibleearth.nasa.gov . If omitted the script will
+	download from
+	https://musicchris.de/download/FG/EarthView/raw-data-NASA.7z
+	which is much faster!
+	Uses wget either way.

-**no-download**\
-        Causes the script to skip the download function. If you
-        already have the source images, then you don't need to
-        re-download them. (About 2.4GB!)
-        If omitted, the script will download the source images from
-        the default location.
+no-download
+	Causes the script to skip the download function. If you
+	already have the source images, then you don't need to
+	re-download them. (About 2.4GB!)
+	If omitted, the script will download the source images from
+	https://musicchris.de/download/FG/EarthView/raw-data-NASA.7z

-**cleanup**\
-        Deletes the temporary files created during texture generation.
-        These can be found in tmp/
-        Note: if for some reason you later want some other resolution,
-        then it's good to have the data there. So only do this, when
-        you're quite sure that you're done.
-        Frees up a lot of disk-space! Which would have to be
-        regenerated if needed again.
+cleanup
+	Deletes the temporary files created during texture generation.
+	These can be found in tmp/
+	Note: if for some reason you later want some other resolution,
+	then it's good to have the data there. So only do this, when
+	you're quite sure that you're done.
+	Frees up a lot of disk-space! Which would have to be
+	regenerated if needed again.

-**rebuild**\
-        Deletes only the temporary files of the given target. So if
-        you call ```./convert.sh rebuild world``` the script will delete
-        all corresponding temp-files of the target world, which will
-        trigger a complete regeneration of the relevant (instead of
-        skipping existing files)
+rebuild
+	Deletes only the temporary files of the given target. So if
+	you call './convert.sh rebuild world' the script will delete
+	all corresponding temp-files of the target world, which will
+	trigger a complete regeneration of the relevant (instead of
+	skipping existing files)

-**check**\
-        Creates mosaics of the tiles, so you can look at them and see
-        if all went well.
+check
+	Creates mosaics of the tiles, so you can look at them and see
+	if all went well.
--- a/Nasa2FGearthview/convert.sh
+++ b/Nasa2FGearthview/convert.sh
--- a/build_appimage.sh
+++ b/build_appimage.sh
@@ -1,99 +0,0 @@
-#!/bin/bash
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# builds Appimage on Centos 7 using linuxdeployqt from continuous build
-# expects to work in $WORKSPACE, uses the contents of dist/{bin,share,lib64} copied into an appdir
-# missing qt plugins are copied in manually, as are osgPlugins
-# libcurl in SIMGEAR needs a setting to find the tls certificate, and OSG needs LD_LIBRARY_PATH so it can find osgPlugins
-# currently not including FGDATA, but this could be done easily once FG is updated to change Nav database checks from path to some kind of checksum
-# 
-# issues/errors:
-# can't find qt translations - missing something in my build?
-# 
-# errors/comments to enrogue@gmail.com
-
-#clean up any previous build
-
-rm -rf appdir
-
-#create basic structure
-
-mkdir -p appdir/usr/bin
-mkdir -p appdir/usr/lib
-mkdir -p appdir/usr/share
-mkdir -p appdir/usr/qml
-mkdir -p appdir/usr/ssl
-
-#copy everything we need in
-
-cp dist/bin/* appdir/usr/bin
-
-cp -a dist/lib64/* appdir/usr/lib
-
-# remove SimGearCore,Scene and any other static libs which leaked
-rm appdir/usr/lib/lib*.a 
-
-cp -a dist/lib64/osgPlugins-3.4.2 appdir/usr/lib
-
-# adjust the rpath on the copied plugins, so they don't
-# require LD_LIBRARY_PATH to be set to load their dependencies
-# correctly
-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
-
-#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
-
-#generate AppRun script
-
-# Note: don't set LD_LIBRARY_PATH here.
-# if you do, you need to add code to unset it *sinde* FlightGear (eg, bootstrap.cxx), 
-# so that fork-ed processes don't inherit the value. For an example see:
-# https://github.com/KDAB/hotspot/blob/master/src/main.cpp#L87
-
-cat << 'EOF' > appdir/AppRun
-#!/bin/bash
-HERE="$(dirname "$(readlink -f "${0}")")"
-export SIMGEAR_TLS_CERT_PATH=$HERE/usr/ssl/cacert.pem
-export OSG_LIBRARY_PATH=${HERE}/usr/lib
-
-if [[ $# -eq 0 ]]; then
- echo "Started with no arguments; assuming --launcher"
- exec "${HERE}/usr/bin/fgfs" --launcher
-else
- exec "${HERE}/usr/bin/fgfs" "$@"
-fi
-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
-
-#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
--- a/build_release_linux.sh
+++ b/build_release_linux.sh
@@ -5,9 +5,7 @@ if [ "$WORKSPACE" == "" ]; then
    exit 1
 fi

-cmakeGenerator=Ninja
-cmakeCommonArgs="-DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo"
-VERSION=`cat flightgear/flightgear-version`
+VERSION=`cat flightgear/version`

 #####################################################################################
 # ensure fgrcc can run when linked against libSimGearCore, for example
@@ -24,63 +22,44 @@ rm -rf output/*
 #####################################################################################
 echo "Starting on SimGear"
 cd sgBuild
-cmake -G $cmakeGenerator $cmakeCommonArgs ../simgear
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_DNS:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" ../simgear

 # compile
-ninja
+make

 if [ $? -ne '0' ]; then
    echo "make simgear failed"
    exit 1
 fi

-ninja install
+make install

 # build source package and copy to output
-ninja package_source
+make package_source
 cp simgear-*.tar.bz2 ../output/.

 #####################################################################################
 echo "Starting on FlightGear"
 cd ../fgBuild
-cmake -G $cmakeGenerator $cmakeCommonArgs -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DFG_BUILD_TYPE=Release ../flightgear

 # compile
-ninja
+make

 if [ $? -ne '0' ]; then
    echo "make flightgear failed"
    exit 1
 fi

-ninja install
+make install

 # build source package and copy to output
-ninja package_source
+make package_source
 cp flightgear-*.tar.bz2 ../output/.

 #####################################################################################

-if which sentry-cli >/dev/null; then
-    echo "Uploading symbols"
-
-    export SENTRY_ORG=flightgear
-    export SENTRY_PROJECT=flightgear
-    
-    # set in the Jenkins environment for the builder
-  #  export SENTRY_AUTH_TOKEN=YOUR_AUTH_TOKEN
-
-    ERROR=$(sentry-cli upload-dif --include-sources "$WORKSPACE/dist/bin/fgfs" 2>&1 >/dev/null)
-    if [ ! $? -eq 0 ]; then
-        echo "warning: sentry-cli - $ERROR"
-    fi
-else
-    echo "warning: sentry-cli not installed, download from https://github.com/getsentry/sentry-cli/releases"
-fi
-
-# now we uploaded symnbols, strip the binaries
-
-strip --strip-debug $WORKSPACE/dist/bin/fgfs
-strip --strip-debug $WORKSPACE/dist/bin/fgviewer
-strip --strip-debug $WORKSPACE/dist/bin/fgjs
+echo "Assembling base package"
+cd $WORKSPACE

+tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata/
--- a/build_release_windows.bat
+++ b/build_release_windows.bat
@@ -20,8 +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" ^
                 -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
@@ -35,24 +33,11 @@ cd ..\build-fg32
 cmake ..\flightgear -G "Visual Studio 14" ^
                    -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
                    -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140 ^
+                    -DCMAKE_PREFIX_PATH:PATH=%WORKSPACE%/install/msvc140/OpenSceneGraph ^
                    -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
                    -DOSG_FSTREAM_EXPORT_FIXED=1 ^
                    -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^
-                    -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-                    -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
+                    -DFG_BUILD_TYPE=%FGBUILDTYPE%
 cmake --build . --config RelWithDebInfo --target INSTALL

 cd ..
@@ -60,7 +45,6 @@ cd ..
 REM 64 bits
 md build-sg64
 md build-fg64
-md build-fg64-compositor

 cd build-sg64
 cmake ..\SimGear -G "Visual Studio 14 Win64" ^
@@ -78,30 +62,15 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
                    -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^
                    -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^
                    -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-                    -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-                    -DENABLE_SWIFT:BOOL=ON ^
-                    -DENABLE_COMPOSITOR:BOOL=OFF
+                    -DFG_BUILD_TYPE=%FGBUILDTYPE%
 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%
@@ -112,16 +81,14 @@ subst X: %WORKSPACE%.
 REM ensure output dir is clean since we upload the entirety of it
 rmdir /S /Q output

+SET CRASHFIX_UPLOAD_URL=http://crashes.flightgear.org/index.php/debugInfo/uploadExternal
 SET FGFS_PDB=src\Main\RelWithDebInfo\fgfs.pdb
+ECHO Uploading PDB files to %CRASHFIX_UPLOAD_URL%
+upload -v -u %CRASHFIX_UPLOAD_URL% FlightGear %WORKSPACE%\build-fg32\%FGFS_PDB% %WORKSPACE%\build-fg64\%FGFS_PDB%

-SET SENTRY_ORG=flightgear
-SET SENTRY_PROJECT=flightgear
-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 also save the PDB to Output\ so they get uploaded
+copy %WORKSPACE%\build-fg64\%FGFS_PDB% %WORKSPACE%\Output\fgfs_64.pdb
+copy %WORKSPACE%\build-fg32\%FGFS_PDB% %WORKSPACE%\Output\fgfs_32.pdb

 REM indirect way to get command output into an environment variable
 set PATH=%OSG32%\bin;%PATH%
@@ -129,17 +96,11 @@ osgversion --so-number > %TEMP%\osg-so-number.txt
 osgversion --version-number > %TEMP%\osg-version.txt
 osgversion --openthreads-soversion-number > %TEMP%\openthreads-so-number.txt

-SET /P FLIGHTGEAR_VERSION=<flightgear\flightgear-version
+SET /P FLIGHTGEAR_VERSION=<flightgear\version
 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

-for /F "tokens=1,2,3 delims=." %%a in ("%FLIGHTGEAR_VERSION%") do (
-   set FLIGHTGEAR_VERSION_MAJOR=%%a
-   set FLIGHTGEAR_VERSION_MINOR=%%b
-   set FLIGHTGEAR_VERSION_PATCH=%%c
-)
-
 IF %IS_NIGHTLY_BUILD% EQU 1 (
  REM FlightGear nightly: with fgdata, output filename would be "FlightGear-x.x.x-nightly-full.exe"
  CALL :writeBaseConfig
@@ -159,9 +120,7 @@ IF %IS_NIGHTLY_BUILD% EQU 1 (
 GOTO End

 :writeBaseConfig
-ECHO #define FGHarnessPath "x:" > InstallConfig.iss
-ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" >> InstallConfig.iss
-ECHO #define FGVersionGroup "%FLIGHTGEAR_VERSION_MAJOR%.%FLIGHTGEAR_VERSION_MINOR%" >> InstallConfig.iss
+ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > 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
--- a/catalog/README.md
+++ b/catalog/README.md
@@ -1,63 +0,0 @@
-Introduction
-============
-
-This is the directory containing the script for updating aircraft, or other
-craft, catalogs.  It will create the `catalog.xml` file used to add a hangar to
-FlightGear, as well as the zip archives of each craft in the hangar and the
-md5sums, thumbnails, and previews of these.  It consists of the script:
-
-* update-catalog.py
-
-And its Python modules:
-
-* catalog.py
-* catalogTags.py
-* sgprogs.py
-
-
-Usage
-=====
-
-The script can be run directly from this directory, or the script and its
-modules can be copied together and run from any location.  The steps to use
-these are:
-
-* Create an output directory where the catalog and zip files will be located.
-* Copy the configuration files `catalog.config.xml`, `template.xml`, and
-  `zip-excludes.lst` from one of the `*catalog*` example directories into the
-  output directory.
-* Modify these files as required.
-
-Then run the script with:
-
-`$ $FGMETA/catalog/update-catalog.py dir`
-
-where `dir` is the output directory.  The script will create the following
-files:
-
-* `md5sum.xml`:  A file containing checksums of all craft zip archives in the
-  base output directory.
-* `ftp/catalog.xml`:  The XML catalog to upload to a server and advertise to
-  FlightGear users.
-* `ftp/*.zip`:  The zip archives of each craft in the hangar.
-* `ftp/previews/*_Splashs/`:  A directory per craft containing the splash screen
-  graphics.
-* `ftp/thumbnails/`:  The collection of thumbnail graphics for the hangar.
-
-The `ftp` directory is to be uploaded to a server which can be configured via
-the `catalog.config.xml` file.
-
-
-Examples
-========
-
-A number of example configuration files are located in this directory.  These
-include:
-
-* `fgaddon-catalog/`:  The configuration files used for the [official FGAddon
-  hangar](http://wiki.flightgear.org/FGAddon).
-* `stable-2018-catalog/':  The configuration files used for the 2018 long term
-  stability release.
-* `single-craft-catalog-test/`:  Configuration files used for testing the
-  catalog and zip archive creation for a single craft.  These are for content
-  developers to test their craft.
--- a/catalog/catalog.py
+++ b/catalog/catalog.py
@@ -2,29 +2,17 @@

 import argparse
 import datetime
-from fnmatch import fnmatch, translate
-import lxml.etree as ET
+import xml.etree.cElementTree as ET
 import os
-from os.path import exists, join, relpath
-from os import F_OK, access, walk
 import re
 import sgprops
 import sys
 import catalogTags
-import zipfile

 CATALOG_VERSION = 4
 quiet = False
 verbose = False

-# The Python version.
-PY_VERSION = sys.version_info[0]
-
-# Python 2 and 3 compatibility.
-if PY_VERSION == 3:
-    long = int
-
-
 def warning(msg):
    if not quiet:
        print(msg)
@@ -112,7 +100,7 @@ def scan_set_file(aircraft_dir, set_file, includes):
    if sim_node.hasChild('minimum-fg-version'):
        variant['minimum-fg-version'] = sim_node.getValue('minimum-fg-version', None)

-    #print("    %s" % variant)
+    #print '    ', variant
    return variant

 def extract_previews(previews_node, aircraft_dir):
@@ -151,13 +139,13 @@ def scan_aircraft_dir(aircraft_dir, includes):
    files = os.listdir(aircraft_dir)
    for file in sorted(files, key=lambda s: s.lower()):
        if file.endswith('-set.xml'):
-            # print('trying: %s' % file)
+            # print 'trying:', file
            try:
                d = scan_set_file(aircraft_dir, file, includes)
                if d == None:
                    continue
            except:
-                print("Skipping set file since couldn't be parsed: %s %s" % os.path.join(aircraft_dir, file), sys.exc_info()[0])
+                print "Skipping set file since couldn't be parsed:", os.path.join(aircraft_dir, file), sys.exc_info()[0]
                continue

            setDicts.append(d)
@@ -167,13 +155,13 @@ def scan_aircraft_dir(aircraft_dir, includes):
            elif d['variant-of'] == None:
                primaryAircraft.append(d)

-    # print(setDicts)
+    # print setDicts
    if len(setDicts) == 0:
        return None, None

    # use the first one
    if len(primaryAircraft) == 0:
-        print("Aircraft has no primary aircraft at all: %s" % aircraft_dir)
+        print "Aircraft has no primary aircraft at all:", aircraft_dir
        primaryAircraft = [setDicts[0]]

    package = primaryAircraft[0]
@@ -224,9 +212,9 @@ def append_author_nodes(node, info):
        # traditional single author string
        node.append( make_xml_leaf('author', info['author']) )

-def make_aircraft_node(aircraftDirName, package, variants, downloadBase, mirrors):
-    #print("package: %s" % package)
-    #print("variants: %s" % variants)
+def make_aircraft_node(aircraftDirName, package, variants, downloadBase):
+    #print "package:", package
+    #print "variants:", variants
    package_node = ET.Element('package')
    package_node.append( make_xml_leaf('name', package['name']) )
    package_node.append( make_xml_leaf('status', package['status']) )
@@ -273,15 +261,9 @@ def make_aircraft_node(aircraftDirName, package, variants, downloadBase, mirrors

    package_node.append( make_xml_leaf('dir', aircraftDirName) )

-    # primary URL is first
    download_url = downloadBase + aircraftDirName + '.zip'
    package_node.append( make_xml_leaf('url', download_url) )

-    for m in mirrors:
-        mu = m + aircraftDirName + '.zip'
-        package_node.append( make_xml_leaf('url', mu) )
-
-
    if 'thumbnail' in package:
        thumbnail_url = downloadBase + 'thumbnails/' + aircraftDirName + '_' + package['thumbnail']
        package_node.append( make_xml_leaf('thumbnail', thumbnail_url) )
@@ -297,134 +279,3 @@ def make_aircraft_node(aircraftDirName, package, variants, downloadBase, mirrors
        package_node.append(package['urls']._createXMLElement())

    return package_node
-
-
-def make_aircraft_zip(repo_path, craft_name, zip_file, global_zip_excludes, verbose=True):
-    """Create a zip archive of the given aircraft."""
-
-    # Printout.
-    if verbose:
-        print("Zip file creation: %s.zip" % craft_name)
-
-    # Go to the directory of crafts to catalog.
-    savedir = os.getcwd()
-    os.chdir(repo_path)
-
-    # Clear out the old file.
-    if exists(zip_file):
-        os.remove(zip_file)
-
-    # Use the Python zipfile module to create the zip file.
-    zip_handle = zipfile.ZipFile(zip_file, 'w', zipfile.ZIP_DEFLATED)
-
-    # Find a per-craft exclude list.
-    craft_path = join(repo_path, craft_name)
-    exclude_file = join(craft_path, 'zip-excludes.lst')
-    if exists(exclude_file):
-        if verbose:
-            print("Found the craft specific exclusion list '%s'" % exclude_file)
-
-    # Otherwise use the catalog default exclusion list.
-    else:
-        exclude_file = global_zip_excludes
-
-    # Process the exclusion list and find all matching file names.
-    blacklist = fetch_zip_exclude_list(craft_name, craft_path, exclude_file)
-
-    # Walk over all craft files.
-    print_format = "  %-30s '%s'"
-    for root, dirs, files in walk(craft_path):
-        # Loop over the files.
-        for file in files:
-            # The directory and relative and absolute paths.
-            dir = relpath(root, start=repo_path)
-            full_path = join(root, file)
-            rel_path = relpath(full_path, start=repo_path)
-
-            # Skip blacklist files or directories.
-            skip = False
-            if file == 'zip-excludes.lst':
-                if verbose:
-                    print(print_format % ("Skipping the file:", join(dir, 'zip-excludes.lst')))
-                skip = True
-            if dir in blacklist:
-                if verbose:
-                    print(print_format % ("Skipping the file:", join(dir, file)))
-                skip = True
-            for name in blacklist:
-                if fnmatch(rel_path, name):
-                    if verbose:
-                        print(print_format % ("Skipping the file:", rel_path))
-                    skip = True
-                    break
-            if skip:
-                continue
-
-            # Otherwise add the file.
-            zip_handle.write(rel_path)
-
-    # Clean up.
-    os.chdir(savedir)
-    zip_handle.close()
-
-
-def fetch_zip_exclude_list(name, path, exclude_path):
-    """Use Unix style path regular expression to find all files to exclude."""
-
-    # Init.
-    blacklist = []
-    file = open(exclude_path)
-    exclude_list = file.readlines()
-    file.close()
-    old_path = os.getcwd()
-    os.chdir(path)
-
-    # Process each exclusion path or regular expression, converting to Python RE objects.
-    reobj_list = []
-    for i in range(len(exclude_list)):
-        reobj_list.append(re.compile(translate(exclude_list[i].strip())))
-
-    # Recursively loop over all files, finding the ones to exclude.
-    for root, dirs, files in walk(path):
-        for file in files:
-            full_path = join(root, file)
-            rel_path = join(name, relpath(full_path, start=path))
-
-            # Skip Unix shell-style wildcard matches
-            for i in range(len(reobj_list)):
-                if reobj_list[i].match(rel_path):
-                    blacklist.append(rel_path)
-                    break
-
-    # Return to the original path.
-    os.chdir(old_path)
-
-    # Return the list.
-    return blacklist
-
-
-def parse_config_file(parser=None, file_name=None):
-    """Test and parse the catalog configuration file."""
-
-    # Check for the file.
-    if not access(file_name, F_OK):
-        print("CatalogError: The catalog configuration file '%s' cannot be found." % file_name)
-        sys.exit(1)
-
-    # Parse the XML and return the root node.
-    config = ET.parse(file_name, parser)
-    return config.getroot()
-
-
-def parse_template_file(parser=None, file_name=None):
-    """Test and parse the catalog configuration file."""
-
-    # Check for the file.
-    if not access(file_name, F_OK):
-        print("CatalogError: The catalog template file '%s' cannot be found." % file_name)
-        sys.exit(1)
-
-    # Parse the XML and return the template node.
-    template = ET.parse(file_name, parser)
-    template_root = template.getroot()
-    return template_root.find('template')
--- a/catalog/catalogTags.py
+++ b/catalog/catalogTags.py
@@ -11,16 +11,12 @@ aircraftTypeTags = [
    "glider",
    "groundvehicle",
    "helicopter",
-    "interceptor",
-    "passenger",
    "racer",
    "spaceship",
    "tanker",
    "trainer",
    "transport",
    "ultralight",
-    "unpowered",
-    "uav",
    "reconnaissance",
    "seacraft",
    "crop-duster",
@@ -30,10 +26,8 @@ aircraftTypeTags = [
 manufacturerTags = [
    "airbus",
    "antonov",
-    "arado",
    "atr",
    "avro",
-    "bae",
    "bell",
    "bleriot",
    "boeing",
@@ -59,7 +53,6 @@ manufacturerTags = [
    "heinkel",
    "ilyushin",
    "junkers",
-    "kawasaki",
    "lockheed",
    "mc-donnell-douglas",
    "messerschmitt",
@@ -71,7 +64,6 @@ manufacturerTags = [
    "piper",
    "republic",
    "robin",
-    "rockwell",
    "saab",
    "short",
    "sopwith",
@@ -81,7 +73,6 @@ manufacturerTags = [
    "tupolev",
    "vickers",
    "vought",
-    "wright",
    "yakovlev"
 ]

@@ -114,7 +105,6 @@ featureTags = [
    "biplane",
    "canard",
    "castering-wheel",
-    "combat",
    "delta",
    "etops",
    "experimental",
@@ -122,14 +112,10 @@ featureTags = [
    "fixed-gear",
    "floats",
    "glass-cockpit",
-    "low-wing",
-    "mid-wing",
    "high-wing",
    "h-tail",
    "hud",
    "ifr",
-    "lifting-body",
-    "pressurised",
    "prototype",
    "refuel",
    "retractable-gear",
@@ -137,18 +123,15 @@ featureTags = [
    "skis",
    "stol",
    "supersonic",
-    "supercharger",
    "t-tail",
    "tail-dragger",
    "tricycle",
    "tail-hook",
    "triplane",
-    "twin-boom",
    "v-tail",
    "variable-geometry",
    "vtol",
    "wing-fold"
-    "water-drop"
 ]

 propulsionTags = [
@@ -164,7 +147,6 @@ propulsionTags = [
    "supercharged",
    "turboprop",
    "twin-engine",
-    "four-engine",
    "variable-pitch",
    "fixed-pitch"
 ]
--- a/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
+++ b/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PropertyList>
-  <local-output>/home/fgaddon/output/Aircraft-trunk</local-output>
-  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/</download-url>
-  <download-url n="1">http://ukmirror.flightgear.org/fgaddon/Aircraft-trunk/</download-url>
-  <download-url n="2">https://cdn.merspieler.tk/fgaddon/Aircraft-trunk/</download-url>
-
-  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/thumbnails</thumbnail-url>
-  <thumbnail-url n="1">http://ukmirror.flightgear.org/fgaddon/Aircraft-trunk/thumbnails</thumbnail-url>
-  <thumbnail-url n="2">https://cdn.merspieler.tk/fgaddon/Aircraft-trunk/thumbnails</thumbnail-url>
-
-  <scm>
-    <type>svn</type>
-    <path>/home/fgaddon/fgaddon-trunk/Aircraft</path>
-    <skip>NTPS</skip>
-    <skip>c172</skip>
-    <skip>tu134</skip>
-  </scm>
-    <include-dir>/home/fgaddon/fgdata</include-dir>
-    <include-dir>/home/fgaddon/fgaddon-trunk</include-dir>
-    
-  <!-- <scm>
-       <type>git</type>
-       <update type="bool">false</update>
-       <path>/Users/jmt/FGFS/fgdata</path>
-       <url>git://git.code.sf.net/p/flightgear/fgdata</url>
-       </scm> -->
-  <upload n="0">
-    <enabled type="bool">true</enabled>
-    <type>rsync-ssh</type>
-    <remote>ibiblio:/public/mirrors/flightgear/ftp/Aircraft</remote>
-  </upload>
-</PropertyList>
--- a/catalog/fgaddon-catalog-ukmirror/template.xml
+++ b/catalog/fgaddon-catalog-ukmirror/template.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PropertyList>
-  <template>
-	  <version n="0">2019.*</version>
-	  <version n="1">2018.*</version>
-	  <version n="2">2020.1.*</version>
-	  <version n="3">2020.2.*</version>
-
-    <id>org.flightgear.fgaddon.trunk</id>
-    <license>GPL</license>
-    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
-    <name>FlightGear aircraft distribution from fgaddon</name>
-    <description>This hangar provides aircraft officially supported and maintained by the FlightGear project, 
-    under a free-software license. It tracks latest aircraft developments in the FGaddon repository.</description>
-    <!-- <de>
-      <description>Auf Deutsch</description>
-    </de>
-    <fr>
-      <description>En Francais</description>
-    </fr> -->
-
- </template>
-</PropertyList>
--- a/catalog/fgaddon-catalog-ukmirror/zip-excludes.lst
+++ b/catalog/fgaddon-catalog-ukmirror/zip-excludes.lst
@@ -1,11 +0,0 @@
-*/.svn/*
-*.xcf*
-*.XCF*
-*.blend*
-*.psd
-*~
-*/dev/*
-*/Dev/*
-*/development/*
-*/src/*
-*/Resources/*
--- a/catalog/fgaddon-catalog/zip-excludes.lst
+++ b/catalog/fgaddon-catalog/zip-excludes.lst
@@ -1,11 +1,5 @@
 */.svn/*
-*.xcf*
-*.XCF*
-*.blend*
+*.xcf
+*.blend
 *.psd
 *~
-*/dev/*
-*/Dev/*
-*/development/*
-*/src/*
-*/Resources/*
--- a/catalog/legacy-catalog/catalog.config.xml
+++ b/catalog/legacy-catalog/catalog.config.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PropertyList>
-  <local-output>/home/fgaddon/output/Aircraft</local-output>
-  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/</download-url>
-  <download-url n="1">http://ukmirror.flightgear.org/fgaddon/Aircraft/</download-url>
-
-  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/thumbnails</thumbnail-url>
-  <thumbnail-url n="1">http://ukmirror.flightgear.org/fgaddon/Aircraft/thumbnails</thumbnail-url>
-
-  <scm>
-    <type>svn</type>
-    <path>/home/fgaddon/fgaddon-legacy/Aircraft</path>
-    <skip>NTPS</skip>
-    <skip>c172</skip>
-    <skip>tu134</skip>
-  </scm>
-    <include-dir>/home/fgaddon/fgdata-legacy</include-dir>
-    <include-dir>/home/fgaddon/fgaddon-legacy</include-dir>
-
-  <upload n="0">
-    <enabled type="bool">true</enabled>
-    <type>rsync-ssh</type>
-    <remote>ibiblio:/public/mirrors/flightgear/ftp/Aircraft-legacy</remote>
-  </upload>
-</PropertyList>
--- a/catalog/legacy-catalog/template.xml
+++ b/catalog/legacy-catalog/template.xml
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<PropertyList>
-  <template>
-    <version n="0">3.4.*</version>
-    <version n="1">3.5.*</version>
-    <version n="2">3.6.*</version>
-    <version n="3">3.7.*</version>
-    <version n="5">2016.*.*</version>
-    <version n="6">2017.*.*</version>
-    <version n="7">2018.*.*</version>
-
-    <!-- the legacy catalog has to have this ID, becuase this is what older FG
-    clients expect -->
-    <id>org.flightgear.fgaddon</id>
-    <license>GPL</license>
-    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-    <name>FlightGear aircraft(legacy support)</name>
-    <description>This hangar provides aircraft officially supported and maintained by the 
-    FlightGear project, under a free-software license. Aircraft are intended for
-    use with FlightGear versions 2018.2 and older.</description>
-
-<!--    <alternate-version>
-      <version>2019.*</version>
-      <version>2018.4.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
-      <id>org.flightgear.fgaddon.trunk</id>
-    </alternate-version>
-
-    <alternate-version>
-      <version>2018.3.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
-      <id>org.flightgear.fgaddon.stable_2018</id>
-    </alternate-version>
-->
-
-  </template>
-</PropertyList>
--- a/catalog/legacy-catalog/zip-excludes.lst
+++ b/catalog/legacy-catalog/zip-excludes.lst
@@ -1,5 +0,0 @@
-*/.svn/*
-*.xcf
-*.blend
-*.psd
-*~
--- a/catalog/sgprops.py
+++ b/catalog/sgprops.py
@@ -2,8 +2,7 @@
 from xml.sax import make_parser, handler, expatreader

 # ElementTree for writing
-#import xml.etree.cElementTree as ET
-import lxml.etree as ET
+import xml.etree.cElementTree as ET

 import re, os

@@ -119,7 +118,7 @@ class Node(object):
        # value and type specification
        try:
            if self._value is not None:
-                if isinstance(self._value, str):
+                if isinstance(self._value, basestring):
                    # don't call str() on strings, breaks the
                    # encoding
                    n.text = self._value
@@ -133,9 +132,9 @@ class Node(object):
                    elif isinstance(self._value, bool):
                        n.set('type', "bool")
        except UnicodeEncodeError:
-            print("Encoding error with %s %s" % (self._value, type(self._value)))
+            print "Encoding error with", self._value, type(self._value)
        except:
-            print("Unexpected exception in sgprops._createXMLElement():", sys.exc_info()[0])
+            print "Some other exceptiong in sgprops._createXMLElement()"

        # index in parent
        if (self.index != 0):
@@ -194,7 +193,7 @@ class PropsHandler(handler.ContentHandler):
            try:
                index = int(attrs['n'])
            except:
-                print("Invalid index at line: %s of %s" % (self._locator.getLineNumber(), self._path))
+                print "Invalid index at line:", self._locator.getLineNumber(), "of", self._path
                raise IndexError("Invalid index at line:", self._locator.getLineNumber(), "of", self._path)

            currentState.recordExplicitIndex(name, index)
@@ -251,7 +250,7 @@ class PropsHandler(handler.ContentHandler):
                        self._content = self._content[:-1]
                    self._current.value = float(self._content)
        except:
-            print("Parse error for value: %s at line: %s of: %s" % (self._content, self._locator.getLineNumber(), self._path))
+            print "Parse error for value:", self._content, "at line:", self._locator.getLineNumber(), "of:", self._path

        self._current = self._current.parent
        self._content = None
--- a/catalog/single-craft-catalog-test/README
+++ b/catalog/single-craft-catalog-test/README
@@ -1,6 +0,0 @@
-Configuration files for testing the catalog updating script on a single aircraft.  This is useful for seeing what will be packed into the zip archive.  To use these:
-
-* Copy all *.xml and *.lst files into a local testing directory X.
-* Modify the *.xml files:
-    * Replace all instances of '/data/fgaddon_catalog_p51d/' with the directory X.
-    * Update any other tags as necessary.
--- a/catalog/single-craft-catalog-test/catalog.config.xml
+++ b/catalog/single-craft-catalog-test/catalog.config.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Template catalog - copy and modify for your site as required-->
-<PropertyList>
-  <local-output>/data/fgaddon-catalog_p51d/ftp</local-output>
-  <download-url n="0">/data/fgaddon-catalog_p51d/ftp/Aircraft/</download-url>
-  <scm>
-    <type>svn</type>
-    <update type="bool">false</update>
-    <path>/flightgear/flightgear-fgaddon/Aircraft</path>
-    <include>p51d</include>
-  </scm>
-</PropertyList>
--- a/catalog/single-craft-catalog-test/template.xml
+++ b/catalog/single-craft-catalog-test/template.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Template catalog - copy and modify for your site as required-->
-<PropertyList>
-  <template>
-    <version n="0">HEAD</version>
-    <id>localhost</id>
-    <license>GPL</license>
-    <url>/data/fgaddon-catalog_p51d/ftp/Aircraft/catalog.xml</url>
-    <name>p51d FGAddon aircraft test</name>
-    <description>This is a test of the catalog updating script to allow aircraft authors to see what will be present in the zip archive of their aircraft.</description>
-  </template>
-</PropertyList>
--- a/catalog/single-craft-catalog-test/zip-excludes.lst
+++ b/catalog/single-craft-catalog-test/zip-excludes.lst
@@ -1,11 +0,0 @@
-*/.svn/*
-*.xcf*
-*.XCF*
-*.blend*
-*.psd
-*~
-*/dev/*
-*/Dev/*
-*/development/*
-*/src/*
-*/Resources/*
--- a/catalog/stable-2018-catalog/catalog.config.xml
+++ b/catalog/stable-2018-catalog/catalog.config.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Template catalog - copy and modify for your site as required-->
-<PropertyList>
-	<local-output>/home/fgaddon/output/Aircraft-2018</local-output>
-  <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/</download-url>
-  <download-url n="1">http://ukmirror.flightgear.org/fgaddon/Aircraft-2018/</download-url>
-  <download-url n="2">https://cdn.merspieler.tk/fgaddon/Aircraft-2018/</download-url>
-
-  <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/thumbnails</thumbnail-url>
-  <thumbnail-url n="1">http://ukmirror.flightgear.org/official/Aircraft-2018/thumbnails</thumbnail-url>
-  <thumbnail-url n="2">https://cdn.merspieler.tk/fgaddon/Aircraft-2018/thumbnails</thumbnail-url>
-
-
-  <!-- share zips with the trunk catalog where possible -->
-  <share-output>/home/fgaddon/output/Aircraft</share-output>
-  <share-md5-sums>/home/fgaddon/fgmeta/catalog/fgaddon-catalog-ukmirror/md5sum.xml</share-md5-sums>
-
-  <scm>
-    <type>svn</type>
-    <path>/home/fgaddon/fgaddon-release-2018.3/Aircraft</path>
-    <skip>NTPS</skip>
-    <skip>c172</skip>
-    <skip>tu134</skip>
-  </scm>
-
-    <include-dir>/home/fgaddon/fgdata-release_2018.3</include-dir>
-    <include-dir>/home/fgaddon/fgaddon-release-2018.3</include-dir>
-    
-  <upload n="0">
-    <enabled type="bool">true</enabled>
-    <type>rsync-ssh</type>
-    <remote>ibiblio:/public/mirrors/flightgear/ftp/Aircraft-2018</remote>
-  </upload>
-</PropertyList>
--- a/catalog/stable-2018-catalog/template.xml
+++ b/catalog/stable-2018-catalog/template.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PropertyList>
-  <template>
-	  <version n="0">2018.*</version>
-    <id>org.flightgear.fgaddon.stable_2018</id>
-    <license>GPL</license>
-    <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
-    <name>FlightGear aircraft distribution for 2018.x versions</name>
-    <description>This hangar provides aircraft officially supported and maintained 
-    by the FlightGear project, under a free-software license. These aircraft
-    are compatible with FlightGear versions from 2018.</description>
-    
-   </template>
-</PropertyList>
--- a/catalog/stable-2018-catalog/zip-excludes.lst
+++ b/catalog/stable-2018-catalog/zip-excludes.lst
@@ -1,5 +0,0 @@
-*/.svn/*
-*.xcf
-*.blend
-*.psd
-*~
--- a/catalog/testData/Aircraft/c150/Resources/crazy_20Gb_file
+++ b/catalog/testData/Aircraft/c150/Resources/crazy_20Gb_file
--- a/catalog/testData/Aircraft/c150/Resources/x.xcf.gz
+++ b/catalog/testData/Aircraft/c150/Resources/x.xcf.gz
--- a/catalog/testData/Aircraft/c150/gimp.xcf.gz
+++ b/catalog/testData/Aircraft/c150/gimp.xcf.gz
--- a/catalog/testData/Aircraft/c150/zip-excludes.lst
+++ b/catalog/testData/Aircraft/c150/zip-excludes.lst
@@ -1 +0,0 @@
-*.xcf*
--- a/catalog/testData/Aircraft/dc3/.svn/entries
+++ b/catalog/testData/Aircraft/dc3/.svn/entries
@@ -1 +0,0 @@
-12
--- a/catalog/testData/Aircraft/dc3/Resources/BluePrints/test.png
+++ b/catalog/testData/Aircraft/dc3/Resources/BluePrints/test.png
--- a/catalog/testData/Aircraft/dc3/Resources/massive_10Gb_file
+++ b/catalog/testData/Aircraft/dc3/Resources/massive_10Gb_file
--- a/catalog/testData/Aircraft/dc3/gimp.xcf
+++ b/catalog/testData/Aircraft/dc3/gimp.xcf
--- a/catalog/test_catalog.py
+++ b/catalog/test_catalog.py
@@ -3,13 +3,8 @@
 import unittest
 import sgprops
 import os
-from os.path import join
 import catalog
-import lxml.etree as ET
-from shutil import rmtree
-from tempfile import mkdtemp
-import zipfile
-
+import xml.etree.cElementTree as ET

 catalog.quiet = True

@@ -98,7 +93,7 @@ class UpdateCatalogTests(unittest.TestCase):
        catalog_node = ET.Element('PropertyList')
        catalog_root = ET.ElementTree(catalog_node)

-        pkgNode = catalog.make_aircraft_node('f16', pkg, variants, "http://foo.com/testOutput/", [])
+        pkgNode = catalog.make_aircraft_node('f16', pkg, variants, "http://foo.com/testOutput/")
        catalog_node.append(pkgNode)

        # write out so we can parse using sgprops
@@ -177,7 +172,7 @@ class UpdateCatalogTests(unittest.TestCase):
        catalog_node = ET.Element('PropertyList')
        catalog_root = ET.ElementTree(catalog_node)

-        pkgNode = catalog.make_aircraft_node('dc3', pkg, variants, "http://foo.com/testOutput/", [])
+        pkgNode = catalog.make_aircraft_node('dc3', pkg, variants, "http://foo.com/testOutput/")
        catalog_node.append(pkgNode)

        if not os.path.isdir("testOutput"):
@@ -215,7 +210,7 @@ class UpdateCatalogTests(unittest.TestCase):
        catalog_node = ET.Element('PropertyList')
        catalog_root = ET.ElementTree(catalog_node)

-        pkgNode = catalog.make_aircraft_node('c150', pkg, variants, "http://foo.com/testOutput/", [])
+        pkgNode = catalog.make_aircraft_node('c150', pkg, variants, "http://foo.com/testOutput/")
        catalog_node.append(pkgNode)

        if not os.path.isdir("testOutput2"):
@@ -239,85 +234,5 @@ class UpdateCatalogTests(unittest.TestCase):
        self.assertFalse(parsedPkgNode.hasChild('minimum-fg-version'));
        self.assertFalse(parsedPkgNode.hasChild('variant'));

-
-class ZipTests(unittest.TestCase):
-    """Specific craft zip file creation tests."""
-
-    def check_zip(self, file_name, expected_content=None):
-        """General checks for the zip file."""
-
-        # Check for file existence.
-        self.assert_(os.access(file_name, os.F_OK))
-
-        # Check the contents.
-        file = zipfile.ZipFile(file_name)
-        zip_contents = file.namelist()
-        if len(zip_contents) != len(expected_content):
-            print("Zip contents:\n    %s" % zip_contents)
-            print("Expected contents:\n    %s" % expected_content)
-            self.assertEqual(len(zip_contents), len(expected_content))
-        for i in range(len(zip_contents)):
-            self.assertEqual(zip_contents[i], expected_content[i])
-
-
-    def setUp(self):
-        """Common set up for these system tests."""
-
-        # Store the current directory.
-        self._cwd = os.getcwd()
-
-        # Create a temporary directory for dumping files.
-        self.tmpdir = mkdtemp()
-
-
-    def tearDown(self):
-        """Delete temp files."""
-
-        # Force return to the correct directory.
-        os.chdir(self._cwd)
-
-        # Remove temporary file (if there is a deletion failure, continue to allow the test suite to survive).
-        try:
-            rmtree(self.tmpdir)
-        except:
-            pass
-
-        # Remove the variable.
-        del self.tmpdir
-
-
-    def test_zip_creation(self):
-        """Test the creation of a basic craft zip archive."""
-
-        # Create a basic zip file.
-        name = "c172"
-        catalog.make_aircraft_zip(join(os.getcwd(), "testData/Aircraft"), name, join(self.tmpdir, name+'.zip'), join(os.getcwd(), 'fgaddon-catalog/zip-excludes.lst'), verbose=False)
-
-        # Checks.
-        self.check_zip(join(self.tmpdir, name+'.zip'), expected_content=['c172/c172-set.xml'])
-
-
-    def test_zip_exclusion_global(self):
-        """Test file exclusion in a craft zip archive using the global catalog exclusion list."""
-
-        # Create a basic zip file.
-        name = "dc3"
-        catalog.make_aircraft_zip(join(os.getcwd(), "testData/Aircraft"), name, join(self.tmpdir, name+'.zip'), join(os.getcwd(), 'fgaddon-catalog/zip-excludes.lst'), verbose=False)
-
-        # Checks.
-        self.check_zip(join(self.tmpdir, name+'.zip'), expected_content=['dc3/dc3-set.xml'])
-
-
-    def test_zip_exclusion_local(self):
-        """Test file exclusion in a craft zip archive using a local catalog exclusion list."""
-
-        # Create a basic zip file.
-        name = "c150"
-        catalog.make_aircraft_zip(join(os.getcwd(), "testData/Aircraft"), name, join(self.tmpdir, name+'.zip'), join(os.getcwd(), 'testData/Aircraft/c150/zip-excludes.lst'), verbose=False)
-
-        # Checks.
-        self.check_zip(join(self.tmpdir, name+'.zip'), expected_content=['c150/c150-set.xml', 'c150/Resources/crazy_20Gb_file'])
-
-
 if __name__ == '__main__':
    unittest.main()
--- a/catalog/update-catalog.py
+++ b/catalog/update-catalog.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/python

 import argparse
 import datetime
@@ -13,14 +13,9 @@ import sgprops
 import sys
 import catalogTags
 import catalog
-from catalog import make_aircraft_node, make_aircraft_zip, parse_config_file, parse_template_file
-

 CATALOG_VERSION = 4

-# The Python version.
-PY_VERSION = sys.version_info[0]
-
 parser = argparse.ArgumentParser()
 parser.add_argument("--update", help="Update/pull SCM source",
                    action="store_true")
@@ -29,13 +24,10 @@ parser.add_argument("--no-update",
                    action="store_true")
 parser.add_argument("--clean", help="Force regeneration of all zip files",
                    action="store_true")
-parser.add_argument("--quiet", help="Only print warnings and errors",
-                    action="store_true")
 parser.add_argument("dir", help="Catalog directory")
 args = parser.parse_args()

 includes = []
-mirrors = [] # mirror base URLs

 # xml node (robust) get text helper
 def get_xml_text(e):
@@ -48,11 +40,6 @@ def get_xml_text(e):
 def last_change_date_svn(dir):
    command = [ 'svn', 'info', dir ]
    result = subprocess.check_output( command )
-
-    # Python 3 compatibility.
-    if PY_VERSION == 3:
-        result = result.decode('utf8')
-
    match = re.search('Last Changed Date: (\d+)\-(\d+)\-(\d+)', result)
    if match:
        rev_str = match.group(1) + match.group(2) + match.group(3)
@@ -76,9 +63,23 @@ def scan_dir_for_change_date_mtime(path):
                maxsec = mtime
    return maxsec

+def make_aircraft_zip(repo_path, name, zip_file):
+    print "Updating:", name + '.zip'
+    savedir = os.getcwd()
+    os.chdir(repo_path)
+    if os.path.exists(zip_file):
+        os.remove(zip_file)
+    command = ['zip', '-rq', '-9']
+    if os.path.exists(zip_excludes):
+        command += ['-x@' + zip_excludes]
+    else:
+        print "warning: no zip-excludes.lst file provided", zip_excludes
+    command += [zip_file, name]
+    subprocess.call(command)
+    os.chdir(savedir)

 def get_md5sum(file):
-    f = open(file, 'rb')
+    f = open(file, 'r')
    md5sum = hashlib.md5(f.read()).hexdigest()
    f.close()
    return md5sum
@@ -90,7 +91,7 @@ def copy_previews_for_variant(variant, package_name, package_dir, previews_dir):
    for preview in variant['previews']:
        preview_src = os.path.join(package_dir, preview['path'])
        preview_dst = os.path.join(previews_dir, package_name + '_' + preview['path'])
-        #print(preview_src, preview_dst, preview['path'])
+        #print preview_src, preview_dst, preview['path']
        dir = os.path.dirname(preview_dst)
        if not os.path.isdir(dir):
            os.makedirs(dir)
@@ -128,7 +129,6 @@ def process_aircraft_dir(name, repo_path):
    global output_dir
    global valid_zips
    global previews_dir
-    global mirrors

    aircraft_dir = os.path.join(repo_path, name)
    if not os.path.isdir(aircraft_dir):
@@ -136,14 +136,12 @@ def process_aircraft_dir(name, repo_path):

    (package, variants) = catalog.scan_aircraft_dir(aircraft_dir, includes)
    if package == None:
-        if not args.quiet:
-            print("skipping: %s (no -set.xml files)" % name)
+        print "skipping:", name, "(no -set.xml files)"
        return

-    if not args.quiet:
-        print("%s:" % name)
+    print "%s:" % name,

-    package_node = make_aircraft_node(name, package, variants, download_base, mirrors)
+    package_node = catalog.make_aircraft_node(name, package, variants, download_base)

    download_url = download_base + name + '.zip'
    if 'thumbnail' in package:
@@ -162,21 +160,19 @@ def process_aircraft_dir(name, repo_path):
        d = datetime.datetime.utcfromtimestamp(dir_mtime)
        rev = d.strftime("%Y%m%d")
    package_node.append( catalog.make_xml_leaf('revision', rev) )
-    #print("rev: %s" % rev)
-    #print("dir mtime: %s" % dir_mtime)
+    #print "rev:", rev
+    #print "dir mtime:", dir_mtime
    zipfile = os.path.join( output_dir, name + '.zip' )
    valid_zips.append(name + '.zip')
    if not os.path.exists(zipfile) \
       or dir_mtime > os.path.getmtime(zipfile) \
       or args.clean:
        # rebuild zip file
-        if not args.quiet:
-            print("updating: %s" % zipfile)
-        make_aircraft_zip(repo_path, name, zipfile, zip_excludes, verbose=not args.quiet)
+        print "updating:", zipfile
+        make_aircraft_zip(repo_path, name, zipfile)
        md5sum = get_md5sum(zipfile)
    else:
-        if not args.quiet:
-            print("(no change)")
+        print "(no change)"
        if md5sum == "":
            md5sum = get_md5sum(zipfile)
    filesize = os.path.getsize(zipfile)
@@ -190,18 +186,6 @@ def process_aircraft_dir(name, repo_path):
    else:
        md5sum_root.append( catalog.make_xml_leaf('aircraft_' + name, md5sum) )

-    # handle sharing
-    if share_md5sum_root != None:
-        sharedNode = share_md5sum_root.find(str('aircraft_' + name))
-        if node != None:
-            shared_md5 = get_xml_text(sharedNode)
-            if shared_md5 == md5sum:
-                if not args.quiet:
-                    print("Sharing zip with share catalog for: %s" % name)
-                os.remove(zipfile)
-                os.symlink(os.path.join( share_output_dir, name + '.zip' ), zipfile)
-
-
    # handle thumbnails
    copy_thumbnails_for_package(package, variants, name, aircraft_dir, thumbnail_dir)

@@ -218,12 +202,19 @@ def process_aircraft_dir(name, repo_path):
 #    return (md5, file_size)

 if not os.path.isdir(args.dir):
-    print("A valid catalog directory must be provided")
+    print "A valid catalog directory must be provided"
    exit(0)

 parser = ET.XMLParser(remove_blank_text=True)
-config_node = parse_config_file(parser=parser, file_name=os.path.join(args.dir, 'catalog.config.xml'))
-template_node = parse_template_file(parser=parser, file_name=os.path.join(args.dir, 'template.xml'))
+
+config_file = os.path.join(args.dir, 'catalog.config.xml')
+config = ET.parse(config_file, parser)
+config_node = config.getroot()
+
+template_file = os.path.join(args.dir, 'template.xml')
+template = ET.parse(template_file, parser)
+template_root = template.getroot()
+template_node = template_root.find('template')

 md5sum_file = os.path.join(args.dir, 'md5sum.xml')
 if os.path.exists(md5sum_file):
@@ -233,31 +224,11 @@ else:
    md5sum_root = ET.Element('PropertyList')
    md5sum_tree = ET.ElementTree(md5sum_root)

-# share .zip files with other output dirs
-share_output_dir = get_xml_text(config_node.find('share-output'))
-share_md5_file = get_xml_text(config_node.find('share-md5-sums'))
-if share_output_dir != '' and share_md5_file != '':
-    print("Output shared with: %s" % share_output_dir)
-    share_md5sum_tree = ET.parse(share_md5_file, parser)
-    share_md5sum_root = share_md5sum_tree.getroot()
-else:
-    share_md5sum_root = None
-
-# SCM providers
 scm_list = config_node.findall('scm')
 upload_node = config_node.find('upload')
-
-download_base = None
-for i in config_node.findall("download-url"):
-    url = get_xml_text(i)
-    if not url.endswith('/'):
-        url += '/'
-
-    if download_base == None:
-        # download_base is the first entry
-        download_base = url
-    else:
-        mirrors.append(url)
+download_base = get_xml_text(config_node.find('download-url'))
+if not download_base.endswith('/'):
+    download_base += '/'

 output_dir = get_xml_text(config_node.find('local-output'))
 if output_dir == '':
@@ -279,37 +250,31 @@ zip_excludes = os.path.realpath(tmp)
 for i in config_node.findall("include-dir"):
    path = get_xml_text(i)
    if not os.path.exists(path):
-        print("Skipping missing include path: %s" % path)
+        print "Skipping missing include path:", path
        continue
    includes.append(path)

 # freshen repositories
 if args.no_update:
-    print('Skipping repository updates.')
+    print 'Skipping repository updates.'
 else:
    cwd = os.getcwd()
    for scm in scm_list:
-        # XML mandated skip, with command line override.
-        if not args.update:
-            skip = get_xml_text(scm.find('update'))
-            if skip == 'false':
-                continue
-
        repo_type = get_xml_text(scm.find('type'))
        repo_path = get_xml_text(scm.find('path'))
        includes.append(repo_path)

        if repo_type == 'svn':
-            print("SVN update: %s" % repo_path)
+            print 'SVN update:', repo_path
            subprocess.call(['svn', 'update', repo_path])
        elif repo_type == 'git':
-            print("GIT pull: %s" % repo_path)
+            print 'GIT pull:', repo_path
            os.chdir(repo_path)
            subprocess.call(['git','pull'])
        elif repo_type == 'no-scm':
-            print("No update of unmannaged files: %s" % repo_path)
+            print "No update of unmannaged files:", repo_path
        else:
-            print("Unknown scm type: %s %s" % (scm, repo_path))
+            print "Unknown scm type:", scm, repo_path
    os.chdir(cwd)

 # names of zip files we want (so we can identify/remove orphans)
@@ -331,27 +296,15 @@ for scm in scm_list:
    skip_list = []
    for s in skip_nodes:
        skip_list.append(get_xml_text(s))
-
-    # Selective list of craft to include, overriding the skip list.
-    include_nodes = scm.findall('include')
-    include_list = []
-    for node in include_nodes:
-        include_list.append(get_xml_text(node))
-    if len(include_list):
-        skip_list = []
-
-    print("Skip list: %s" % skip_list)
-    print("Include list: %s" % include_list)
-
+    print 'skip list:', skip_list
    names = os.listdir(repo_path)
    for name in sorted(names, key=lambda s: s.lower()):
-        if name in skip_list or (len(include_list) and name not in include_list):
-            if not args.quiet:
-                print("Skipping: %s" % name)
+        if name in skip_list:
+            print "skipping:", name
            continue

        # process each aircraft in turn
-        # print("%s %s" % (name, repo_path))
+        # print name, repo_path
        process_aircraft_dir(name, repo_path)

 # write out the master catalog file
@@ -359,11 +312,11 @@ cat_file = os.path.join(output_dir, 'catalog.xml')
 catalog_root.write(cat_file, encoding='utf-8', xml_declaration=True, pretty_print=True)

 # write out the md5sum cache file
-print(md5sum_file)
+print md5sum_file
 md5sum_tree.write(md5sum_file, encoding='utf-8', xml_declaration=True, pretty_print=True)

 # look for orphaned zip files
 files = os.listdir(output_dir)
 for file in files:
    if file.endswith('.zip')and not file in valid_zips:
-        print("orphaned zip: %s" % file)
+        print "orphaned zip:", file
--- a/download_and_compile.sh
+++ b/download_and_compile.sh
--- a/fg-from-scratch/.gitignore
+++ b/fg-from-scratch/.gitignore
@@ -1,2 +0,0 @@
-scratch-*/
-vcpkg-git/
--- a/fg-from-scratch/README.md
+++ b/fg-from-scratch/README.md
@@ -1,40 +1,41 @@
 ## fg-from-scratch
 Windows utility to download, compile, and stage TerraGear and its dependencies
-Copyright (C) 2018-2019  Scott Giese (xDraconian) scttgs0@gmail.com
+Copyright (C) 2018  Scott Giese (xDraconian) scttgs0@gmail.com

 ### Purpose:
-Simplify the process of producing a working version of the OSG, SimGear, FlightGear, and TerraGear for Windows users.
+Simplify the process of producing a working version of the TerraGear tools for Windows users.
 If you find this script useful, or not useful, please share your experience with me via a brief email.

 ### Approach:
 Rather than leveraging the popular Win.3rdParty download, this script compiles all dependencies
 on your hardware.  This eliminates many of the problems associated with mixed compilation in which
-your compiled binary comes into conflict with 3rd-party binaries.
+your compiled binary become in conflict with 3rd-party binaries.

-vcpkg is leveraged to download and compile all the dependencies required.
+vcpkg is leveraged to download and compile all the dependencies required by TerraGear.
+
+This script could be expanded to include compiling FlightGear and/or any of the other FlightGear
+submodules (FGCom, Atlas, OpenRadar, etc.)

 ### Supported Platform:
 Windows 10

 ### Prerequisites:
-	Visual Studio Community 2017 +
+	Visual Studio Community 2017
 		https://www.visualstudio.com/downloads/
 		Include the C++ package which includes the MSVC 19.14 compiler

-	CMake 3.11.3 +
+	CMake 3.11.3
 		https://cmake.org/download/
 		The script assumes the installation folder is c:\Program Files\.

-	Qt 5.10.1 +
+	Qt 5.10.1
 		https://www.qt.io/download/
 		The script assumes the installation folder is C:\Qt\.

-	Git 2.17.1 +
+	Git 2.17.1
 		https://git-scm.com/download/win/
 		The script assumes the installation folder is reflected on your PATH.

-Author's configuration: Visual Studio Community 2019, CMake 3.15.3, Qt 5.13.1, Git  2.18.0
-
 ### Recommended:

 Before running the script for the first time, set this environment variable:
@@ -46,29 +47,23 @@ You can execute the above command via a Command Terminal or via Powershell Admin
 ### Usage:
 The script is intended to be run multiple times. During the first execution, all the packages are downloaded and compiled. Any time the script is executed afterward, the packages will update themselves.

-<i>Note: Because failures can occur, the script will continue to download packages even after the first execution.</i>
+<i>Note: Because failures can sometimes occur, the script will download packages after the first execution.  Once you confirm that all packages have successfully been downloaded, you can optimize the script by adding <b>REM</b> at the beginning of the line. Refer to the comments within the script.</i>

 Run the command script interactively.  No log is produced.

 	fg-from-scratch.cmd

-Run the command script and routes STDOUT and STDERR to a log file.
+Runs the command script and routes STDOUT and STDERR to a log file. **The prompts have been removed, so it is no longer necessary to monitor the log while it is running.**

 	fg-from-scratch.cmd > scratch.log 2>&1

-**Fix for the "White Text" issue** - pass either -wt or - -whitetext as an argument:
-
-	fg-from-scratch.cmd -wt > scratch.log 2>&1
-
-The above command will force the usage of James' customized OSG source repo to leverage his workaround.
-
 Options for monitoring the log file while the script is running:
 Start the script and then
 - Load the log file into Notepad++ (https://notepad-plus-plus.org/).
 - Turn on feature "Monitor" via Notepad++
 - **[Preferred]** Load the log file into WinTail (http://www.baremetalsoft.com/wintail/)

-### TerraGear Example Project
+### Example Project
 Refer to CustomSceneryProjects/Test folder for an example of scenery generation.

 	generate.cmd > generate.log 2>&1
--- a/fg-from-scratch/fg-from-scratch.cmd
+++ b/fg-from-scratch/fg-from-scratch.cmd
@@ -1,4 +1,4 @@
-@echo OFF
+@ECHO OFF

 REM fg-from-scratch - Windows utility to download, compile, and stage TerraGear and its dependencies
 REM Copyright (C) 2018  Scott Giese (xDraconian) scttgs0@gmail.com
@@ -17,382 +17,193 @@ REM You should have received a copy of the GNU General Public License
 REM along with this program; if not, write to the Free Software
 REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-REM Defaults
-set ROOT_DIR=%CD%
-set WHITE_TEXT_FIX=0
-set OSG_SOURCE_PATH=scratch-source/openscenegraph-3.6-git
-set OSG_BUILD_PATH=scratch-build/openscenegraph-3.6
-set WT_GDAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include
-set WT_GDAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib
-set WT_GDAL_LIBRARY_DEBUG=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/gdald.lib
+SET ROOT_DIR=%CD%
+SET PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/bin;%PATH%
+SET CMAKE_TOOLCHAIN="Visual Studio 15 2017 Win64"
+SET QT5x64=C:/Qt/5.10.1/msvc2017_64

-REM Process arguments
-:parse
-if "%~1"=="" goto endparse
-if "%~1"=="-wt" (
-    set WHITE_TEXT_FIX=1
-    set OSG_SOURCE_PATH=scratch-source/openscenegraph-fix-git
-    set OSG_BUILD_PATH=scratch-build/openscenegraph-fix
-	set WT_GDAL_INCLUDE_DIR=
-	set WT_GDAL_LIBRARY=
-	set WT_GDAL_LIBRARY_DEBUG=
-)
-if "%~1"=="--whitetext" (
-    set WHITE_TEXT_FIX=1
-    set OSG_SOURCE_PATH=scratch-source/openscenegraph-fix-git
-    set OSG_BUILD_PATH=scratch-build/openscenegraph-fix
-	set WT_GDAL_INCLUDE_DIR=
-	set WT_GDAL_LIBRARY=
-	set WT_GDAL_LIBRARY_DEBUG=
-)
-SHIFT
-goto parse
-:endparse
-
-echo White Text Fix: %WHITE_TEXT_FIX%
-echo %OSG_SOURCE_PATH%
-echo %OSG_BUILD_PATH%
-
-set PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/bin;%ROOT_DIR%/vcpkg-git/installed/x64-windows/include;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib;%PATH%
-
-REM Determine location of Qt5
-set QT_SELECT=qt5
-for /f %%i in ('"qtpaths.exe --install-prefix"') do set QT5x64=%%i
-set QT5x64_LIB=%QT5x64%/lib
-set QT5x64_CMAKE=%QT5x64_LIB%/cmake
-echo QT Folder: %QT5x64%
-
-REM Determine CMake toolchain
-set CMAKE_TOOLCHAIN=Visual Studio 14 2015 Win64
-for /f %%v in ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property catalog_productlineversion') do set VSx64=%%v
-if %VSx64%==2019 (set CMAKE_TOOLCHAIN="Visual Studio 16 2019")
-if %VSx64%==2017 (set CMAKE_TOOLCHAIN="Visual Studio 15 2017 Win64")
-if %VSx64%==2015 (set CMAKE_TOOLCHAIN="Visual Studio 14 2015 Win64")
-echo CMake Toolchain: %CMAKE_TOOLCHAIN%
-
-if not exist vcpkg-git/NUL (
+IF NOT EXIST vcpkg-git/NUL (
 	echo Preparing to install external libraries via vcpkg . . .
 	git clone https://github.com/Microsoft/vcpkg.git vcpkg-git

 	echo Compiling vcpkg
 	cd vcpkg-git
-	call .\bootstrap-vcpkg
+	call ./bootstrap-vcpkg

 	echo Compiling external libraries . . .
-	vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libpng libxml2 mpfr openal-soft openjpeg openssl plib sdl2 tiff zlib
-) else (
+	vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 openal-soft openjpeg openssl plib sdl2 tiff zlib
+) ELSE (
 	echo Updating vcpkg . . .
 	cd vcpkg-git
 	git pull

-REM	for /f "delims=" %%G in ('"git pull"') do if not %%G == "Already up to date." (
-	echo Compiling vcpkg
-	call .\bootstrap-vcpkg
-REM		break
-REM	)
-
 	echo Updating external libraries . . .
 	vcpkg update
 	vcpkg upgrade --triplet x64-windows --no-dry-run

-	echo Compiling external libraries . . .
-	vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 libpng mpfr openal-soft openjpeg openssl plib sdl2 tiff zlib
+    REM Okay to comment out this line once all the packages have been confirmed to have been installed
+	vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 openal-soft openjpeg openssl plib sdl2 tiff zlib
 )
 cd %ROOT_DIR%

-if not exist scratch-source/NUL (
-	mkdir scratch-source
-)
-if not exist scratch-build/NUL (
-	mkdir scratch-build
-)
-if not exist scratch-install/NUL (
-	mkdir scratch-install
-)
-
-if %WHITE_TEXT_FIX%==1 (
-    if not exist scratch-build/openscenegraph-fix/NUL (
-	    mkdir scratch-build\openscenegraph-fix
-    )
-    if not exist scratch-source/openscenegraph-fix-git/NUL (
-	    echo Downloading OpenSceneGraph . . .
-	    git clone -b fgfs-342-1 https://github.com/zakalawe/osg.git scratch-source/openscenegraph-fix-git
-    ) else (
-	    echo Updating OpenSceneGraph . . .
-	    cd scratch-source/openscenegraph-fix-git
-	    git pull
-    )
-) else (
-    if not exist scratch-build/openscenegraph-3.6/NUL (
-	    mkdir scratch-build\openscenegraph-3.6
-    )
-    if not exist scratch-source/openscenegraph-3.6-git/NUL (
-	    echo Downloading OpenSceneGraph . . .
-	    git clone -b OpenSceneGraph-3.6 https://github.com/openscenegraph/OpenSceneGraph.git scratch-source/openscenegraph-3.6-git
-    ) else (
-	    echo Updating OpenSceneGraph . . .
-	    cd scratch-source/openscenegraph-3.6-git
-	    git pull
-    )
+IF NOT EXIST openscenegraph-3.4-git/NUL (
+	mkdir openscenegraph-3.4-build
+	echo Downloading OpenSceneGraph . . .
+	git clone -b OpenSceneGraph-3.4 https://github.com/openscenegraph/OpenSceneGraph.git openscenegraph-3.4-git
+) ELSE (
+	echo Updating OpenSceneGraph . . .
+	cd openscenegraph-3.4-git
+	git pull
 )
 cd %ROOT_DIR%

-if not exist scratch-build/simgear/NUL (
-	mkdir scratch-build\simgear
-)
-if not exist scratch-source/simgear-git/NUL (
+IF NOT EXIST simgear-git/NUL (
+	mkdir simgear-build
 	echo Downloading SimGear . . .
-	git clone -b next https://git.code.sf.net/p/flightgear/simgear scratch-source/simgear-git
-) else (
+	git clone -b next https://git.code.sf.net/p/flightgear/simgear simgear-git
+) ELSE (
 	echo Updating SimGear . . .
-	cd scratch-source/simgear-git
+	cd simgear-git
 	git pull
 )
 cd %ROOT_DIR%

-if not exist scratch-build/flightgear/NUL (
-	mkdir scratch-build\flightgear
-)
-if not exist scratch-source/flightgear-git/NUL (
+IF NOT EXIST flightgear-git/NUL (
+	mkdir flightgear-build
 	echo Downloading FlightGear . . .
-	git clone -b next https://git.code.sf.net/p/flightgear/flightgear scratch-source/flightgear-git
-) else (
+	git clone -b next https://git.code.sf.net/p/flightgear/flightgear flightgear-git
+) ELSE (
 	echo Updating FlightGear . . .
-	cd scratch-source/flightgear-git
+	cd flightgear-git
 	git pull
 )
 cd %ROOT_DIR%

-if not exist scratch-build/terragear/NUL (
-	mkdir scratch-build\terragear
-)
-if not exist scratch-source/terragear-git/NUL (
+IF NOT EXIST terragear-git/NUL (
+	mkdir terragear-build
 	echo Downloading TerraGear . . .
-	git clone -b next https://git.code.sf.net/p/flightgear/terragear scratch-source/terragear-git
-) else (
+	git clone -b next https://git.code.sf.net/p/flightgear/terragear terragear-git
+) ELSE (
 	echo Updating TerraGear . . .
-	cd scratch-source/terragear-git
+	cd terragear-git
 	git pull
 )
 cd %ROOT_DIR%

-REM -DQt5Core_DIR=%QT5x64_CMAKE%/Qt5Core ^
-REM -DQt5Gui_DIR=%QT5x64_CMAKE%/Qt5Gui ^
-REM -DQt5OpenGL_DIR=%QT5x64_CMAKE%/Qt5OpenGL ^
-REM -DQt5Widgets_DIR=%QT5x64_CMAKE%/Qt5Widgets ^
-
-echo Compiling OpenSceneGraph . . .
-cd %OSG_BUILD_PATH%
-cmake ..\..\%OSG_SOURCE_PATH% -G %CMAKE_TOOLCHAIN% ^
-	-DCMAKE_CONFIGURATION_TYPES:STRING=Debug;Release ^
-	-DCMAKE_BUILD_TYPE:STRING=Release ^
-	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/scratch-install ^
-	-DCMAKE_PREFIX_PATH:STRING=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib ^
+ECHO Compiling OpenSceneGraph . . .
+cd openscenegraph-3.4-build
+cmake ..\openscenegraph-3.4-git -G %CMAKE_TOOLCHAIN% ^
 	-DACTUAL_3RDPARTY_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
+	-DCMAKE_CONFIGURATION_TYPES=Debug;Release ^
+	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/Stage ^
 	-DOSG_USE_UTF8_FILENAME:BOOL=1 ^
 	-DWIN32_USE_MP:BOOL=1 ^
-	-DCURL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DCURL_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libcurl.lib ^
-	-DCURL_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/libcurl.lib ^
-	-DFREETYPE_INCLUDE_DIR_ft2build:PATH=%ROOT_DIR%/vcpkg-git/packages/freetype_x64-windows/include ^
-	-DFREETYPE_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/freetype.lib ^
-	-DFREETYPE_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/freetyped.lib ^
-	-DGDAL_INCLUDE_DIR:PATH=%WT_GDAL_INCLUDE_DIR% ^
-	-DGDAL_LIBRARY:FILEPATH=%WT_GDAL_LIBRARY% ^
-	-DGDAL_LIBRARY_DEBUG:FILEPATH=%WT_GDAL_LIBRARY_DEBUG% ^
-	-DGLUT_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DGLUT_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/freeglut.lib ^
-	-DGLUT_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/freeglut.lib ^
-	-DJPEG_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DJPEG_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/jpeg.lib ^
-	-DJPEG_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/jpeg.lib ^
-	-DLIBXML2_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DLIBXML2_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libxml2.lib ^
-	-DLIBXML2_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/libxml2.lib ^
-	-DPNG_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DPNG_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libpng16.lib ^
-	-DPNG_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/libpng16d.lib ^
-	-DSDL2_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DSDL2_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/SDL2.lib ^
-	-DSDL2MAIN_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/manual-link/SDL2main.lib ^
-	-DTIFF_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DTIFF_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/tiff.lib ^
-	-DTIFF_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/tiffd.lib ^
-	-DZLIB_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DZLIB_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib ^
-	-DZLIB_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/zlibd.lib
+	-DCURL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DCURL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libcurl.lib ^
+	-DFREETYPE_INCLUDE_DIR_ft2build=%ROOT_DIR%/vcpkg-git/packages/freetype_x64-windows/include ^
+	-DFREETYPE_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DFREETPE_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/freetype.lib ^
+	-DGDAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DGDAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
+	-DGLUT_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DGLUT_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/freeglut.lib ^
+	-DJPEG_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DJPEG_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/jpeg.lib ^
+	-DLIBXML2_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DLIBXML2_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libxml2.lib ^
+	-DPNG_PNG_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DPNG_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libpng16.lib ^
+	-DSDL2_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DSDL2_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/SDL2.lib ^
+	-DSDL2MAIN_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/manual-link/SDL2main.lib ^
+	-DTIFF_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DTIFF_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/tiff.lib ^
+	-DZLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DZLIB_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib
 cmake --build . --config Release --target INSTALL
 cd %ROOT_DIR%

-echo Compiling SimGear . . .
-cd scratch-build\simgear
-cmake ..\..\scratch-source\simgear-git -G  %CMAKE_TOOLCHAIN% ^
-	-DCMAKE_CONFIGURATION_TYPES:STRING=Debug;Release ^
-	-DCMAKE_BUILD_TYPE:STRING=Release ^
-	-DMSVC_3RDPARTY_ROOT:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
-	-DCMAKE_PREFIX_PATH:STRING=%ROOT_DIR%/scratch-install/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib ^
-	-DCMAKE_INCLUDE_PATH:STRING=%ROOT_DIR%/scratch-install/include;%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/scratch-install ^
+ECHO Compiling SimGear . . .
+cd simgear-build
+cmake ..\simgear-git -G  %CMAKE_TOOLCHAIN% ^
+	-DCMAKE_BUILD_TYPE=Release ^
+	-DMSVC_3RDPARTY_ROOT=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
+	-DCMAKE_PREFIX_PATH:PATH=%ROOT_DIR%/Stage/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib ^
+	-DCMAKE_CONFIGURATION_TYPES=Debug;Release ^
+	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/Stage ^
 	-DOSG_FSTREAM_EXPORT_FIXED:BOOL=1 ^
 	-DENABLE_GDAL:BOOL=1 ^
 	-DENABLE_OPENMP:BOOL=1 ^
 	-DUSE_AEONWAVE:BOOL=0 ^
-	-DBoost_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DBoost_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
-	-DCURL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DCURL_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/libcurl.lib ^
-	-DCURL_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libcurl.lib ^
-	-DGDAL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DGDAL_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
-	-DOPENAL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DOPENAL_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/OpenAL32.lib ^
-	-DOPENTHREADS_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOPENTHREADS_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/OpenThreads.lib ^
-	-DOPENTHREADS_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGDB_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGDB_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGDB_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgDB.lib ^
-	-DOSGGA_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGGA_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGGA_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgGA.lib ^
-	-DOSGPARTICLE_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGPARTICLE_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGPARTICLE_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgParticle.lib ^
-	-DOSGSIM_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGSIM_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGSIM_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgSim.lib ^
-	-DOSGTEXT_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGTEXT_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGTEXT_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgText.lib ^
-	-DOSGUTIL_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGUTIL_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGUTIL_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgUtil.lib ^
-	-DOSGVIEWER_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGVIEWER_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGVIEWER_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgViewer.lib ^
-	-DOSG_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSG_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSG_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osg.lib ^
-	-DZLIB_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DZLIB_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/zlibd.lib ^
-	-DZLIB_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib
+	-DBOOST_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DBOOST_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
+	-DCURL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DCURL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libcurl.lib ^
+	-DGDAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DGDAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
+	-DOPENAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DOPENAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/OpenAL32.lib ^
+	-DZLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DZLIB_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib
 cmake --build . --config Release --target INSTALL
 cd %ROOT_DIR%

-REM -DENABLE_GDAL:BOOL=1 ^
-REM	-DENABLE_OPENMP:BOOL=1 ^
-REM	-DUSE_AEONWAVE:BOOL=0 ^
-
-echo Compiling FlightGear . . .
-cd scratch-build\flightgear
-cmake ..\..\scratch-source\flightgear-git -G  %CMAKE_TOOLCHAIN% ^
-	-DCMAKE_CONFIGURATION_TYPES:STRING=Debug;Release ^
-	-DCMAKE_BUILD_TYPE:STRING=Release ^
-	-DMSVC_3RDPARTY_ROOT:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
-	-DCMAKE_PREFIX_PATH:STRING=%ROOT_DIR%/scratch-install/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib;%QT5x64_LIB% ^
-	-DCMAKE_INCLUDE_PATH:STRING=%ROOT_DIR%/scratch-install/include;%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/scratch-install ^
-	-DSimGear_DIR:PATH=%ROOT_DIR%/scratch-install/lib/cmake/SimGear ^
+ECHO Compiling FlightGear . . .
+cd flightgear-build
+cmake ..\flightgear-git -G  %CMAKE_TOOLCHAIN% ^
+	-DMSVC_3RDPARTY_ROOT=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
+	-DCMAKE_PREFIX_PATH:PATH=%ROOT_DIR%/Stage/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib;%QT5x64% ^
+	-DCMAKE_CONFIGURATION_TYPES=Debug;Release ^
+	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/Stage ^
 	-DOSG_FSTREAM_EXPORT_FIXED:BOOL=1 ^
+	-DENABLE_GDAL:BOOL=1 ^
+	-DENABLE_OPENMP:BOOL=1 ^
 	-DENABLE_JSBSIM:BOOL=1 ^
 	-DENABLE_GPSSMOOTH:BOOL=1 ^
-	-DENABLE_FGVIEWER:BOOL=0 ^
-	-DENABLE_FGELEV:BOOL=0 ^
+	-DENABLE_FGVIEWER:BOOL=1 ^
 	-DENABLE_STGMERGE:BOOL=0 ^
 	-DWITH_FGPANEL:BOOL=0 ^
+	-DUSE_AEONWAVE:BOOL=0 ^
 	-DHAVE_CONFIG_H:BOOL=0 ^
-	-DBoost_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DBoost_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows ^
-	-DFREETYPE_INCLUDE_DIR_ft2build:PATH=%ROOT_DIR%/vcpkg-git/packages/freetype_x64-windows/include ^
-	-DFREETYPE_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/freetype.lib ^
-	-DFREETYPE_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/freetyped.lib ^
-	-DGDAL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DGDAL_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
-	-DOPENAL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DOPENAL_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/OpenAL32.lib ^
-	-DOPENTHREADS_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOPENTHREADS_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/OpenThreads.lib ^
-	-DOPENTHREADS_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGDB_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGDB_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGDB_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgDB.lib ^
-	-DOSGFX_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGFX_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGFX_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgFX.lib ^
-	-DOSGGA_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGGA_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGGA_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgGA.lib ^
-	-DOSGPARTICLE_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGPARTICLE_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGPARTICLE_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgParticle.lib ^
-	-DOSGSIM_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGSIM_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGSIM_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgSim.lib ^
-	-DOSGTEXT_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGTEXT_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGTEXT_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgText.lib ^
-	-DOSGUTIL_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGUTIL_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGUTIL_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgUtil.lib ^
-	-DOSGVIEWER_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSGVIEWER_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSGVIEWER_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osgViewer.lib ^
-	-DOSG_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DOSG_LIBRARY_DEBUG:FILEPATH= ^
-	-DOSG_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/scratch-install/lib/osg.lib ^
-	-DPLIB_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DPLIB_FNT_LIBRARY_DEBUG:FILEPATH= ^
-	-DPLIB_FNT_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/plib_fnt.lib ^
-	-DPLIB_PUAUX_LIBRARY_DEBUG:FILEPATH= ^
-	-DPLIB_PUAUX_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/plib_puAux.lib ^
-	-DPLIB_PUI_LIBRARY_DEBUG:FILEPATH= ^
-	-DPLIB_PUI_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/plib_pui.lib ^
-	-DPLIB_SG_LIBRARY_DEBUG:FILEPATH= ^
-	-DPLIB_SG_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/plib_sg.lib ^
-	-DPLIB_UL_LIBRARY_DEBUG:FILEPATH= ^
-	-DPLIB_UL_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/plib_ul.lib ^
-	-DPNG_PNG_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DPNG_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libpng16.lib ^
-	-DZLIB_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DZLIB_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/zlibd.lib ^
-	-DZLIB_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib
+	-DFREETYPE_INCLUDE_DIR_ft2build=%ROOT_DIR%/vcpkg-git/packages/freetype_x64-windows/include ^
+	-DGDAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DGDAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
+	-DOPENAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DOPENAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/OpenAL32.lib ^
+	-DPLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DPNG_PNG_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DPNG_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libpng16.lib ^
+	-DZLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DZLIB_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib
 cmake --build . --config Release --target INSTALL
 cd %ROOT_DIR%

-echo Compiling TerraGear . . .
-cd scratch-build\terragear
-cmake ..\..\scratch-source\terragear-git -G  %CMAKE_TOOLCHAIN% ^
-	-DCMAKE_CONFIGURATION_TYPES:STRING=Debug;Release ^
-	-DCMAKE_BUILD_TYPE:STRING=Release ^
-	-DCMAKE_PREFIX_PATH:STRING=%ROOT_DIR%/scratch-install/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib;%QT5x64_LIB% ^
-	-DCMAKE_INCLUDE_PATH:STRING=%ROOT_DIR%/scratch-install/include;%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/scratch-install ^
-	-DMSVC_3RDPARTY_ROOT:PATH= ^
-	-DBoost_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DBoost_LIBRARY_DIR_RELEASE:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib ^
-	-DCGAL_DIR:PATH=%ROOT_DIR%/vcpkg-git/buildtrees/cgal/x64-windows-rel ^
-	-DGDAL_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DGDAL_LIBRARY:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
-	-DGMP_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DGMP_LIBRARIES_DIR:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib ^
-	-DJPEG_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DJPEG_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/jpeg.lib ^
-	-DJPEG_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/jpeg.lib ^
-	-DMPFR_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DMPFR_LIBRARIES_DIR:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib ^
-	-DTIFF_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DTIFF_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/tiffd.lib ^
-	-DTIFF_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/tiff.lib ^
-	-DZLIB_INCLUDE_DIR:PATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-	-DZLIB_LIBRARY_DEBUG:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib/zlibd.lib ^
-	-DZLIB_LIBRARY_RELEASE:FILEPATH=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib ^
-	-DSIMGEAR_INCLUDE_DIR:PATH=%ROOT_DIR%/scratch-install/include ^
-	-DSIMGEAR_CORE_LIBRARY_RELEASE=%ROOT_DIR%/scratch-install/lib/SimGearCore.lib ^
-	-DSIMGEAR_SCENE_LIBRARY_RELEASE=%ROOT_DIR%/scratch-install/lib/SimGearScene.lib
+ECHO Compiling TerraGear . . .
+cd terragear-build
+cmake ..\terragear-git -G  %CMAKE_TOOLCHAIN% ^
+	-DCMAKE_PREFIX_PATH:PATH=%ROOT_DIR%/Stage/lib;%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib;%QT5x64% ^
+	-DCMAKE_CONFIGURATION_TYPES=Debug;Release ^
+	-DCMAKE_INSTALL_PREFIX:PATH=%ROOT_DIR%/Stage ^
+	-DMSVC-3RDPARTY_ROOT= ^
+	-DBoost_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DBoost_LIBRARY_DIR_DEBUG=%ROOT_DIR%/vcpkg-git/installed/x64-windows/debug/lib ^
+	-DBoost_LIBRARY_DIR_RELEASE=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib ^
+	-DCGAL_DIR=%ROOT_DIR%/vcpkg-git/buildtrees/cgal/x64-windows-rel ^
+	-DGDAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DGDAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
+	-DJPEG_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DJPEG_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/jpeg.lib ^
+	-DTIFF_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DTIFF_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/tiff.lib ^
+	-DZLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
+	-DZLIB_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/zlib.lib ^
+	-DSIMGEAR_INCLUDE_DIR=%ROOT_DIR%/Stage/include ^
+	-DSIMGEAR_CORE_LIBRARY=%ROOT_DIR%/Stage/lib/SimGearCore.lib ^
+	-DSIMGEAR_SCENE_LIBRARY=%ROOT_DIR%/Stage/lib/SimGearScene.lib
 cmake --build . --config Release --target INSTALL
 cd %ROOT_DIR%

 REM TerraGear is expecting proj.dll instead of proj_4_9.dll, clone it so TG may find it.
-for %%i in (vcpkg-git\installed\x64-windows\bin\proj*.dll) do copy /Y %%i scratch-install\bin\proj.dll
+for %%i in (vcpkg-git\installed\x64-windows\bin\proj*.dll) do copy /Y %%i Stage\bin\proj.dll

-echo All done!
+ECHO All done!
--- a/fg-from-scratch/fg-from-scratch.sh
+++ b/fg-from-scratch/fg-from-scratch.sh
@@ -1,202 +0,0 @@
- #!/bin/bash
-
-# fg-from-scratch - Linux utility to download, compile, and stage TerraGear and its dependencies
-# Copyright (C) 2018  Scott Giese (xDraconian) scttgs0@gmail.com
-
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-QT_SELECT=qt5
-ROOT_DIR=${PWD}
-PATH=${ROOT_DIR}/vcpkg-git/installed/x64-linux/bin:${PATH}
-CMAKE_TOOLCHAIN="Ninja"
-CHIPSET=$(gcc -march=native -Q --help=target | grep -- '-march=' | cut -f3)
-
-QT5x64=$(qtpaths --install-prefix)
-QT5x64_LIB=${QT5x64}/lib
-QT5x64_CMAKE=${QT5x64_LIB}/cmake
-QT5x64_PKGCONFIG=${QT5x64_LIB}/pkgconfig
-export PKG_CONFIG_PATH=${ROOT_DIR}/scratch-install/lib64/pkgconfig:${ROOT_DIR}/vcpkg-git/installed/x64-linux/lib/pkgconfig:${QT5x64_PKGCONFIG}
-
-echo ${QT5x64}
-
-if [ ! -d "vcpkg-git" ]
-then
-    echo Preparing to install external libraries via vcpkg . . .
-	git clone https://github.com/Microsoft/vcpkg.git vcpkg-git
-
-	echo Compiling vcpkg
-	cd vcpkg-git
-	./bootstrap-vcpkg.sh
-
-	echo Compiling external libraries . . .
-	./vcpkg install --triplet x64-linux boost cgal curl freeglut freetype glew jasper libxml2 openal-soft openssl plib sdl2 tiff zlib
-else
-    echo Updating vcpkg . . .
-	cd vcpkg-git
-	PULL_RESULT=$(git pull)
-
-    if [ "${PULL_RESULT}" != "Already up to date." ]
-    then
-        echo Compiling vcpkg
-        ./bootstrap-vcpkg.sh
-    fi
-
-	echo Updating external libraries . . .
-	./vcpkg update
-	./vcpkg upgrade --triplet x64-linux --no-dry-run
-
-    echo Compiling external libraries . . .
-	./vcpkg install --triplet x64-linux boost cgal curl freeglut freetype glew jasper libxml2 openal-soft openssl plib sdl2 tiff zlib
-fi
-cd ${ROOT_DIR}
-
-if [ ! -d "scratch-source" ]
-then
-    mkdir scratch-source
-fi
-if [ ! -d "scratch-build" ]
-then
-    mkdir scratch-build
-fi
-if [ ! -d "scratch-install" ]
-then
-    mkdir scratch-install
-fi
-
-if [ ! -d "scratch-build/openscenegraph-3.4" ]
-then
-    mkdir scratch-build/openscenegraph-3.4
-fi
-if [ ! -d "scratch-source/openscenegraph-3.4-git" ]
-then
-	echo Downloading OpenSceneGraph . . .
-	git clone -b OpenSceneGraph-3.4 https://github.com/openscenegraph/OpenSceneGraph.git scratch-source/openscenegraph-3.4-git
-else
-	echo Updating OpenSceneGraph . . .
-	cd scratch-source/openscenegraph-3.4-git
-	git pull
-fi
-cd ${ROOT_DIR}
-
-if [ ! -d "scratch-build/simgear" ]
-then
-    mkdir scratch-build/simgear
-fi
-if [ ! -d "scratch-source/simgear-git" ]
-then
-	echo Downloading SimGear . . .
-	git clone -b next https://git.code.sf.net/p/flightgear/simgear scratch-source/simgear-git
-else
-	echo Updating SimGear . . .
-	cd scratch-source/simgear-git
-	git pull
-fi
-cd ${ROOT_DIR}
-
-if [ ! -d "scratch-build/flightgear" ]
-then
-    mkdir scratch-build/flightgear
-fi
-if [ ! -d "scratch-source/flightgear-git" ]
-then
-	echo Downloading FlightGear . . .
-	git clone -b next https://git.code.sf.net/p/flightgear/flightgear scratch-source/flightgear-git
-else
-	echo Updating FlightGear . . .
-	cd scratch-source/flightgear-git
-	git pull
-fi
-cd ${ROOT_DIR}
-
-if [ ! -d "scratch-build/terragear" ]
-then
-    mkdir scratch-build/terragear
-fi
-if [ ! -d "scratch-source/terragear-git" ]
-then
-	echo Downloading TerraGear . . .
-	git clone -b next https://git.code.sf.net/p/flightgear/terragear scratch-source/terragear-git
-else
-	echo Updating TerraGear . . .
-	cd scratch-source/terragear-git
-	git pull
-fi
-cd ${ROOT_DIR}
-
-echo Compiling OpenSceneGraph . . .
-cd scratch-build/openscenegraph-3.4
-cmake ../../scratch-source/openscenegraph-3.4-git -G ${CMAKE_TOOLCHAIN} \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=${ROOT_DIR}/scratch-install \
-	-DCMAKE_PREFIX_PATH=${ROOT_DIR}/scratch-install/lib:${ROOT_DIR}/vcpkg-git/installed/x64-linux/lib:${QT5x64_LIB} \
-    -DCMAKE_CXX_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}" \
-    -DCMAKE_C_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}" \
-    -DBUILD_DOCUMENTATION:BOOL=1 \
-    -DBUILD_OSG_APPLICATIONS:BOOL=1 \
-    -DQt5Core_DIR=${QT5x64_CMAKE}/Qt5Core \
-    -DQt5Gui_DIR=${QT5x64_CMAKE}/Qt5Gui \
-    -DQt5OpenGL_DIR=${QT5x64_CMAKE}/Qt5OpenGL \
-    -DQt5Widgets_DIR=${QT5x64_CMAKE}/Qt5Widgets
-cmake --build . --config Release --target install
-cd ${ROOT_DIR}
-
-echo Compiling SimGear . . .
-cd scratch-build/simgear
-cmake ../../scratch-source/simgear-git -G  ${CMAKE_TOOLCHAIN} \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=${ROOT_DIR}/scratch-install \
-	-DCMAKE_PREFIX_PATH=${ROOT_DIR}/scratch-install/lib:${ROOT_DIR}/vcpkg-git/installed/x64-linux/lib:${QT5x64} \
-    -DCMAKE_CXX_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}" \
-    -DCMAKE_C_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}"
-cmake --build . --config Release --target install
-cd ${ROOT_DIR}
-
-echo Compiling FlightGear . . .
-cd scratch-build/flightgear
-cmake ../../scratch-source/flightgear-git -G  ${CMAKE_TOOLCHAIN} \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=${ROOT_DIR}/scratch-install \
-	-DCMAKE_PREFIX_PATH=${ROOT_DIR}/scratch-install/lib:${ROOT_DIR}/vcpkg-git/installed/x64-linux/lib:${QT5x64_LIB} \
-    -DCMAKE_CXX_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}" \
-    -DCMAKE_C_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}" \
-	-DOSG_FSTREAM_EXPORT_FIXED:BOOL=1 \
-	-DENABLE_JSBSIM:BOOL=1 \
-	-DENABLE_GPSSMOOTH:BOOL=1 \
-	-DENABLE_FGVIEWER:BOOL=1 \
-	-DENABLE_STGMERGE:BOOL=0 \
-    -DQt5Core_DIR=${QT5x64_CMAKE}/Qt5Core \
-    -DQt5Gui_DIR=${QT5x64_CMAKE}/Qt5Gui \
-    -DQt5LinguistTools_DIR=${QT5x64_CMAKE}/Qt5LinguistTools \
-    -DQt5Network_DIR=${QT5x64_CMAKE}/Qt5Network \
-    -DQt5Qml_DIR=${QT5x64_CMAKE}/Qt5Qml \
-    -DQt5Quick_DIR=${QT5x64_CMAKE}/Qt5Quick \
-    -DQt5Svg_DIR=${QT5x64_CMAKE}/Qt5Svg \
-    -DQt5Widgets_DIR=${QT5x64_CMAKE}/Qt5Widgets \
-    -DQt5_DIR=${QT5x64_CMAKE}/Qt5
-cmake --build . --config Release --target install
-cd ${ROOT_DIR}
-
-echo Compiling TerraGear . . .
-cd scratch-build/terragear
-cmake ../../scratch-source/terragear-git -G  ${CMAKE_TOOLCHAIN} \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=${ROOT_DIR}/scratch-install \
-	-DCMAKE_PREFIX_PATH=${ROOT_DIR}/scratch-install/lib:${ROOT_DIR}/vcpkg-git/installed/x64-linux/lib:${QT5x64_LIB} \
-    -DCMAKE_CXX_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}" \
-    -DCMAKE_C_FLAGS="-march=${CHIPSET} -mtune=${CHIPSET}"
-cmake --build . --config Release --target install
-cd ${ROOT_DIR}
-
-echo All done!
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/hudson_mac_build_release.sh
+++ b/hudson_mac_build_release.sh
@@ -18,26 +18,21 @@ rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/l
 PATH=$PATH:$QTPATH
 echo "Build path is: $PATH"

-# this shoudl not be needed, since this is inside CMAKE_INSTALL_PREFIX, but seemed
-# to be necessary all the same
-#export PKG_CONFIG_PATH=$WORKSPACE/dist/lib/pkgconfig
-
-cmakeCommonArgs="-G Ninja -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo"
-
 ###############################################################################
 echo "Starting on SimGear"
 pushd sgBuild
-cmake ${cmakeCommonArgs} ../simgear
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear

-# compile
-cmake --build . --target debug_symbols
-cmake --build . --target install
+# compile (with out-j for now, it's hitting process limits)
+cmake --build .

 if [ $? -ne '0' ]; then
    echo "make simgear failed"
    exit 1
 fi

+cmake --build . --target install
+
 popd

 ################################################################################
@@ -50,27 +45,22 @@ else
  FGBUILDTYPE=Nightly
 fi

-cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DENABLE_SWIFT:BOOL=ON ${cmakeCommonArgs} ../flightgear
+cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear

-cmake --build . --target debug_symbols
-cmake --build . --target install
+# compile (with out-j for now, it's hitting process limits)
+cmake --build .

 if [ $? -ne '0' ]; then
    echo "make flightgear failed"
    exit 1
 fi

+cmake --build . --target install
+
 popd

-
-crashpad_bin_path=$WORKSPACE/dist/fgfs.app/Contents/MacOS/crashpad_handler
-if [ -f $crashpad_bin_path ]; then
-  chmod +x $crashpad_bin_path
-fi
-
 chmod +x $WORKSPACE/dist/bin/osgversion
-echo "Running symbol upload script"
-./sentry-dSYM-upload-mac.sh
+

 ################################################################################

--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -31,8 +31,6 @@ $osgSoVersion=runOsgVersion('so-number')
 $openThreadsSoVersion=runOsgVersion('openthreads-soversion-number')

 $codeSignIdentity = ENV['FG_CODESIGN_IDENTITY']
-$keychain = ENV['FG_KEYCHAIN']
-
 puts "Code signing identity is #{$codeSignIdentity}"
 puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"

@@ -43,6 +41,7 @@ $prefixDir=Dir.pwd + "/dist"
 dmgDir=Dir.pwd + "/image"
 srcDir=Dir.pwd + "/flightgear"
 qmlDir=srcDir + "/src/GUI/qml"
+
 puts "Erasing previous image dir"
 `rm -rf #{dmgDir}`

@@ -55,10 +54,11 @@ bundle=dmgDir + "/FlightGear.app"
 puts "Running macdeployqt on the bundle to copy Qt libraries"
 `macdeployqt #{$prefixDir}/fgfs.app -qmldir=#{qmlDir}`

-puts "Copying & renaming app bundle"
+puts "Moving & renaming app bundle"
 `mkdir -p #{dmgDir}`
-`rsync  --archive --quiet #{$prefixDir}/fgfs.app/ #{bundle}`
+`mv #{$prefixDir}/fgfs.app #{bundle}`

+bundle=dmgDir + "/FlightGear.app"
 contents=bundle + "/Contents"
 macosDir=contents + "/MacOS"
 $frameworksDir=contents +"/Frameworks"
@@ -68,9 +68,8 @@ osgPluginsDir=contents+"/PlugIns/osgPlugins"
 # for writing copyright year to Info.plist
 t = Time.new
 fgCurrentYear = t.year
-fgBundleIdentifier = "org.flightgear.mac"

-fgVersion = File.read("#{srcDir}/flightgear-version").strip
+fgVersion = File.read("#{srcDir}/version").strip
 volName="\"FlightGear #{fgVersion}\""

 if $isRelease
@@ -79,7 +78,6 @@ if $isRelease
 else
  dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}-nightly.dmg"
  dmgFullPath = Dir.pwd + "/output/FlightGear-#{fgVersion}-nightly-full.dmg"
-  fgBundleIdentifier = "org.flightgear.mac-nightly"
 end

 puts "Creating directory structure"
@@ -100,7 +98,7 @@ bins.each do |b|
  `cp #{$prefixDir}/bin/#{b} #{outPath}`
 end

-puts "Copying OSG libraries"
+puts "copying libraries"
 $osgLibs.each do |l|
  libFile = "lib#{l}.#{$osgSoVersion}.dylib"
  `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
@@ -110,16 +108,6 @@ end
 libFile = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
 `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`

-# DBus and libEvent needed for SWIFT
-# Sentry is crash reporting
-otherLibs = ['dbus-1.3', 'event_core-2.2.1', 'sentry']
-otherLibs.each do |l|
-  `cp #{$prefixDir}/lib/lib#{l}.dylib #{$frameworksDir}`
-end
-
-# copy LibLZMA from Homebrew XZ
-`cp /usr/local/lib/liblzma.dylib #{$frameworksDir}`
-
 $osgPlugins.each do |p|
  pluginFile = "osgdb_#{p}.dylib"
  `cp #{$prefixDir}/lib/osgPlugins/#{pluginFile} #{osgPluginsDir}`
@@ -147,50 +135,27 @@ File.open("#{contents}/Info.plist", 'w') { |f|

 createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"

-# enable the hardened runtime and timestamp options, so notarization works
-codeSignArgs = "--deep --options=runtime --timestamp"

 if !$isRelease
  # create the 'lite' DMG without the base files

-
  # code sign the entire bundle once complete - v2 code-signing
  puts "Signing #{bundle}"
-  `codesign #{codeSignArgs} --keychain #{$keychain} -s "#{$codeSignIdentity}" #{bundle}`
-  puts "Creating DMG without base-files"
+  `codesign --deep -s "#{$codeSignIdentity}" #{bundle}`
+  puts "Creating DMG"

  `rm -f #{dmgPath}`
  `hdiutil create -srcfolder #{dmgDir} #{createArgs} #{dmgPath}`
-
-  puts "Notarizing DMG #{dmgPath}"
-  `xcrun altool --notarize-app \
-              --primary-bundle-id "#{fgBundleIdentifier}"  \
-              --username "zakalawe@mac.com" \
-              --password "@keychain:FlightGearAppStoreConnectUserName" \
-              --file #{dmgPath}`
-
-
 end

 puts "Creating full image with data"

+puts "Copying base package files into the image"
 `rsync -a fgdata/ #{resourcesDir}/data`

-# sign the entire bundle
-puts "Signing full app: #{bundle}"
-`codesign --force #{codeSignArgs} --keychain #{$keychain} -s "#{$codeSignIdentity}" #{bundle}`
+# re-sign the entire bundle
+puts "Re-signing full #{bundle}"
+`codesign --force --deep -s "#{$codeSignIdentity}" #{bundle}`

 `rm -f #{dmgFullPath}`
 `hdiutil create -srcfolder #{dmgDir} #{createArgs} #{dmgFullPath}`
-
-puts "Notarizing DMG #{dmgFullPath}"
-
-`xcrun altool --notarize-app  \
-  --primary-bundle-id "#{fgBundleIdentifier}"  \
-  --username "zakalawe@mac.com" \
-  --password "@keychain:FlightGearAppStoreConnectUserName" \
-  --file #{dmgFullPath}`
-
-
-puts "Packaging complete"
-
--- a/python3-flightgear/README-l10n.txt
+++ b/python3-flightgear/README-l10n.txt
@@ -36,10 +36,6 @@ localization files in $FG_ROOT/Translations/<language_code>):
  fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
                              merge-new-master $languages

-Note: you may omit $languages in the fg-update-translation-files command if
-      you want to autodetect the FlightGear-nonQt.xlf files present in
-      $FG_ROOT/Translations.
-
 Updating XLIFF files to reflect changes in the default translation
 ------------------------------------------------------------------

@@ -49,9 +45,6 @@ modified or removed, or categories added or removed[3]):
  fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
                              merge-new-master $languages

-Note: you may omit $languages in this command if you want to autodetect the
-      FlightGear-nonQt.xlf files present in $FG_ROOT/Translations.
-
 Updating XLIFF files to mark or remove obsolete translated strings
 ------------------------------------------------------------------

@@ -60,14 +53,9 @@ To remove unused translated strings (not to be done too often in my opinion):
  fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
                              remove-unused $languages

-Notes:
-
- - You may omit $languages in this command if you want to autodetect the
-   FlightGear-nonQt.xlf files present in $FG_ROOT/Translations.
-
- - It is possible to replace 'remove-unused' with 'mark-unused' to just mark
-   the strings as not-to-be-translated; however, 'merge-new-master' presented
-   above already does that.
+(you may replace 'remove-unused' with 'mark-unused' to just mark the strings
+as not-to-be-translated, however 'merge-new-master' presented above already
+does that)

 Merging contents from an XLIFF file into another one
 ----------------------------------------------------
--- a/python3-flightgear/fg-update-translation-files
+++ b/python3-flightgear/fg-update-translation-files
@@ -27,7 +27,6 @@ import sys

 import flightgear.meta.logging
 import flightgear.meta.i18n as fg_i18n
-from flightgear.meta.i18n import XliffFormatHandler


 PROGNAME = os.path.basename(sys.argv[0])
@@ -46,7 +45,7 @@ def processCommandLine():

    parser = argparse.ArgumentParser(
        usage="""\
-%(prog)s [OPTION ...] ACTION [LANGUAGE_CODE]...
+%(prog)s [OPTION ...] ACTION LANGUAGE_CODE...
 Update FlightGear XLIFF localization files.""",
        description="""\
 This program performs the following operations (actions) on FlightGear XLIFF
@@ -69,13 +68,6 @@ translation files (*.xlf):
    In the XLIFF localization files corresponding to the specified
    language(s), remove all translated strings that are marked as unused.

-If no LANGUAGE_CODE is provided as an argument, then assuming $transl_dir
-represents the value passed to --transl-dir, all directories $d such that a
-file named FlightGear-nonQt.xlf is found in $transl_dir/$d will be acted on as
-if they had been passed as LANGUAGE_CODE arguments (actually, the directory
-$transl_dir/default is not considered as a candidate; it is simply skipped).
-Typically, $transl_dir is /path/to/FGData/Translations.
-
 A translated string that is marked as unused is still present in the XLIFF
 localization file; it is just presented in a way that tells translators they
 don't need to worry about it. On the other hand, when a translated string is
@@ -113,7 +105,7 @@ general on the short or mid-term: they only take some space.
                        remove those already marked as unused from the XLIFF
                        files corresponding to each given LANGUAGE_CODE (i.e.,
                        those that are not in the default translation)""")
-    parser.add_argument("lang_code", metavar="LANGUAGE_CODE", nargs="*",
+    parser.add_argument("lang_code", metavar="LANGUAGE_CODE", nargs="+",
                        help="""\
                        codes of languages to operate on (e.g., fr, en_GB, it,
                        es_ES...)""")
@@ -133,19 +125,11 @@ class MarkOrRemoveUnusedAction(enum.Enum):
    mark, remove = range(2)


-def langCodesToActOn():
-    """Return an iterable of all language codes we were told to work on."""
-    if params.lang_code:
-        return params.lang_code
-    else:
-        return XliffFormatHandler.availableTranslations(params.transl_dir)
-
-
 def markOrRemoveUnused(l10nResPoolMgr, action):
    formatHandler = fg_i18n.XliffFormatHandler()
    masterTransl = l10nResPoolMgr.readFgMasterTranslation().transl

-    for langCode in langCodesToActOn():
+    for langCode in params.lang_code:
        xliffPath = formatHandler.defaultFilePath(params.transl_dir, langCode)
        transl = formatHandler.readTranslation(xliffPath)

@@ -164,7 +148,7 @@ def mergeNewMaster(l10nResPoolMgr):
    formatHandler = fg_i18n.XliffFormatHandler()
    masterTransl = l10nResPoolMgr.readFgMasterTranslation().transl

-    for langCode in langCodesToActOn():
+    for langCode in params.lang_code:
        xliffPath = formatHandler.defaultFilePath(params.transl_dir, langCode)
        transl = formatHandler.readTranslation(xliffPath)
        transl.mergeMasterTranslation(masterTransl, logger=logger)
--- a/python3-flightgear/flightgear/meta/i18n.py
+++ b/python3-flightgear/flightgear/meta/i18n.py
@@ -83,7 +83,6 @@ FORMAT_HANDLERS_NAMES = []
 # qttools/src/linguist/shared/numerus.cpp).
 PLURAL_FORMS = {
    None: ["<master>"],         # for the default (= master) translation
-    "ca": ["singular", "plural"],
    "de": ["singular", "plural"],
    "en": ["singular", "plural"],
    "es": ["singular", "plural"],
@@ -92,8 +91,6 @@ PLURAL_FORMS = {
    "nl": ["singular", "plural"],
    "pl": ["singular", "paucal", "plural"],
    "pt": ["singular", "plural"],
-    "ru": ["singular", "plural"],
-    "sk": ["singular", "paucal", "plural"],
    "zh": ["universal"]         # universal form
 }

@@ -579,25 +576,10 @@ class Translation:
        return ''.join(l)

    def __getitem__(self, cat):
-        """Get all translations for a given category.
-
-        Return a mapping where each key is a tid (instance of a subclass
-        of AbstractTranslationUnitId) and each value a TranslationUnit
-        instance.
-
-        """
        return self.translations[cat]

-    def __setitem__(self, cat, mapping):
-        """Replace all translations for a given category.
-
-        cat:     a category name (string such as 'sys', 'options', etc.)
-        mapping: a mapping where each key is a tid (instance of a
-                 subclass of AbstractTranslationUnitId) and each value a
-                 TranslationUnit instance.
-
-        """
-        self.translations[cat] = dict(mapping)
+    def __setitem__(self, cat, translUnit):
+        self.translations[cat] = translUnit

    def __iter__(self):
        return iter(self.translations)
@@ -1001,33 +983,6 @@ class AbstractFormatHandler(metaclass=abc.ABCMeta):
        baseName = cls.defaultFileBaseName(targetLanguage)
        return os.path.join(translationsDir, targetLanguage, baseName)

-    @classmethod
-    def availableTranslations(cls, translationsDir):
-        """Return a list of all available translations in translationsDir.
-
-        This method expects a particular layout for translation files:
-        the one used in $FG_ROOT/Translations. More precisely, it looks
-        for all files named LANG_CODE/NAME in translationsDir, where
-        NAME is cls.defaultFileBaseName(LANG_CODE). The special
-        directory translationsDir/DEFAULT_LANG_DIR is not explored;
-        thus, the result cannot contain DEFAULT_LANG_DIR.
-
-        Return a list of language codes, sorted with list.sort().
-
-        """
-        res = []
-        with os.scandir(translationsDir) as it:
-            for entry in it:
-                if (entry.name != DEFAULT_LANG_DIR and entry.is_dir() and
-                    os.path.isfile(
-                        os.path.join(
-                            translationsDir, entry.name,
-                            cls.defaultFileBaseName(entry.name)))):
-                    res.append(entry.name)
-
-        res.sort()
-        return res
-
    @abc.abstractmethod
    def writeTranslation(self, transl, filePath):
        """Write a Translation instance to a file."""
@@ -1699,8 +1654,10 @@ registerFormatHandler("xliff", XliffFormatHandler)
 # Could also be a dict
 def L10nResMgrForCat(category):
    """Map from category/resource name to L10NResourceManager class."""
-    if category in ("menu", "options", "sys", "tips"):
+    if category in ("menu", "options", "tips"):
        return BasicL10NResourceManager
+    elif category == "sys":
+        return SysL10NResourceManager
    else:
        assert False, "unexpected category: {!r}".format(category)

@@ -1886,7 +1843,7 @@ class L10NResourceManagerBase:
 class BasicL10NResourceManager(L10NResourceManagerBase):
    """Resource manager for FG XML i18n files with the simplest structure.

-    This is suitable for resources (menu, options, tips, etc.) where
+    This is suitable for resources (menu, options, tips) where
    translations are in direct children of the <PropertyList> element,
    with no more structure.

@@ -1894,16 +1851,7 @@ class BasicL10NResourceManager(L10NResourceManagerBase):
    @classmethod
    def _findMainNode(cls, rootNode):
        """
-        Return the node directly containing the translations in an FG XML file.
-
-        This method was added when sys.xml had all its useful contents
-        inside a 'splash' top-level node, instead of having a flat
-        structure like the other FG XML i18n files (options.xml,
-        menu.xml, etc.). At that time, we thus had a
-        SysL10NResourceManager class derived from this class only to
-        override this method.
-
-        """
+        Return the node directly containing the translations in an FG XML file."""
        assert rootNode.tag == "PropertyList", rootNode.tag
        return rootNode

@@ -1961,3 +1909,17 @@ class BasicL10NResourceManager(L10NResourceManagerBase):
                    [text], isPlural=isPlural, logger=logger)

        return nbWhitespaceProblems
+
+
+class SysL10NResourceManager(BasicL10NResourceManager):
+
+    @classmethod
+    def _findMainNode(cls, rootNode):
+        """
+        Return the node directly containing the translations in sys.xml."""
+        assert rootNode.tag == "PropertyList", rootNode.tag
+        # In sys.xml, all translations are inside a <splash> element
+        mainNode = rootNode.find("splash")
+        assert mainNode is not None
+
+        return mainNode
--- a/release_builder/create-release-branch-for.sh
+++ b/release_builder/create-release-branch-for.sh
@@ -42,8 +42,8 @@ NEXT_MINOR_VERSION=${VERSION_A[1]}
 setVersionTo() {
  local V="$1"
  echo "setting version to $V"
-  echo "$V" > flightgear-version
-  git add flightgear-version
+  echo "$V" > version
+  git add version
  echo "new version: $V" | git commit --file=-
 #  git tag "version/$V"
 }
--- a/release_builder/create-release-branch.sh
+++ b/release_builder/create-release-branch.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

-THIS_RELEASE="2020.2"
-NEXT_RELEASE="2020.3"
+THIS_RELEASE="2018.3"
+NEXT_RELEASE="2018.4"
 SUBMODULES="simgear flightgear fgdata getstart"

 #:<< 'COMMENT_END'
@@ -39,6 +39,6 @@ done
 #        IdentitiesOnly yes
 #        User user_sf_username

-#svn copy svn+ssh://svn.code.sf.net/p/flightgear/fgaddon/trunk \
-#         svn+ssh://svn.code.sf.net/p/flightgear/fgaddon/branches/release-${THIS_RELEASE} \
-#         -m "branching for release ${THIS_RELEASE}"
+svn copy svn+ssh://svn.code.sf.net/p/flightgear/fgaddon/trunk \
+         svn+ssh://svn.code.sf.net/p/flightgear/fgaddon/branches/release-${THIS_RELEASE} \
+         -m "branching for release ${THIS_RELEASE}"
--- a/release_builder/create_base_package.sh
+++ b/release_builder/create_base_package.sh
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-#####################################################################################
-
-
-if [ "$WORKSPACE" == "" ]; then
-    echo "ERROR: Missing WORKSPACE environment variable."
-    exit 1
-fi
-
-if [ ! -d "$WORKSPACE/fgdata" ]; then
-    echo "No fgdata subdir in WORKSPACE: can't continue"
-    exit 1
-fi
-
-
-VERSION=`cat fgdata/version`
-BASE_VERSION_TAG="version/2020.3.1"
-SCENERY_PACK_AIRPORT=BIKF
-SCENERY_PACK_URI="https://sourceforge.net/projects/flightgear/files/scenery/SceneryPack.${SCENERY_PACK_AIRPORT}.tgz/download"
-
-echo "Assembling base package for $VERSION"
-cd $WORKSPACE
-
-
-# wipe directories and re-create
-rm -rf staging
-mkdir -p output
-mkdir -p staging
-
-# wipe existing data TXZs
-rm output/FlightGear-$VERSION*data.txz
-
-rsync -az --exclude=".git" fgdata staging/
-
-# add all the scenery pack files into it
-
-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}"
-    # -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
-popd
-
-# Creating full base package TXZ 
-
-OUTPUT_NAME=FlightGear-$VERSION-data
-tar -cJf output/$OUTPUT_NAME.txz --directory staging fgdata
-
-echo "Creating updates package"
-
-pushd fgdata
-git diff --name-only --line-prefix="fgdata/" $BASE_VERSION_TAG..HEAD > ../fgdata_changes
-popd
-
-tar -cJf output/FlightGear-$VERSION-update-data.txz -T fgdata_changes
-
-echo "Done, data TXZs are in output/"
--- a/release_builder/create_scenerypack.sh
+++ b/release_builder/create_scenerypack.sh
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# the name to create
-SCENERY_PACK=SceneryPack.BIKF
-
-# the tiles to select
-TILES="w030n60/w???n??";
-
-# tiles for PHNL for C172 tutorials
-TUTORIAL_TILES="w160n[12]0/w???n??";
-
-rm -f SceneryPack.*.tgz
-
-# note the path to the TerraSync root here
-ln -s /var/www/uk-mirror/fgscenery ${SCENERY_PACK}
-
-tar --format=gnu --create --owner=root --group=root --gzip --file=${SCENERY_PACK}.tgz \
-    ${SCENERY_PACK}/Objects/${TILES} \
-    ${SCENERY_PACK}/Terrain/${TILES} \
-    ${SCENERY_PACK}/Objects/${TUTORIAL_TILES} \
-    ${SCENERY_PACK}/Terrain/${TUTORIAL_TILES} \
-    ${SCENERY_PACK}/Airports/B/I/K \
-    ${SCENERY_PACK}/Airports/P/H \
-    ${SCENERY_PACK}/Airports_archive.tgz \
-    ${SCENERY_PACK}/Models
-
-rm ${SCENERY_PACK}
-
-# upload to frs.sourceforge.net /home/frs/project/fl/flightgear/scenery/ 
-
--- a/release_builder/reset-git-author.sh
+++ b/release_builder/reset-git-author.sh
@@ -1,34 +0,0 @@
-#!/bin/bash
-#This file is part of FlightGear
-#
-#FlightGear is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 2 of the License, or
-#(at your option) any later version.
-#
-#FlightGear is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with FlightGear  If not, see <http://www.gnu.org/licenses/>.
-
-if [ -z "$1" -o -z "$2" ]; then
-  echo "usage: author email"
-  exit
-fi
-
-resetAuthor() {
-    pushd $3 > /dev/null
-  git config user.name "$1"
-  git config user.email $2
-  popd > /dev/null
-}
-
-resetAuthor "$1" $2 flightgear
-resetAuthor "$1" $2 simgear
-resetAuthor "$1" $2 fgdata
-resetAuthor "$1" $2 getstart
-resetAuthor "$1" $2 .
-
--- a/release_builder/set-version.sh
+++ b/release_builder/set-version.sh
@@ -33,9 +33,9 @@ MICRO_VERSION=${VERSION_A[2]}

 setVersionTo() {
  local V="$1"
-  echo "setting version to $V in $2"
-  echo "$V" > $2
-  git add $2
+  echo "setting version to $V"
+  echo "$V" > version
+  git add version
  echo "new version: $V" | git commit --file=-
  git tag "version/$V"
 }
@@ -43,22 +43,9 @@ setVersionTo() {
 while [ $# -gt 0 ]; do
  echo "Processing $1"
  pushd $1 > /dev/null
-
-  case $1 in
-  flightgear)
-    versionFileName="flightgear-version"
-    ;;
-  simgear)
-    versionFileName="simgear-version"
-    ;;
-  *)
-    versionFileName="version"
-    ;;
-  esac
-
  git config user.name "Automatic Release Builder"
  git config user.email "build@flightgear.org"
-  setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}" $versionFileName
+  setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
  popd > /dev/null
  shift  
 done
--- a/sentry-dSYM-upload-mac.sh
+++ b/sentry-dSYM-upload-mac.sh
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-DWARF_DSYM_FOLDER_PATH=$WORKSPACE/dist/symbols
-
-if which sentry-cli >/dev/null; then
-    export SENTRY_ORG=flightgear
-    export SENTRY_PROJECT=flightgear
-  #  export SENTRY_AUTH_TOKEN=YOUR_AUTH_TOKEN
-    ERROR=$(sentry-cli upload-dif "$DWARF_DSYM_FOLDER_PATH" 2>&1 >/dev/null)
-    if [ ! $? -eq 0 ]; then
-        echo "warning: sentry-cli - $ERROR"
-    fi
-else
-    echo "warning: sentry-cli not installed, download from https://github.com/getsentry/sentry-cli/releases"
-fi
--- a/2
+++ b/2
--- a/update_git_mirror.sh
+++ b/update_git_mirror.sh
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-mirror_dirs='fgdata fgmeta flightgear simgear getstart windows-3rd-party fgrun'
-
-pushd /var/lib/git
-
-for dir in $mirror_dirs
-do
-	repo_name=$dir.git
-	if [ ! -d "$repo_name" ]; then
-		echo "Doing initial clone"
-		git clone --mirror git://git.code.sf.net/p/flightgear/$dir
-	fi
-
-	pushd $repo_name
-	echo "Updating in $PWD"
-	git remote update
-	popd
-done
-
-popd
-
--- a/2
+++ b/2
@@ -1 +1 @@
-2020.3.8
+2018.3.2
--- a/2
+++ b/2
--- a/windows/flightgear.ico
+++ b/windows/flightgear.ico
--- a/windows/info-before-en.txt
+++ b/windows/info-before-en.txt
@@ -1,25 +0,0 @@
-FlightGear LTS
-==============
-
-Contains FlightGear stable source code from source code repository ('release' branch). 
-This is the FlightGear installer for Long Term Support (LTS) version. It contains
-the most stable and well tested FlightGear source code. Have fun using it !
-
-Latest features ?
-----------------
-
-Please take a look at the FlightGear unstable installer, but beware, it can contains
-new, not well tested code. If you want to have solid and stable flight experience
-stick with this FlightGear LTS version.
-
-
-I have found a bug !
--------------------
-
-If you find serious bugs, instability, performance degradation:
-
- look at the FlightGear Tickets page (on the SourceForge project page)
- ask on the FlightGear forum (explicitly say that you're using LTS version)
- look at the flightgear-devel mailing list
-
-There is a probability, that developers are working on the solution it right now !
--- a/windows/info-before-pl.txt
+++ b/windows/info-before-pl.txt
@@ -1,26 +0,0 @@
-FlightGear LTS
-==============
-
-Zawiera kod źródłowy FlightGear z repozytorium kodu źródłowego (gałąź 'release).
-To jest instalator dla wersji Long Term Support (LTS) - o długim czasie wsparcia.
-Zawiera najbardziej stabilny i dobrze przetestowany kod źródłowy FlightGear.
-Miłej zabawy i korzystania z niego !
-
-Najnowsze funkcje ?
-----------------
-
-Proszę sprawdź instalator FlightGear wersji niestabilnej, ale miej na uwadze, że
-może zawierać nowy, nie do końca przetestowany kod. Jeśli chcesz solidnego i stabilnego
-doświadczenia podczas Twoich lotów, pozostań przy tej wersji FlightGear LTS.
-
-
-Znalazłem błąd !
--------------------
-
-Jeśli znalazłeś poważny błąd, niestabilność, ograniczenie wydajności:
-
- sprawdź stronę ze zgłoszeniami błędów FlightGear (na stronie projektu SourceForge)
- zapytaj na forum FlightGear (wskaż jasno, że korzystasz z wersji LTS)
- sprawdź mailową listę dyskusyjną flightgear-devel
-
-Jest prawdopodobne, że programiści już pracują nad rozwiązaniem tego problemu !
--- a/windows/setupimg.bmp
+++ b/windows/setupimg.bmp
--- a/windows/setupsmall.bmp
+++ b/windows/setupsmall.bmp
Author	SHA1	Message	Date
Torsten Dreyer	414402268b	New version: 2018.3.3	2019-07-28 22:45:07 +02:00
James Turner	8413bbac76	Update for 2018.3.2	2019-01-06 16:16:10 +00:00
James Turner	6c7fdbc0c6	Remove -j option to Cmake --build	2018-11-26 13:54:12 +00:00
James Turner	ffdd4f062f	Use Cmake -build to compile	2018-10-23 12:10:01 +01:00
James Turner	bf5ec63ac3	Include the OSG .DDS loader plugin in Mac builds	2018-10-05 13:14:27 +01:00
Torsten Dreyer	83abaeeee2	set correct release-branch for submodules	2018-09-21 17:22:27 +02:00
@@ -1 +1 @@
 .3.8
 .3.2