new version: 2017.3.0

.gitattributes

@@ -1,23 +0,0 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
-
-.gitattributes                 text export-ignore
-.gitignore                     text export-ignore
-*.py                           text
-*.txt                          text
-*.rst                          text
-*.xml                          text
-*.desktop                      text
-*.svg                          text
-*.jpg                          binary
-*.png                          binary
-*.gif                          binary
-*.bat                          text eol=crlf
-AUTHORS                        text
-COPYING                        text
-COPYING.*                      text
-README.*                       text
-Makefile                       text
-ChangeLog                      text
-ChangeLog.*                    text
-/download_and_compile.sh       text ident

.gitignore

@@ -21,4 +21,3 @@ osgbuild
 CMakeCache.txt
 *.pyc
 build-*
-testOutput*

.gitmodules

@@ -1,24 +1,20 @@
 [submodule "simgear"]
 	path = simgear
-	url = ../simgear
-	branch = release/2018.3
+	url = https://git.code.sf.net/p/flightgear/simgear
+	branch = next
 [submodule "flightgear"]
 	path = flightgear
-	url = ../flightgear
-	branch = release/2018.3
+	url = https://git.code.sf.net/p/flightgear/flightgear
+	branch = next
 [submodule "fgrun"]
 	path = fgrun
-	url = ../fgrun
+	url = https://git.code.sf.net/p/flightgear/fgrun
 	branch = next
 [submodule "fgdata"]
 	path = fgdata
-	url = ../fgdata
-	branch = release/2018.3
+	url = git://git.code.sf.net/p/flightgear/fgdata
+	branch = next
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
-	url = ../windows-3rd-party
+	url = https://git.code.sf.net/p/flightgear/windows-3rd-party
 	branch = master
-[submodule "getstart"]
-	path = getstart
-	url = ../getstart
-	branch = release/2018.3

FlightGear.iss

@@ -20,6 +20,13 @@
 
 #include "InstallConfig.iss"
 
+#if GetEnv("VSINSTALLDIR") == ""
+  #define VSInstallDir "C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+#else
+  #define VSInstallDir GetEnv("VSINSTALLDIR")
+#endif
+
+#define VCInstallDir VSInstallDir + "\VC"
 #define InstallDir32 "X:\install\msvc140"
 #define OSGInstallDir InstallDir32 + "\OpenSceneGraph"
 #define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion
@@ -62,7 +69,7 @@ ArchitecturesAllowed=x86 x64
 
 ; Sign tool must be defined in the Inno Setup GUI, to avoid
 ; exposing the certificate password
-; SignTool=fg_code_sign1
+; SignTool=fg_code_sign1
 
 [Tasks]
 ; 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.
@@ -85,6 +92,7 @@ Source: "{#ThirdPartyDir}\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Che
 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
+Source: "{#VCInstallDir}\redist\x86\Microsoft.VC140.CRT\*.dll"; DestDir:  "{app}\bin"; Check: not Is64BitInstallMode
 
 ; 64 bits install
 Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
@@ -99,6 +107,7 @@ Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libintl-8.dll"; DestDir: "{app}\bin";
 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
+Source: "{#VCInstallDir}\redist\x64\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 
 ; Include the base package
 #if IncludeData == "TRUE"
@@ -319,66 +328,6 @@ begin
   end;
 end;
 
-var
-  UninstallCheckCleanPage: TNewNotebookPage;
-  UninstallBackButton: TNewButton;
-  UninstallNextButton: TNewButton;
-  DoCleanCheckbox : TNewCheckBox;
-  CleanHelp : TNewStaticText;
-
-procedure InitializeUninstallProgressForm();
-begin
-  UninstallProgressForm
-
-  UninstallCheckCleanPage := TNewNotebookPage.Create(UninstallProgressForm);
-  UninstallCheckCleanPage.Notebook := UninstallProgressForm.InnerNotebook;
-  UninstallCheckCleanPage.Parent := UninstallProgressForm.InnerNotebook;
-  UninstallCheckCleanPage.Align := alClient
-
-  DoCleanCheckbox := TNewCheckBox.Create(UninstallProgressForm);
-  DoCleanCheckbox.Parent := UninstallCheckCleanPage;
-  DoCleanCheckbox.Caption := 'Remove all settings, downloaded scenery and aircraft';
-  DoCleanCheckbox.Left := ScaleX(10);
-  DoCleanCheckbox.Top := ScaleY(10);
-
-  DoCleanCheckbox.Width := UninstallProgressForm.InnerNotebook.Width - ScaleX(20)
-  DoCleanCheckbox.Height := ScaleY(30)
-
-  CleanHelp := TNewStaticText.Create(UninstallProgressForm);
-  CleanHelp.Parent := UninstallCheckCleanPage;
-  CleanHelp.Top := DoCleanCheckbox.Top + DoCleanCheckbox.Height + ScaleY(10);
-  CleanHelp.Left := DoCleanCheckbox.Left;
-  CleanHelp.Width := DoCleanCheckbox.Width;
-  CleanHelp.Height := CleanHelp.AdjustHeight();
-
-  CleanHelp.WordWrap := True;
-  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;
-
-   UninstallNextButton := TNewButton.Create(UninstallProgressForm);
-   UninstallNextButton.Caption := 'Next';
-    UninstallNextButton.Parent := UninstallProgressForm;
-    UninstallNextButton.Left :=
-      UninstallProgressForm.CancelButton.Left -
-      UninstallProgressForm.CancelButton.Width -
-      ScaleX(10);
-    UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
-    UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
-    UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
-     UninstallNextButton.ModalResult := mrOk;
-
-    UninstallProgressForm.CancelButton.Enabled := True;
-    UninstallProgressForm.CancelButton.ModalResult := mrCancel;
-
-    if UninstallProgressForm.ShowModal = mrCancel then Abort;
-
-    UninstallProgressForm.InnerNotebook.ActivePage := UninstallProgressForm.InstallingPage;
-end;
-
-
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   Version: TWindowsVersion;
@@ -404,18 +353,7 @@ begin
 end;
 
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
-     var ResultCode: Integer;
 begin
-  if CurUninstallStep = usUninstall then
-  begin
-     if DoCleanCheckbox.Checked = True then
-     begin
-         Log('Running clean uninstall');
-         Exec(ExpandConstant('{app}\bin\fgfs.exe'), '--uninstall', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-         Log('clean uninstall completed');
-     end;
-  end;
-
   if CurUninstallStep = usPostUninstall then
     begin
       RemoveFirewallException('FlightGear', ExpandConstant('{app}') + '\bin\fgfs.exe');

build_release_linux.sh

@@ -7,10 +7,6 @@ fi
 
 VERSION=`cat flightgear/version`
 
-#####################################################################################
-# ensure fgrcc can run when linked against libSimGearCore, for example
-export LD_LIBRARY_PATH=$WORKSPACE/dist/lib64:$WORKSPACE/dist/lib:$LD_LIBRARY_PATH
-
 #####################################################################################
 # remove old and create fresh build directories
 cd $WORKSPACE
@@ -18,6 +14,7 @@ mkdir -p sgBuild
 mkdir -p fgBuild
 mkdir -p output
 rm -rf output/*
+rm -rf dist/*
 
 #####################################################################################
 echo "Starting on SimGear"

build_release_windows.bat

@@ -1,6 +1,5 @@
 
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
-IF NOT DEFINED IS_NIGHTLY_BUILD SET IS_NIGHTLY_BUILD=1
 
 IF %IS_NIGHTLY_BUILD% EQU 1 (
   SET FGBUILDTYPE=Nightly
@@ -24,7 +23,6 @@ cd build-sg32
 cmake ..\simgear -G "Visual Studio 14" ^
                  -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
                  -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-                 -DOSG_FSTREAM_EXPORT_FIXED=1 ^
                  -DCMAKE_PREFIX_PATH:PATH=%OSG32% ^
                  -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140
 cmake --build . --config RelWithDebInfo --target INSTALL
@@ -35,7 +33,6 @@ cmake ..\flightgear -G "Visual Studio 14" ^
                     -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%
 cmake --build . --config RelWithDebInfo --target INSTALL
@@ -50,7 +47,6 @@ cd build-sg64
 cmake ..\SimGear -G "Visual Studio 14 Win64" ^
                  -DMSVC_3RDPARTY_ROOT=%WORKSPACE%/windows-3rd-party/msvc140 ^
                  -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
-                 -DOSG_FSTREAM_EXPORT_FIXED=1 ^
                  -DCMAKE_PREFIX_PATH:PATH=%OSG64% ^
                  -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64
 cmake --build . --config RelWithDebInfo --target INSTALL
@@ -61,16 +57,14 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
                     -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^
                     -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^
                     -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^
-                    -DOSG_FSTREAM_EXPORT_FIXED=1 ^
                     -DFG_BUILD_TYPE=%FGBUILDTYPE%
 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
-%QT5SDK64%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140-64/bin/fgfs.exe
+%QT5SDK32%\bin\windeployqt --release --list target %WORKSPACE%/install/msvc140/bin/fgfs.exe
+%QT5SDK64%\bin\windeployqt --release --list target %WORKSPACE%/install/msvc140-64/bin/fgfs.exe
 
 REM build setup
 ECHO Packaging root is %WORKSPACE%
@@ -81,14 +75,9 @@ 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%
-
-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 archiving PDB files
+copy %WORKSPACE%\build-fg32\src\Main\RelWithDebInfo\fgfs.pdb %WORKSPACE%\Output\fgfs-x86-%BUILD_NUMBER%.pdb
+copy %WORKSPACE%\build-fg64\src\Main\RelWithDebInfo\fgfs.pdb %WORKSPACE%\Output\fgfs-x64-%BUILD_NUMBER%.pdb
 
 REM indirect way to get command output into an environment variable
 set PATH=%OSG32%\bin;%PATH%

catalog/catalog.py

@@ -1,281 +0,0 @@
-#!/usr/bin/python
-
-import argparse
-import datetime
-import xml.etree.cElementTree as ET
-import os
-import re
-import sgprops
-import sys
-import catalogTags
-
-CATALOG_VERSION = 4
-quiet = False
-verbose = False
-
-def warning(msg):
-    if not quiet:
-        print(msg)
-
-def log(msg):
-    if verbose:
-        print(msg)
-
-# xml node (robust) get text helper
-def get_xml_text(e):
-    if e != None and e.text != None:
-        return e.text
-    else:
-        return ''
-
-# return all available aircraft information from the set file as a
-# dict
-def scan_set_file(aircraft_dir, set_file, includes):
-    base_file = os.path.basename(set_file)
-    base_id = base_file[:-8]
-    set_path = os.path.join(aircraft_dir, set_file)
-
-    includes.append(aircraft_dir)
-    root_node = sgprops.readProps(set_path, includePaths = includes)
-
-    if not root_node.hasChild("sim"):
-        return None
-
-    sim_node = root_node.getChild("sim")
-    if sim_node == None:
-        return None
-
-    # allow -set.xml files to specifcially exclude themselves from
-    # the creation process, by setting <exclude-from-catalog>true</>
-    if (sim_node.getValue("exclude-from-catalog", False) == True):
-        return None
-
-    variant = {}
-    name = sim_node.getValue("description", None)
-    if (name == None or len(name) == 0):
-        warning("Set file " + set_file + " is missing a <description>, skipping")
-        return None
-
-    variant['name'] =  name
-    variant['status'] = sim_node.getValue("status", None)
-
-    if sim_node.hasChild('authors'):
-        # aircraft has structured authors data, handle that
-        variant['authors'] = sim_node.getChild('authors')
-    
-    # can have legacy author tag alongside new strucutred data for
-    # backwards FG compatability
-    if sim_node.hasChild('author'):
-        variant['author'] = sim_node.getValue("author", None)
-
-    if sim_node.hasChild('maintainers'):
-        variant['maintainers'] = sim_node.getChild('maintainers')
-
-    if sim_node.hasChild('urls'):
-        variant['urls'] = sim_node.getChild('urls')
-
-    if sim_node.hasChild('long-description'):
-        variant['description'] = sim_node.getValue("long-description", None)
-    variant['id'] = base_id
-
-    # allow -set.xml files to declare themselves as primary.
-    # we use this avoid needing a variant-of in every other -set.xml
-    variant['primary-set'] = sim_node.getValue('primary-set', False)
-
-    # extract and record previews for each variant
-    if sim_node.hasChild('previews'):
-        variant['previews'] = extract_previews(sim_node.getChild('previews'), aircraft_dir)
-
-    if sim_node.hasChild('rating'):
-        variant['rating'] = sim_node.getChild("rating")
-
-    if sim_node.hasChild('tags'):
-        variant['tags'] = extract_tags(sim_node.getChild('tags'), set_file)
-
-    if sim_node.hasChild('thumbnail'):
-        variant['thumbnail'] = sim_node.getValue("thumbnail", None)
-
-    variant['variant-of'] = sim_node.getValue("variant-of", None)
-
-    if sim_node.hasChild('minimum-fg-version'):
-        variant['minimum-fg-version'] = sim_node.getValue('minimum-fg-version', None)
-
-    #print '    ', variant
-    return variant
-
-def extract_previews(previews_node, aircraft_dir):
-    result = []
-    for node in previews_node.getChildren("preview"):
-        previewType = node.getValue("type", None)
-        previewPath = node.getValue("path", None)
-
-        # check path exists in base-name-dir
-        fullPath = os.path.join(aircraft_dir, previewPath)
-        if not os.path.isfile(fullPath):
-            warning("Bad preview path, skipping:" + fullPath)
-            continue
-        result.append({'type':previewType, 'path':previewPath})
-
-    return result
-
-def extract_tags(tags_node, set_path):
-    result = []
-    for node in tags_node.getChildren("tag"):
-        tag = node.value
-        # check tag is in the allowed list
-        if not catalogTags.isValidTag(tag):
-            warning("Unknown tag value:" + tag + " in " + set_path)
-        result.append(tag)
-
-    return result
-
-# scan all the -set.xml files in an aircraft directory.  Returns a
-# package dict and a list of variants.
-def scan_aircraft_dir(aircraft_dir, includes):
-    setDicts = []
-    primaryAircraft = []
-    package = None
-
-    files = os.listdir(aircraft_dir)
-    for file in sorted(files, key=lambda s: s.lower()):
-        if file.endswith('-set.xml'):
-            # 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:", os.path.join(aircraft_dir, file), sys.exc_info()[0]
-                continue
-
-            setDicts.append(d)
-            if d['primary-set']:
-                # ensure explicit primary-set aircraft goes first
-                primaryAircraft.insert(0, d)
-            elif d['variant-of'] == None:
-                primaryAircraft.append(d)
-
-    # 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:", aircraft_dir
-        primaryAircraft = [setDicts[0]]
-
-    package = primaryAircraft[0]
-    if not 'thumbnail' in package:
-        if (os.path.exists(os.path.join(aircraft_dir, "thumbnail.jpg"))):
-            package['thumbnail'] = "thumbnail.jpg"
-
-    # variants is just all the set dicts except the first one
-    variants = setDicts
-    variants.remove(package)
-    return (package, variants)
-
-# create an xml node with text content
-def make_xml_leaf(name, text):
-    leaf = ET.Element(name)
-    if text != None:
-        if isinstance(text, (int, long)):
-            leaf.text = str(text)
-        else:
-            leaf.text = text
-    else:
-        leaf.text = ''
-    return leaf
-
-def append_preview_nodes(node, variant, download_base, package_name):
-    if not 'previews' in variant:
-        return
-
-    for preview in variant['previews']:
-        preview_node = ET.Element('preview')
-        preview_url = download_base + 'previews/' + package_name + '_' + preview['path']
-        preview_node.append( make_xml_leaf('type', preview['type']) )
-        preview_node.append( make_xml_leaf('url', preview_url) )
-        preview_node.append( make_xml_leaf('path', preview['path']) )
-        node.append(preview_node)
-
-def append_tag_nodes(node, variant):
-    if not 'tags' in variant:
-        return
-
-    for tag in variant['tags']:
-        node.append(make_xml_leaf('tag', tag))
-
-def append_author_nodes(node, info):
-    if 'authors' in info:
-        node.append(info['authors']._createXMLElement())
-    if 'author' in info:
-        # traditional single author string
-        node.append( make_xml_leaf('author', info['author']) )
-
-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']) )
-
-    append_author_nodes(package_node, package)
-
-    if 'description' in package:
-        package_node.append( make_xml_leaf('description', package['description']) )
-
-    if 'minimum-fg-version' in package:
-        package_node.append( make_xml_leaf('minimum-fg-version', package['minimum-fg-version']) )
-
-    if 'rating' in package:
-        package_node.append(package['rating']._createXMLElement())
-       
-    package_node.append( make_xml_leaf('id', package['id']) )
-    for variant in variants:
-        variant_node = ET.Element('variant')
-        package_node.append(variant_node)
-        variant_node.append( make_xml_leaf('id', variant['id']) )
-        variant_node.append( make_xml_leaf('name', variant['name']) )
-        if 'description' in variant:
-            variant_node.append( make_xml_leaf('description', variant['description']) )
-
-        if 'author' in variant:
-            variant_node.append( make_xml_leaf('author', variant['author']) )
-
-        if 'thumbnail' in variant:
-            # note here we prefix with the package name, since the thumbnail path
-            # is assumed to be unique within the package
-            thumbUrl = downloadBase + "thumbnails/" + aircraftDirName + '_' + variant['thumbnail']
-            variant_node.append(make_xml_leaf('thumbnail', thumbUrl))
-            variant_node.append(make_xml_leaf('thumbnail-path', variant['thumbnail']))
-
-        variantOf = variant['variant-of']
-        if variantOf is None:
-            variant_node.append(make_xml_leaf('variant-of', '_primary_'))
-        else:
-            variant_node.append(make_xml_leaf('variant-of', variantOf))
-
-        append_preview_nodes(variant_node, variant, downloadBase, aircraftDirName)
-        append_tag_nodes(variant_node, variant)
-        append_author_nodes(variant_node, variant)
-
-    package_node.append( make_xml_leaf('dir', aircraftDirName) )
-
-    download_url = downloadBase + aircraftDirName + '.zip'
-    package_node.append( make_xml_leaf('url', download_url) )
-
-    if 'thumbnail' in package:
-        thumbnail_url = downloadBase + 'thumbnails/' + aircraftDirName + '_' + package['thumbnail']
-        package_node.append( make_xml_leaf('thumbnail', thumbnail_url) )
-        package_node.append( make_xml_leaf('thumbnail-path', package['thumbnail']))
-
-    append_preview_nodes(package_node, package, downloadBase, aircraftDirName)
-    append_tag_nodes(package_node, package)
-
-    if 'maintainers' in package:
-        package_node.append(package['maintainers']._createXMLElement())
-
-    if 'urls' in package:
-        package_node.append(package['urls']._createXMLElement())
-
-    return package_node

catalog/catalogTags.py

@@ -1,161 +1,80 @@
 aircraftTypeTags = [
-    "aerobatic",
-    "airship",
-    "balloon",
-    "bizjet",
-    "bomber",
-    "cargo",
-    "carrier",
-    "fighter",
-    "ga",
-    "glider",
-    "groundvehicle",
-    "helicopter",
-    "racer",
-    "spaceship",
-    "tanker",
-    "trainer",
-    "transport",
-    "ultralight",
-    "reconnaissance",
-    "seacraft",
-    "crop-duster",
-    "bush-plane"
+    "ga", "fighter", "helicopter", "glider", "spaceship", "bomber", "groundvehicle",
+    "tanker", "cargo", "transport", "bizjet", "trainer", "airship", "balloon"
 ]
 
 manufacturerTags = [
-    "airbus",
-    "antonov",
-    "atr",
-    "avro",
-    "bell",
-    "bleriot",
-    "boeing",
-    "bombardier",
-    "caudron",
-    "cessna",
-    "consolidated",
-    "dassault",
-    "diamond",
-    "dornier",
-    "douglas",
-    "embraer",
-    "eurocopter",
-    "fairchild",
-    "fairey",
-    "focke-wulf",
-    "fokker",
-    "general-dynamics",
-    "gotha",
-    "grumman",
-    "handley-page",
-    "hawker",
-    "heinkel",
-    "ilyushin",
-    "junkers",
-    "lockheed",
-    "mc-donnell-douglas",
-    "messerschmitt",
-    "mikoyan-gurevich",
-    "mitsubishi",
-    "north-american",
-    "northrop",
-    "pilatus",
-    "piper",
-    "republic",
-    "robin",
-    "saab",
-    "short",
-    "sopwith",
-    "spad",
-    "sukhoi",
-    "supermarine",
-    "tupolev",
-    "vickers",
-    "vought",
-    "yakovlev"
+    "boeing", "cessna", "diamond", "douglas", "bell", "piper",
+    "airbus", "vickers", "lockheed", "fokker",
+    "embraer", "bombardier", "pilatus", "robin",
+    "eurocopter"
 ]
 
 eraTags = [
-    "1910s",
+    "early-pioneers",
+    "ww1",
     "1920s",
     "1930s",
-    "1940s",
+    "golden-age",
+    "ww2",
+    "coldwar", "vietnam",
     "1950s",
     "1960s",
     "1970s",
     "1980s",
     "1990s",
     "2000s",
-    "2010s",
-    "coldwar",
-    "early-pioneers",
-    "golden-age",
     "gulfwar1",
-    "gulfwar2",
-    "vietnam",
-    "ww1",
-    "ww2"
+    "gulfwar2"
 ]
 
 featureTags = [
-    "aerobatic",
-    "airship",
-    "amphibious",
-    "biplane",
-    "canard",
-    "castering-wheel",
-    "delta",
-    "etops",
-    "experimental",
-    "fictional",
-    "fixed-gear",
-    "floats",
-    "glass-cockpit",
-    "high-wing",
-    "h-tail",
-    "hud",
     "ifr",
-    "prototype",
-    "refuel",
     "retractable-gear",
+    "fixed-gear",
+    "tail-dragger",
     "seaplane",
-    "skis",
+    "vtol",
     "stol",
+    "experimental",
+    "prototype",
+    "fictional",
+    "biplane",
+    "triplane",
     "supersonic",
     "t-tail",
-    "tail-dragger",
-    "tricycle",
-    "tail-hook",
-    "triplane",
     "v-tail",
+    "high-wing",
+    "cannard",
+    "tail-hook",
+    "refuel",
+    "delta",
     "variable-geometry",
-    "vtol",
-    "wing-fold"
+    "glass-cockpit",
+    "hud",
+    "etops",
+    "floats",
+    "amphibious",
+    "airship",
+    "aerobatic"
 ]
 
 propulsionTags = [
-    "afterburner",
+    "piston", "radial",
     "diesel",
-    "electric",
-    "jet",
-    "propeller",
-    "piston",
-    "radial",
-    "rocket",
-    "single-engine",
+    "variable-pitch",
     "supercharged",
     "turboprop",
+    "jet", "afterburner", "rocket",
+    "electric",
     "twin-engine",
-    "variable-pitch",
-    "fixed-pitch"
+    "single-engine"
 ]
 
 simFeatureTags = [
-    "dual-controls",
-    "rembrandt",
     "tow",
-    "wildfire"
+    "dual-controls",
+    "rembrandt"
 ]
 
 tags = aircraftTypeTags + manufacturerTags + eraTags + simFeatureTags + propulsionTags + featureTags

catalog/check_aircraft.py

@@ -1,73 +0,0 @@
-#!/usr/bin/python
-
-import argparse
-import os
-import sgprops
-
-def check_meta_data(aircraft_dir, set_file, includes):
-    base_file = os.path.basename(set_file)
-    base_id = base_file[:-8]
-    set_path = os.path.join(aircraft_dir, set_file)
-
-    includes.append(aircraft_dir)
-    root_node = sgprops.readProps(set_path, includePaths = includes)
-
-    if not root_node.hasChild("sim"):
-        print "-set.xml has no <sim> node:", set_path
-        return
-
-    sim_node = root_node.getChild("sim")
-    if not sim_node.hasChild('description'):
-        print "-set.xml missing <description>:", set_path
-
-    if not sim_node.hasChild('long-description'):
-        print "-set.xml missing <long-description>:", set_path
-
-    if not sim_node.hasChild('authors'):
-        print "-set.xml is missing structured <authors> data:", set_path
-
-    if not sim_node.hasChild('tags'):
-        print "-set.xml does not define any tags", set_path
-
-    # check for non-standard tags
-
-    if not sim_node.hasChild('thumbnail'):
-        print "-set.xml does not define a thumbnail", set_path
-
-    # check thumbnail size and format
-
-    if not sim_node.hasChild('rating'):
-        print "-set.xml does not define any ratings", set_path
-
-    if not sim_node.hasChild('minimum-fg-version'):
-        print "-set.xml does not define a minimum FG version", set_path
-
-# check all the -set.xml files in an aircraft directory.  
-def check_aircraft_dir(d, includes):
-    if not os.path.isdir(d):
-        return
-
-    files = os.listdir(d)
-    for file in sorted(files, key=lambda s: s.lower()):
-        if file.endswith('-set.xml'):
-            check_meta_data(d, file, includes)
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--include", help="Include directory to validate -set.xml parsing",
-                    action="append", dest='include', default=[])
-parser.add_argument("dir", nargs='+', help="Aircraft directory")
-args = parser.parse_args()
-
-for d in args.dir:
-    if not os.path.isdir(d):
-        print "Skipping missing directory:", d
-
-    names = os.listdir(d)
-    for name in sorted(names, key=lambda s: s.lower()):
-        # if name in skip_list:
-        #     print "skipping:", name
-        #     continue
-
-        acftDir = os.path.join(d, name)
-        check_aircraft_dir(acftDir, args.include)
-    

catalog/fgaddon-catalog/template.xml

@@ -6,13 +6,13 @@
     <version n="1">3.5.*</version>
     <version n="2">3.6.*</version>
     <version n="3">3.7.*</version>
+    <version n="4">2016.1.*</version>
     <version n="5">2016.*.*</version>
     <version n="6">2017.*.*</version>
-    <version n="7">2018.*.*</version>
     <id>org.flightgear.fgaddon</id>
     <license>GPL</license>
     <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-    <name>FlightGear aircraft distribution from fgaddon</name>
+    <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.</description>
     <de>
       <description>Auf Deutsch</description>

catalog/sgprops.py

@@ -133,8 +133,6 @@ class Node(object):
                         n.set('type', "bool")
         except UnicodeEncodeError:
             print "Encoding error with", self._value, type(self._value)
-        except:
-            print "Some other exceptiong in sgprops._createXMLElement()"
 
         # index in parent
         if (self.index != 0):

catalog/testData/Aircraft/c150/c150-set.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList>
-  <sim>
-    <name>c150</name>
-    <description>Cessna 150</description>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/c172/c172-set.xml

@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList>
-  <sim>
-    <name>c172</name>
-    <description>Cessna 172P</description>
-    <author>Wilbur Wright</author>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/dc3/dc3-set.xml

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList>
-  <sim>
-    <name>dc3</name>
-    <description>Douglas DC-3</description>
-    <author>Donald Douglas</author>
-    <authors>
-        <author>
-            <name>Donald Douglas</name>
-            <nick>dd</nick>
-            <email>dd@douglas.com</email>
-            <description>Made all the stuff</description>
-        </author>
-    </authors>
-    <urls>
-        <support>https://bugtracker.douglas.com/</support>
-        <home-page>http://www.douglas.com</home-page>
-    </urls>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16-common.xml

@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList>
-  <sim include="settings-common.xml">
-    <authors>
-      <author n="0">
-        <name>Wilbur Wright</name>
-        <email>ww@wright.com</email>
-        <nick>wilburw</nick>
-        <description>Model, FDM and cockpit</description>
-      </author>
-      <author n="1">
-        <name>Orville Wright</name>
-        <description>Testing and systems</description>
-      </author>
-    </authors>
-    <tags>
-      <tag>fighter</tag>
-      <tag>1980s</tag>
-      <tag>glass-cockpit</tag>
-    </tags>
-    <minimum-fg-version>2017.4</minimum-fg-version>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16-excluded-set.xml

@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList include="f16-common.xml">
-  <sim>
-    <exclude-from-catalog type="bool">true</exclude-from-catalog> 
-    <name>f16-excluded</name>
-    <description>Fine</description>
-    <long-description>Blah blah blah</long-description>
-    <variant-of>f16a</variant-of>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16-trainer-set.xml

@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList include="f16-common.xml">
-  <sim>
-    <name>f16-trainer</name>
-    <description>F16 Trainer</description>
-    <long-description>Twin-seat trainer version of the F16</long-description>
-
-
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16a-set.xml

@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList include="f16-common.xml">
-  <sim>
-    <name>f16a</name>
-    <description>F16-A</description>
-    <long-description>The F16 is compact, light-weight multi-role fighter used around the world</long-description>
-
-    <primary-set type="bool">true</primary-set>
-    
-    <rating>
-      <FDM type="int">3</FDM>
-      <systems type="int">1</systems>
-      <cockpit type="int">2</cockpit>
-      <model type="int">5</model>
-    </rating>
-
-    <previews>
-        <preview>
-          <type>exterior</type>
-          <splash type="bool">true</splash>
-          <path>Previews/exterior-1.png</path>
-        </preview>
-        <preview>
-          <type>exterior</type>
-          <splash type="bool">true</splash>
-          <path>Previews/exterior-f16a-2.png</path>
-        </preview>
-        <preview>
-          <type>panel</type>
-          <splash type="bool">false</splash>
-          <path>Previews/cockpit.png</path>
-        </preview>
-      </previews>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16b-set.xml

@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList include="f16-common.xml">
-  <sim>
-    <name>f16b</name>
-    <description>F16-B</description>
-    <long-description>The F16-B is an upgraded version of the F16A.</long-description>
-    <variant-of>f16a</variant-of>
-
-    <authors n="0">
-      <author n="0">
-        <name>James T Kirk</name>
-        <email>shatner@enterprise.com</email>
-        <nick>starlover</nick>
-        <description>Everything</description>
-      </author>
-    </authors>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16broken-set.xml

@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList include="f16-common.xml">
-  <sim>
-    <name>f16broken</name>
-    <!-- <description></description> -->
-    <description></description>
-    <long-description>Blah blah blah</long-description>
-    <variant-of>f16a</variant-of>
-  </sim>
-
-</PropertyList>

catalog/testData/Aircraft/f16/f16c-set.xml

@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList include="f16-common.xml">
-  <sim>
-    <name>f16c</name>
-    <description>F16-C</description>
-    <long-description>The F16-C is an upgraded version of the F16A.</long-description>
-    <variant-of>f16a</variant-of>
-  </sim>
-
-</PropertyList>

catalog/testData/OtherDir/settings-common.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- this file exists to test including + overlaying in the set XML -->
-
-<PropertyList>
-    <views>
-      <view n="0">
-        <foo>dsdddd</foo>
-      </view>
-    </views>
-
-</PropertyList>

catalog/testData/bad-index.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PropertyList>
+<?xml version="1.0" encoding="UTF-8"?>
+<PropertyList>
   <sim>
     <!-- found in the F-15 XML -->
-    <uhf n="[0]">
-      <frequencies>
-        <selected-mhz type="int">225000</selected-mhz>
-      </frequencies>
-    </uhf>
-  </sim>
-</PropertyList> 
+    <uhf n="[0]">
+      <frequencies>
+        <selected-mhz type="int">225000</selected-mhz>
+      </frequencies>
+    </uhf>
+  </sim>
+</PropertyList>

catalog/test_catalog.py

@@ -1,238 +0,0 @@
-#!/usr/bin/python
-
-import unittest
-import sgprops
-import os
-import catalog
-import xml.etree.cElementTree as ET
-
-catalog.quiet = True
-
-class UpdateCatalogTests(unittest.TestCase):
-    def test_scan_set(self):
-        info = catalog.scan_set_file("testData/Aircraft/f16", "f16a-set.xml", ["testData/OtherDir"])
-        self.assertEqual(info['id'], 'f16a')
-        self.assertEqual(info['name'], 'F16-A')
-        self.assertEqual(info['primary-set'], True)
-        self.assertEqual(info['variant-of'], None)
-       # self.assertEqual(info['rating_FDM'], 3)
-      #  self.assertEqual(info['rating_model'], 5)
-
-        ratings = info['rating']
-        self.assertEqual(ratings.getValue('FDM'), 3)
-        self.assertEqual(ratings.getValue('model'), 5)
-
-        self.assertEqual(len(info['tags']), 3)
-        self.assertEqual(info['minimum-fg-version'], '2017.4')
-
-        authors = info['authors']
-        self.assertNotIn('author', info)
-        self.assertEqual(len(authors.getChildren()), 2)
-
-        self.assertEqual(authors.getValue('author[0]/name'), 'Wilbur Wright')
-        self.assertEqual(authors.getValue('author[0]/nick'), 'wilburw')
-        self.assertEqual(authors.getValue('author[0]/email'), 'ww@wright.com')
-        self.assertEqual(authors.getValue('author[1]/name'), 'Orville Wright')
-
-
-    def test_scan_dir(self):
-        (pkg, variants) = catalog.scan_aircraft_dir("testData/Aircraft/f16", ["testData/OtherDir"])
-
-        self.assertEqual(pkg['id'], 'f16a')
-        f16trainer = next(v for v in variants if v['id'] == 'f16-trainer')
-        self.assertEqual(len(variants), 3)
-        self.assertEqual(pkg['minimum-fg-version'], '2017.4')
-
-        # test variant relatonship between
-        self.assertEqual(pkg['variant-of'], None)
-        self.assertEqual(pkg['primary-set'], True)
-
-        self.assertEqual(f16trainer['variant-of'], None)
-        self.assertEqual(f16trainer['primary-set'], False)
-
-        f16b = next(v for v in variants if v['id'] == 'f16b')
-        self.assertEqual(f16b['variant-of'], 'f16a')
-        self.assertEqual(f16b['primary-set'], False)
-
-        authorsArray = f16b['authors']
-        self.assertNotIn('author', f16b)
-
-        self.assertEqual(authorsArray.getValue('author[0]/name'), 'James T Kirk')
-        self.assertEqual(authorsArray.getValue('author[0]/nick'), 'starlover')
-
-        f16c = next(v for v in variants if v['id'] == 'f16c')
-        self.assertEqual(f16c['variant-of'], 'f16a')
-        self.assertEqual(f16c['primary-set'], False)
-
-        authors = f16c['authors']
-        self.assertNotIn('author', f16c)
-        self.assertEqual(len(authors.getChildren()), 2)
-
-    # test some older constructs for compat
-    def test_scan_dir_legacy(self):
-        (pkg, variants) = catalog.scan_aircraft_dir("testData/Aircraft/c172", [])
-
-        self.assertEqual(pkg['id'], 'c172')
-        self.assertEqual(pkg['author'], 'Wilbur Wright')
-
-    def test_extract_previews(self):
-        info = catalog.scan_set_file("testData/Aircraft/f16", "f16a-set.xml", ["testData/OtherDir"])
-        previews = info['previews']
-        self.assertEqual(len(previews), 3)
-        self.assertEqual(2, len([p for p in previews if p['type'] == 'exterior']))
-        self.assertEqual(1, len([p for p in previews if p['type'] == 'panel']))
-        self.assertEqual(1, len([p for p in previews if p['path'] == 'Previews/exterior-1.png']))
-
-    def test_extract_tags(self):
-        info = catalog.scan_set_file("testData/Aircraft/f16", "f16a-set.xml", ["testData/OtherDir"])
-        tags = info['tags']
-
-    def test_node_creation(self):
-        (pkg, variants) = catalog.scan_aircraft_dir("testData/Aircraft/f16", ["testData/OtherDir"])
-
-        catalog_node = ET.Element('PropertyList')
-        catalog_root = ET.ElementTree(catalog_node)
-
-        pkgNode = catalog.make_aircraft_node('f16', pkg, variants, "http://foo.com/testOutput/")
-        catalog_node.append(pkgNode)
-
-        # write out so we can parse using sgprops
-        # yes we are round-tripping via the disk, if you can improve
-        # then feel free..
-        if not os.path.isdir("testOutput"):
-            os.mkdir("testOutput")
-
-        cat_file = os.path.join("testOutput", 'catalog_fragment.xml')
-        catalog_root.write(cat_file, encoding='utf-8', xml_declaration=True)
-
-        parsed = sgprops.readProps(cat_file)
-        parsedPkgNode = parsed.getChild("package")
-
-        self.assertEqual(parsedPkgNode.name, "package");
-
-        self.assertEqual(parsedPkgNode.getValue('id'), pkg['id']);
-        self.assertEqual(parsedPkgNode.getValue('dir'), 'f16');
-        self.assertEqual(parsedPkgNode.getValue('url'), 'http://foo.com/testOutput/f16.zip');
-        self.assertEqual(parsedPkgNode.getValue('thumbnail'), 'http://foo.com/testOutput/thumbnails/f16_thumbnail.jpg');
-        self.assertEqual(parsedPkgNode.getValue('thumbnail-path'), 'thumbnail.jpg');
-
-        self.assertEqual(parsedPkgNode.getValue('name'), pkg['name']);
-        self.assertEqual(parsedPkgNode.getValue('description'), pkg['description']);
-
-        self.assertEqual(parsedPkgNode.getValue('minimum-fg-version'), "2017.4");
-
-        parsedVariants = parsedPkgNode.getChildren("variant")
-        self.assertEqual(len(parsedVariants), 3)
-
-        # verify rating copying
-        self.assertEqual(parsedPkgNode.getValue('rating/FDM'), 3)
-        self.assertEqual(parsedPkgNode.getValue('rating/cockpit'), 2)
-        self.assertEqual(parsedPkgNode.getValue('rating/model'), 5)
-
-
-# author data verification
-        self.assertFalse(parsedPkgNode.hasChild('author'));
-        parsedAuthors = parsedPkgNode.getChild("authors").getChildren('author')
-
-        self.assertEqual(len(parsedAuthors), 2)
-        author1 = parsedAuthors[0]
-        self.assertEqual(author1.getValue("name"), "Wilbur Wright")
-        self.assertEqual(author1.getValue("nick"), "wilburw")
-        self.assertEqual(author1.getValue("email"), "ww@wright.com")
-
-        author2 = parsedAuthors[1]
-        self.assertEqual(author2.getValue("name"), "Orville Wright")
-
-        f16ANode = parsedPkgNode
-        self.assertEqual(f16ANode.getValue('name'), 'F16-A');
-
-        for index, pv in enumerate(parsedVariants):
-            var = variants[index]
-            self.assertEqual(pv.getValue('name'), var['name']);
-            self.assertEqual(pv.getValue('description'), var['description']);
-
-            if (var['id'] == 'f16-trainer'):
-                self.assertEqual(pv.getValue('variant-of'), '_primary_')
-            #    self.assertEqual(pv.getValue('author'), "Wilbur Wright");
-            elif (var['id'] == 'f16b'):
-                self.assertEqual(pv.getValue('variant-of'), 'f16a')
-                self.assertEqual(pv.getValue('description'), 'The F16-B is an upgraded version of the F16A.')
-
-                # variant author verification
-                parsedAuthors = pv.getChild("authors").getChildren('author')
-                author1 = parsedAuthors[0]
-                self.assertEqual(author1.getValue("name"), "James T Kirk")
-                self.assertEqual(author1.getValue("nick"), "starlover")
-                self.assertEqual(author1.getValue("email"), "shatner@enterprise.com")
-                self.assertEqual(author1.getValue("description"), "Everything")
-
-    def test_node_creation2(self):
-        (pkg, variants) = catalog.scan_aircraft_dir("testData/Aircraft/dc3", ["testData/OtherDir"])
-
-        catalog_node = ET.Element('PropertyList')
-        catalog_root = ET.ElementTree(catalog_node)
-
-        pkgNode = catalog.make_aircraft_node('dc3', pkg, variants, "http://foo.com/testOutput/")
-        catalog_node.append(pkgNode)
-
-        if not os.path.isdir("testOutput"):
-            os.mkdir("testOutput")
-
-        cat_file = os.path.join("testOutput", 'catalog_fragment2.xml')
-        catalog_root.write(cat_file, encoding='utf-8', xml_declaration=True)
-
-        parsed = sgprops.readProps(cat_file)
-        parsedPkgNode = parsed.getChild("package")
-
-        self.assertEqual(parsedPkgNode.name, "package");
-
-        self.assertEqual(parsedPkgNode.getValue('id'), pkg['id']);
-        self.assertEqual(parsedPkgNode.getValue('dir'), 'dc3');
-        self.assertEqual(parsedPkgNode.getValue('url'), 'http://foo.com/testOutput/dc3.zip');
-      
-        self.assertEqual(parsedPkgNode.getValue('author'), 'Donald Douglas');
-
-        parsedAuthors = parsedPkgNode.getChild("authors").getChildren('author')
-        self.assertEqual(len(parsedAuthors), 1)
-        author1 = parsedAuthors[0]
-        self.assertEqual(author1.getValue("name"), "Donald Douglas")
-        self.assertEqual(author1.getValue("nick"), "dd")
-        self.assertEqual(author1.getValue("email"), "dd@douglas.com")
-
-        urls = parsedPkgNode.getChild('urls')
-        self.assertEqual(urls.getValue('home-page'), 'http://www.douglas.com')
-
-    def test_minimalAircraft(self):
-        # test an aircraft with a deliberately spartan -set.xml file with
-        # most interesting data missing
-        (pkg, variants) = catalog.scan_aircraft_dir("testData/Aircraft/c150", ["testData/OtherDir"])
-
-        catalog_node = ET.Element('PropertyList')
-        catalog_root = ET.ElementTree(catalog_node)
-
-        pkgNode = catalog.make_aircraft_node('c150', pkg, variants, "http://foo.com/testOutput/")
-        catalog_node.append(pkgNode)
-
-        if not os.path.isdir("testOutput2"):
-            os.mkdir("testOutput2")
-
-        cat_file = os.path.join("testOutput2", 'catalog_fragment.xml')
-        catalog_root.write(cat_file, encoding='utf-8', xml_declaration=True)
-
-        parsed = sgprops.readProps(cat_file)
-        parsedPkgNode = parsed.getChild("package")
-
-        self.assertEqual(parsedPkgNode.getValue('id'), pkg['id'])
-        self.assertEqual(parsedPkgNode.getValue('dir'), 'c150')
-        self.assertEqual(parsedPkgNode.getValue('url'), 'http://foo.com/testOutput/c150.zip')
-        self.assertFalse(parsedPkgNode.hasChild('thumbnail'))
-        self.assertFalse(parsedPkgNode.hasChild('thumbnail-path'));
-
-        self.assertEqual(parsedPkgNode.getValue('name'), pkg['name']);
-        self.assertFalse(parsedPkgNode.hasChild('description'));
-        self.assertFalse(parsedPkgNode.hasChild('author'));
-        self.assertFalse(parsedPkgNode.hasChild('minimum-fg-version'));
-        self.assertFalse(parsedPkgNode.hasChild('variant'));
-
-if __name__ == '__main__':
-    unittest.main()

catalog/update-catalog.py

@@ -12,7 +12,6 @@ import time
 import sgprops
 import sys
 import catalogTags
-import catalog
 
 CATALOG_VERSION = 4
 
@@ -36,6 +35,141 @@ def get_xml_text(e):
     else:
         return ''
 
+# create an xml node with text content
+def make_xml_leaf(name, text):
+    leaf = ET.Element(name)
+    if text != None:
+        if isinstance(text, (int, long)):
+            leaf.text = str(text)
+        else:
+            leaf.text = text
+    else:
+        leaf.text = ''
+    return leaf
+
+# return all available aircraft information from the set file as a
+# dict
+def scan_set_file(aircraft_dir, set_file):
+    global includes
+
+    base_file = os.path.basename(set_file)
+    base_id = base_file[:-8]
+    set_path = os.path.join(aircraft_dir, set_file)
+
+    local_includes = includes
+    local_includes.append(aircraft_dir)
+    root_node = sgprops.readProps(set_path, includePaths = local_includes)
+
+    if not root_node.hasChild("sim"):
+        return None
+
+    sim_node = root_node.getChild("sim")
+    if sim_node == None:
+        return None
+
+    variant = {}
+    variant['name'] = sim_node.getValue("description", None)
+    variant['status'] = sim_node.getValue("status", None)
+    variant['author'] = sim_node.getValue("author", None)
+    variant['description'] = sim_node.getValue("long-description", None)
+    variant['id'] = base_id
+
+    # allow -set.xml files to declare themselves as primary.
+    # we use this avoid needing a variant-of in every other -set.xml
+    variant['primary-set'] = sim_node.getValue('primary-set', False)
+
+    # extract and record previews for each variant
+    if sim_node.hasChild('previews'):
+        print "has previews ..."
+        variant['previews'] = extract_previews(sim_node.getChild('previews'), aircraft_dir)
+
+    if sim_node.hasChild('rating'):
+        rating_node = sim_node.getChild("rating")
+        variant['rating_FDM'] = rating_node.getValue("FDM", 0)
+        variant['rating_systems'] = rating_node.getValue("systems", 0)
+        variant['rating_cockpit'] = rating_node.getValue("cockpit", 0)
+        variant['rating_model'] = rating_node.getValue("model", 0)
+
+    if sim_node.hasChild('tags'):
+        variant['tags'] = extract_tags(sim_node.getChild('tags'), set_file)
+
+    variant['variant-of'] = sim_node.getValue("variant-of", None)
+    #print '    ', variant
+    return variant
+
+def extract_previews(previews_node, aircraft_dir):
+    result = []
+    for node in previews_node.getChildren("preview"):
+        previewType = node.getValue("type", None)
+        previewPath = node.getValue("path", None)
+
+        # check path exists in base-name-dir
+        fullPath = os.path.join(aircraft_dir, previewPath)
+        if not os.path.isfile(fullPath):
+            print "Bad preview path, skipping:" + fullPath
+            continue
+        result.append({'type':previewType, 'path':previewPath})
+
+    return result
+
+def extract_tags(tags_node, set_path):
+    result = []
+    for node in tags_node.getChildren("tag"):
+        tag = node.value
+        # check tag is in the allowed list
+        if not catalogTags.isValidTag(tag):
+            print "Unknown tag value:", tag, " in ", set_path
+        result.append(tag)
+
+    return result
+
+# scan all the -set.xml files in an aircraft directory.  Returns a
+# package dict and a list of variants.
+def scan_aircraft_dir(aircraft_dir):
+    # old way of finding the master aircraft: it's the only one whose
+    # variant-of is empty. All the others have an actual value
+    # newer alternative is to specify one -set.xml as the primary. All the
+    # others are therefore variants.
+    setDicts = []
+    found_master = False
+    package = None
+
+    files = os.listdir(aircraft_dir)
+    for file in sorted(files, key=lambda s: s.lower()):
+        if file.endswith('-set.xml'):
+            try:
+                d = scan_set_file(aircraft_dir, file)
+                if d == None:
+                    continue
+            except:
+                print "Skipping set file since couldn't be parsed:", os.path.join(aircraft_dir, file), sys.exc_info()[0]
+                continue
+
+            setDicts.append(d)
+            if d['primary-set']:
+                found_master = True
+                package = d
+
+    # didn't find a dict identified explicitly as the primary, look for one
+    # with an undefined variant-of
+    if not found_master:
+        for d in setDicts:
+            if d['variant-of'] == '':
+                found_master = True
+                package = d
+                break
+
+    if not found_master:
+        if len(setDicts) > 1:
+            print "Warning, no explicit primary set.xml in " + aircraft_dir
+        # use the first one
+        package = setDicts[0]
+
+    # variants is just all the set dicts except the master
+    variants = setDicts
+    variants.remove(package)
+    return (package, variants)
+
 # use svn commands to report the last change date within dir
 def last_change_date_svn(dir):
     command = [ 'svn', 'info', dir ]
@@ -84,6 +218,18 @@ def get_md5sum(file):
     f.close()
     return md5sum
 
+def append_preview_nodes(node, variant, download_base, package_name):
+    if not 'previews' in variant:
+        return
+
+    for preview in variant['previews']:
+        preview_node = ET.Element('preview')
+        preview_url = download_base + 'previews/' + package_name + '_' + preview['path']
+        preview_node.append( make_xml_leaf('type', preview['type']) )
+        preview_node.append( make_xml_leaf('url', preview_url) )
+        preview_node.append( make_xml_leaf('path', preview['path']) )
+        node.append(preview_node)
+
 def copy_previews_for_variant(variant, package_name, package_dir, previews_dir):
     if not 'previews' in variant:
         return
@@ -103,97 +249,12 @@ def copy_previews_for_package(package, variants, package_name, package_dir, prev
     for v in variants:
         copy_previews_for_variant(v, package_name, package_dir, previews_dir)
 
-def copy_thumbnail_for_variant(variant, package_name, package_dir, thumbnails_dir):
-    if not 'thumbnail' in variant:
+def append_tag_nodes(node, variant):
+    if not 'tags' in variant:
         return
 
-    thumb_src = os.path.join(package_dir, variant['thumbnail'])
-    thumb_dst = os.path.join(thumbnails_dir, package_name + '_' + variant['thumbnail'])
-
-    dir = os.path.dirname(thumb_dst)
-    if not os.path.isdir(dir):
-        os.makedirs(dir)
-    if os.path.exists(thumb_src):
-        shutil.copy2(thumb_src, thumb_dst)
-
-def copy_thumbnails_for_package(package, variants, package_name, package_dir, thumbnails_dir):
-    copy_thumbnail_for_variant(package, package_name, package_dir, thumbnails_dir)
-
-    # and now each variant in turn
-    for v in variants:
-        copy_thumbnail_for_variant(v, package_name, package_dir, thumbnails_dir)
-
-def process_aircraft_dir(name, repo_path):
-    global includes
-    global download_base
-    global output_dir
-    global valid_zips
-    global previews_dir
-
-    aircraft_dir = os.path.join(repo_path, name)
-    if not os.path.isdir(aircraft_dir):
-        return
-
-    (package, variants) = catalog.scan_aircraft_dir(aircraft_dir, includes)
-    if package == None:
-        print "skipping:", name, "(no -set.xml files)"
-        return
-
-    print "%s:" % name,
-
-    package_node = catalog.make_aircraft_node(name, package, variants, download_base)
-
-    download_url = download_base + name + '.zip'
-    if 'thumbnail' in package:
-        # this is never even used, but breaks the script by assuming
-        # all aircraft packages have thumbnails defined?
-        thumbnail_url = download_base + 'thumbnails/' + name + '_' + package['thumbnail']
-
-    # get cached md5sum if it exists
-    md5sum = get_xml_text(md5sum_root.find(str('aircraft_' + name)))
-
-    # now do the packaging and rev number stuff
-    dir_mtime = scan_dir_for_change_date_mtime(aircraft_dir)
-    if repo_type == 'svn':
-        rev = last_change_date_svn(aircraft_dir)
-    else:
-        d = datetime.datetime.utcfromtimestamp(dir_mtime)
-        rev = d.strftime("%Y%m%d")
-    package_node.append( catalog.make_xml_leaf('revision', rev) )
-    #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
-        print "updating:", zipfile
-        make_aircraft_zip(repo_path, name, zipfile)
-        md5sum = get_md5sum(zipfile)
-    else:
-        print "(no change)"
-        if md5sum == "":
-            md5sum = get_md5sum(zipfile)
-    filesize = os.path.getsize(zipfile)
-    package_node.append( catalog.make_xml_leaf('md5', md5sum) )
-    package_node.append( catalog.make_xml_leaf('file-size-bytes', filesize) )
-
-    # handle md5sum cache
-    node = md5sum_root.find('aircraft_' + name)
-    if node != None:
-        node.text = md5sum
-    else:
-        md5sum_root.append( catalog.make_xml_leaf('aircraft_' + name, md5sum) )
-
-    # handle thumbnails
-    copy_thumbnails_for_package(package, variants, name, aircraft_dir, thumbnail_dir)
-
-    catalog_node.append(package_node)
-
-    # copy previews for the package and variants into the
-    # output directory
-    copy_previews_for_package(package, variants, name, aircraft_dir, previews_dir)
+    for tag in variant['tags']:
+        node.append(make_xml_leaf('tag', tag))
 
 #def get_file_stats(file):
 #    f = open(file, 'r')
@@ -227,9 +288,6 @@ else:
 scm_list = config_node.findall('scm')
 upload_node = config_node.find('upload')
 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 == '':
     output_dir = os.path.join(args.dir, 'output')
@@ -303,9 +361,108 @@ for scm in scm_list:
             print "skipping:", name
             continue
 
-        # process each aircraft in turn
-        # print name, repo_path
-        process_aircraft_dir(name, repo_path)
+        aircraft_dir = os.path.join(repo_path, name)
+        if os.path.isdir(aircraft_dir):
+            print "%s:" % name,
+            (package, variants) = scan_aircraft_dir(aircraft_dir)
+            if package == None:
+                print "skipping:", name, "(no -set.xml files)"
+                continue
+            #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']) )
+            package_node.append( make_xml_leaf('author', package['author']) )
+            package_node.append( make_xml_leaf('description', package['description']) )
+            if 'rating_FDM' in package or 'rating_systems' in package \
+               or 'rating_cockpit' in package or 'rating_model' in package:
+                rating_node = ET.Element('rating')
+                package_node.append(rating_node)
+                rating_node.append( make_xml_leaf('FDM',
+                                                  package['rating_FDM']) )
+                rating_node.append( make_xml_leaf('systems',
+                                                  package['rating_systems']) )
+                rating_node.append( make_xml_leaf('cockpit',
+                                                  package['rating_cockpit']) )
+                rating_node.append( make_xml_leaf('model',
+                                                  package['rating_model']) )
+            package_node.append( make_xml_leaf('id', package['id']) )
+            for variant in variants:
+                variant_node = ET.Element('variant')
+                package_node.append(variant_node)
+                variant_node.append( make_xml_leaf('id', variant['id']) )
+                variant_node.append( make_xml_leaf('name', variant['name']) )
+                if 'description' in variant:
+                    variant_node.append( make_xml_leaf('description', variant['description']) )
+
+                if 'author' in variant:
+                    variant_node.append( make_xml_leaf('author', variant['author']) )
+
+                append_preview_nodes(variant_node, variant, download_base, name)
+                append_tag_nodes(variant_node, variant)
+
+            package_node.append( make_xml_leaf('dir', name) )
+            if not download_base.endswith('/'):
+                download_base += '/'
+            download_url = download_base + name + '.zip'
+            thumbnail_url = download_base + 'thumbnails/' + name + '_thumbnail.jpg'
+            package_node.append( make_xml_leaf('url', download_url) )
+            package_node.append( make_xml_leaf('thumbnail', thumbnail_url) )
+
+            append_preview_nodes(package_node, package, download_base, name)
+            append_tag_nodes(package_node, package)
+
+            # todo: url (download), thumbnail (download url)
+
+            # get cached md5sum if it exists
+            md5sum = get_xml_text(md5sum_root.find(str('aircraft_' + name)))
+
+            # now do the packaging and rev number stuff
+            dir_mtime = scan_dir_for_change_date_mtime(aircraft_dir)
+            if repo_type == 'svn':
+                rev = last_change_date_svn(aircraft_dir)
+            else:
+                d = datetime.datetime.utcfromtimestamp(dir_mtime)
+                rev = d.strftime("%Y%m%d")
+            package_node.append( make_xml_leaf('revision', rev) )
+            #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
+                print "updating:", zipfile
+                make_aircraft_zip(repo_path, name, zipfile)
+                md5sum = get_md5sum(zipfile)
+            else:
+                print "(no change)"
+                if md5sum == "":
+                    md5sum = get_md5sum(zipfile)
+            filesize = os.path.getsize(zipfile)
+            package_node.append( make_xml_leaf('md5', md5sum) )
+            package_node.append( make_xml_leaf('file-size-bytes', filesize) )
+
+            # handle md5sum cache
+            node = md5sum_root.find('aircraft_' + name)
+            if node != None:
+                node.text = md5sum
+            else:
+                md5sum_root.append( make_xml_leaf('aircraft_' + name, md5sum) )
+
+            # handle thumbnails
+            thumbnail_src = os.path.join(aircraft_dir, 'thumbnail.jpg')
+            thumbnail_dst = os.path.join(thumbnail_dir, name + '_thumbnail.jpg')
+            if os.path.exists(thumbnail_src):
+                shutil.copy2(thumbnail_src, thumbnail_dst)
+            catalog_node.append(package_node)
+            package_node.append( make_xml_leaf('thumbnail-path', 'thumbnail.jpg') )
+
+            # copy previews for the package and variants into the
+            # output directory
+            copy_previews_for_package(package, variants, name, aircraft_dir, previews_dir)
 
 # write out the master catalog file
 cat_file = os.path.join(output_dir, 'catalog.xml')

download_and_compile.sh

@@ -17,16 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-script_blob_id='$Id$'
-# Slightly tricky substitution to avoid our regexp being wildly replaced with
-# the blob name (id) when the script is checked out:
-#
-# First extract the hexadecimal blob object name followed by a '$'
-VERSION="$(echo "$script_blob_id" | sed 's@\$Id: *\([0-9a-f]\+\) *@\1@')"
-# Then remove the trailing '$'
-VERSION="${VERSION%\$}"
-
-PROGNAME=$(basename "$0")
+VERSION="2.34"
 FGVERSION="release/$(git ls-remote --heads https://git.code.sf.net/p/flightgear/flightgear|grep '\/release\/'|cut -f4 -d'/'|sort -t . -k 1,1n -k2,2n -k3,3n|tail -1)"
 
 #######################################################
@@ -55,8 +46,6 @@ BUILD_TYPE="RelWithDebInfo"
 SG_CMAKEARGS=""
 FG_CMAKEARGS=""
 
-declare -a UNMATCHED_OPTIONAL_PKG_ALTERNATIVES
-
 while getopts "shc:p:a:d:r:j:O:ib:" OPTION; do
   case $OPTION in
     s) STABLE="STABLE" ;;
@@ -111,16 +100,6 @@ function _logSep(){
   echo "***********************************" >> $LOGFILE
 }
 
-function _aptUpdate(){
-  echo "Asking password for 'apt-get update'..."
-  sudo apt-get update
-}
-
-function _aptInstall(){
-  echo "Asking password for 'apt-get install $*'..."
-  sudo apt-get install "$@"
-}
-
 function _gitUpdate(){
   if [ "$DOWNLOAD" != "y" ]; then
     return
@@ -164,90 +143,6 @@ function _make(){
   fi
 }
 
-# Add an available, non-virtual package matching one of the given regexps.
-#
-# Each positional parameter is interpreted as a POSIX extended regular
-# expression. These parameters are examined from left to right, and the first
-# available matching package is added to the global PKG variable. If no match
-# is found, the script aborts.
-function _mandatory_pkg_alternative(){
-  local pkg
-
-  if [[ $# -lt 1 ]]; then
-    echo "Empty package alternative: this is a bug in the script, aborting." \
-      | tee -a "$LOGFILE"
-    exit 1
-  fi
-
-  echo "Considering a package alternative:" "$@" | tee -a "$LOGFILE"
-  pkg=$(_find_package_alternative "$@")
-
-  if [[ -n "$pkg" ]]; then
-    echo "Package alternative matched for $pkg" | tee -a "$LOGFILE"
-    PKG="$PKG $pkg"
-  else
-    echo "No match found for the package alternative, aborting." \
-      | tee -a "$LOGFILE"
-    exit 1
-  fi
-
-  return 0
-}
-
-# If available, add a non-virtual package matching one of the given regexps.
-#
-# Returning 0 or 1 on success to indicate whether a match was found could be
-# done, but would need to be specifically handled at the calling site,
-# since the script is run under 'set -e' regime.
-function _optional_pkg_alternative(){
-  local pkg
-
-  if [[ $# -lt 1 ]]; then
-    echo "Empty optional package alternative: this is a bug in the script," \
-         "aborting." | tee -a "$LOGFILE"
-    exit 1
-  fi
-
-  echo "Considering an optional package alternative:" "$@" | tee -a "$LOGFILE"
-  pkg=$(_find_package_alternative "$@")
-
-  if [[ -n "$pkg" ]]; then
-    echo "Optional package alternative matched for $pkg" | tee -a "$LOGFILE"
-    PKG="$PKG $pkg"
-  else
-    echo "No match found for the optional package alternative, continuing" \
-         "anyway." | tee -a "$LOGFILE"
-    # "$*" so that we only add one element to the array in this line
-    UNMATCHED_OPTIONAL_PKG_ALTERNATIVES+=("$*")
-  fi
-
-  return 0
-}
-
-# This function requires the 'dctrl-tools' package
-function _find_package_alternative(){
-  local pkg
-
-  if [[ $# -lt 1 ]]; then
-    return 0                    # Nothing could be found
-  fi
-
-  # This finds non-virtual packages only (on purpose)
-  pkg="$(apt-cache dumpavail | \
-         grep-dctrl -e -sPackage -FPackage \
-           "^[[:space:]]*($1)[[:space:]]*\$" - | \
-         sed -ne '1s/^Package:[[:space:]]*//gp')"
-
-  if [[ -n "$pkg" ]]; then
-    echo "$pkg"
-    return 0
-  else
-    # Try with the next regexp
-    shift
-    _find_package_alternative "$@"
-  fi
-}
-
 #######################################################
 # set script to stop if an error occours
 set -e
@@ -306,47 +201,18 @@ _logSep
 
 #######################################################
 #######################################################
-
-if [[ "$DOWNLOAD_PACKAGES" = "y" ]] && [[ "$APT_GET_UPDATE" = "y" ]]; then
-  _aptUpdate
-fi
-
-# Ensure 'dctrl-tools' is installed
-if [[ "$(dpkg-query --showformat='${Status}\n' --show dctrl-tools \
-                    2>/dev/null | awk '{print $3}')" != "installed" ]]; then
-  if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then
-    _aptInstall dctrl-tools
-  else
-    echo -n "The 'dctrl-tools' package is needed, but DOWNLOAD_PACKAGES is "
-    echo -e "not set to 'y'.\nAborting."
-    exit 1
-  fi
-fi
-
 # Minimum
 PKG="build-essential cmake git"
-_mandatory_pkg_alternative libcurl4-openssl-dev libcurl4-gnutls-dev
 # cmake
-PKG="$PKG libarchive-dev libbz2-dev libexpat1-dev libjsoncpp-dev liblzma-dev libncurses5-dev procps zlib1g-dev"
+PKG="$PKG libarchive-dev libbz2-dev libcurl4-gnutls-dev libexpat1-dev libjsoncpp-dev liblzma-dev libncurses5-dev procps zlib1g-dev"
 # TG
 PKG="$PKG libcgal-dev libgdal-dev libtiff5-dev"
 # TGGUI/OpenRTI
 PKG="$PKG libqt4-dev"
 # SG/FG
-PKG="$PKG zlib1g-dev freeglut3-dev libboost-dev"
-_mandatory_pkg_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \
-                           'libopenscenegraph-[0-9]+\.[0-9]+-dev'
+PKG="$PKG zlib1g-dev freeglut3-dev libboost-dev libopenscenegraph-dev"
 # FG
-PKG="$PKG libopenal-dev libudev-dev qt5-default qtdeclarative5-dev libdbus-1-dev libplib-dev"
-_mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev
-# The following packages are needed for the built-in launcher
-_optional_pkg_alternative qml-module-qtquick2
-_optional_pkg_alternative qml-module-qtquick-window2
-_optional_pkg_alternative qml-module-qtquick-dialogs
-# The following packages are only needed for the Qt-based remote Canvas
-# (comment written at the time of FG 2018.2).
-_optional_pkg_alternative qtbase5-private-dev
-_optional_pkg_alternative qtdeclarative5-private-dev
+PKG="$PKG libopenal-dev libudev-dev qt5-default libdbus-1-dev libpng12-dev libplib-dev"
 # FGPanel
 PKG="$PKG fluid libbz2-dev libfltk1.3-dev libxi-dev libxmu-dev"
 # FGAdmin
@@ -358,8 +224,12 @@ PKG="$PKG python-tk"
 # FGx (FGx is not compatible with Qt5, however we have installed Qt5 by default)
 #PKG="$PKG libqt5xmlpatterns5-dev libqt5webkit5-dev"
 
-if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then
-  _aptInstall $PKG
+if [ "$DOWNLOAD_PACKAGES" = "y" ]; then
+  echo "Asking password for apt-get operations..."
+  if [ "$APT_GET_UPDATE" = "y" ]; then
+    sudo apt-get update
+  fi
+  sudo apt-get install $PKG
 fi
 
 #######################################################
@@ -509,8 +379,8 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OSG"' ]]; then
   echo "****************************************" | tee -a $LOGFILE
   cd "$CBD"/openscenegraph
   _gitDownload https://github.com/openscenegraph/osg.git
-  _gitUpdate OpenSceneGraph-3.4
-
+  _gitUpdate OpenSceneGraph-3.2
+  
   if [ "$RECONFIGURE" = "y" ]; then
     cd "$CBD"
     mkdir -p build/openscenegraph
@@ -917,24 +787,6 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="TERRAGEARGUI"' ]]; then
   echo "./TerraGUI \$@" >> run_terrageargui.sh
 fi
 
-# Print optional package alternatives that didn't match (this helps with
-# troubleshooting)
-if [[ ${#UNMATCHED_OPTIONAL_PKG_ALTERNATIVES[@]} -gt 0 ]]; then
-    echo | tee -a "$LOGFILE"
-    printf "The following optional package alternative(s) didn't match:\n\n" \
-        | tee -a "$LOGFILE"
-
-    for alt in "${UNMATCHED_OPTIONAL_PKG_ALTERNATIVES[@]}"; do
-        printf "  %s\n" "$alt" | tee -a "$LOGFILE"
-    done
-
-    printf "\nThis could explain missing optional features in FlightGear or \
-other software\ninstalled by $PROGNAME.\n" | tee -a "$LOGFILE"
-else
-    printf "All optional package alternatives have found a matching package.\n" \
-        | tee -a "$LOGFILE"
-fi
-
 echo ""
 echo "download_and_compile.sh has finished to work"
 

fg-from-scratch/COPYING

@@ -1,481 +0,0 @@
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

fg-from-scratch/CustomSceneryProjects/Test/README.md

@@ -1,56 +0,0 @@
-## Test Scenery Project
-An example to demostrate the usage of the TerraGear Scenery tools.  By studying this example, you should gain a better understanding of the tool workflow.
-Copyright (C) 2018  Scott Giese (xDraconian) scttgs0@gmail.com
-
-### Purpose:
-Most users could benefit from the availability of a reference example to gain a working understanding of scenery generation.  I am hopeful you gain value from this example and i would like to see this lead toward encouraging more Windows users to get involved in contributing to scenery development.
-
-### Supported Platform:
-Windows 10
-
-### Prerequisites:
-	SimGear
-    TerraGear
-
-### Installation Instructions:
-
-None
-
-### Usage:
-Below is an explaination of the files provided:
-
-| File | Description |
-|-----:|------------|
-|**generate.cmd** | A command script containing calls to the various TerraGear tools to produce scenery for Oahu |
-|**test.apt.dat** | Contains all airport data for those located on Oahu |
-|**/data** | Folder containing files you provide to the TerraGear tools |
-|**/data/SRTM-3** | Terrain data for Oahu |
-|**/data/fg_* ** | Shapefiles.  These define the type of terrain (grass, lake, forest, etc.) - Items typically defined by a polygon area |
-|**/data/osm_* ** | OpenStreetMap files.  These represent roadways, rivers, etc. - Items typically defined by "lines" |
-| **/work** | Files produced by the TerraGear tools |
-| **/output** | Final resulting files.  These are the scenery files that will be loaded into FlightGear |
-
-Run the command script interactively.  No log is produced.
-
-	generate.cmd
-
-Runs the command script and routes STDOUT and STDERR to a log file. You will miss the prompts, so it is important that you monitor the log while it is running.
-
-	generate.cmd > generate.log 2>&1
-
-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/)
-
-### Testing the Scenery:
-
-Configure fgfs or the Flightgear Launcher to look in **/CustomSeneryProjects/Test/output** for additional scenery files.
-Choose as a starting location from any of the airports present on Oahu (e.g. PHNL or PHNG.)
-
-Note: You will find that all the buildings, radio towers, smoke stacks, etc. are missing.  This is expected since your *output* folder doesn't contain any of these items.
-
-### Known Issues:
-
-There is a bug in the toolchain that prevents the airport BTG files from being copied to the */output* folder. You will need to copy these files manually until the issue is resolved. Copy the files you find in the */work/AirportObj* folder to your */output* folder.

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Airport/fg_Airport.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Asphalt/fg_Asphalt.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Canal/fg_Canal.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Cemetery/fg_Cemetery.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Default/fg_Default.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Default/fg_Default.qpj

@@ -1 +0,0 @@
-GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Dirt/fg_Dirt.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Dirt/fg_Dirt.qpj

@@ -1 +0,0 @@
-GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Freeway/fg_Freeway.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_GolfCourse/fg_GolfCourse.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Grassland/fg_Grassland.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Grassland/fg_Grassland.qpj

@@ -1 +0,0 @@
-GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Industrial/fg_Industrial.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Industrial/fg_Industrial.qpj

@@ -1 +0,0 @@
-GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Lake/fg_Lake.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Lava/fg_Lava.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_Marsh/fg_Marsh.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_MixedCrop/fg_MixedCrop.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_MixedForest/fg_MixedForest.prj

@@ -1 +0,0 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

fg-from-scratch/CustomSceneryProjects/Test/data/fg_MixedForest/fg_MixedForest.qpj

@@ -1 +0,0 @@
-GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]