new version: 2017.2.1

2017-05-18 15:10:07 +02:00
22 changed files with 316 additions and 769 deletions
--- a/.gitattributes
+++ b/.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
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = https://git.code.sf.net/p/flightgear/simgear
-	branch = release/2017.2
+	branch = next
 [submodule "flightgear"]
 	path = flightgear
 	url = https://git.code.sf.net/p/flightgear/flightgear
-	branch = release/2017.2
+	branch = next
 [submodule "fgrun"]
 	path = fgrun
 	url = https://git.code.sf.net/p/flightgear/fgrun
@@ -13,7 +13,7 @@
 [submodule "fgdata"]
 	path = fgdata
 	url = git://git.code.sf.net/p/flightgear/fgdata
-	branch = release/2017.2
+	branch = next
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = https://git.code.sf.net/p/flightgear/windows-3rd-party
--- a/build_release_windows.bat
+++ b/build_release_windows.bat
@@ -75,10 +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 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%
--- a/catalog/catalog.py
+++ b/catalog/catalog.py
@@ -1,229 +0,0 @@
-#!/usr/bin/python
-
-import argparse
-import datetime
-import lxml.etree as ET
-import os
-import re
-import sgprops
-import sys
-import catalogTags
-
-CATALOG_VERSION = 4
-
-# 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
-
-    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'):
-        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)
-
-    if sim_node.hasChild('thumbnail'):
-        variant['thumbnail'] = sim_node.getValue("thumbnail", None)
-
-    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, 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'):
-            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)
-
-    if len(setDicts) == 0:
-        return 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:
-        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 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']) )
-    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']) )
-
-        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)
-
-    package_node.append( make_xml_leaf('dir', aircraftDirName) )
-
-    download_url = downloadBase + aircraftDirName + '.zip'
-    thumbnail_url = downloadBase + 'thumbnails/' + aircraftDirName + '_' + package['thumbnail']
-
-    package_node.append( make_xml_leaf('url', download_url) )
-    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)
-
-    return package_node
--- a/catalog/catalogTags.py
+++ b/catalog/catalogTags.py
@@ -1,159 +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",
-    "northrop",
-    "pilatus",
-    "piper",
-    "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
--- a/catalog/testData/Aircraft/f16/Previews/cockpit.png
+++ b/catalog/testData/Aircraft/f16/Previews/cockpit.png
--- a/catalog/testData/Aircraft/f16/Previews/exterior-1.png
+++ b/catalog/testData/Aircraft/f16/Previews/exterior-1.png
--- a/catalog/testData/Aircraft/f16/Previews/exterior-f16a-2.png
+++ b/catalog/testData/Aircraft/f16/Previews/exterior-f16a-2.png
--- a/catalog/testData/Aircraft/f16/Previews/exterior-f16b.png
+++ b/catalog/testData/Aircraft/f16/Previews/exterior-f16b.png
--- a/catalog/testData/Aircraft/f16/f16-common.xml
+++ b/catalog/testData/Aircraft/f16/f16-common.xml
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<PropertyList>
-  <sim include="settings-common.xml">
-    <author>Wilbur Wright</author>
-    <tags>
-      <tag>fighter</tag>
-      <tag>1980s</tag>
-      <tag>glass-cockpit</tag>
-    </tags>
-  </sim>
-
-</PropertyList>
--- a/catalog/testData/Aircraft/f16/f16-trainer-set.xml
+++ b/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>
--- a/catalog/testData/Aircraft/f16/f16a-set.xml
+++ b/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>
--- a/catalog/testData/Aircraft/f16/f16b-set.xml
+++ b/catalog/testData/Aircraft/f16/f16b-set.xml
@@ -1,12 +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>
-
-    <author>James T Kirk</author>
-  </sim>
-
-</PropertyList>
--- a/catalog/testData/Aircraft/f16/f16c-set.xml
+++ b/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>
--- a/catalog/testData/OtherDir/settings-common.xml
+++ b/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>
--- a/catalog/test_catalog.py
+++ b/catalog/test_catalog.py
@@ -1,116 +0,0 @@
-#!/usr/bin/python
-
-import unittest
-import sgprops
-import os
-import catalog
-import lxml.etree as ET
-
-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['author'], 'Wilbur Wright')
-        self.assertEqual(info['rating_FDM'], 3)
-        self.assertEqual(info['rating_model'], 5)
-        self.assertEqual(len(info['tags']), 3)
-
-    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(pkg['author'], 'Wilbur Wright')
-        self.assertEqual(len(variants), 3)
-
-        # 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)
-        self.assertEqual(f16b['author'], 'James T Kirk')
-
-        f16c = next(v for v in variants if v['id'] == 'f16c')
-        self.assertEqual(f16c['variant-of'], 'f16a')
-        self.assertEqual(f16c['primary-set'], False)
-
-        self.assertEqual(f16c['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, pretty_print=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('author'), "Wilbur Wright");
-
-        parsedVariants = parsedPkgNode.getChildren("variant")
-        self.assertEqual(len(parsedVariants), 3)
-
-        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.')
-                self.assertEqual(pv.getValue('author'), "James T Kirk");
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
--- a/catalog/update-catalog.py
+++ b/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,94 +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'
-    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')
@@ -224,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')
@@ -300,8 +361,108 @@ for scm in scm_list:
            print "skipping:", name
            continue

-        # process each aircraft in turn
-        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')
--- a/download_and_compile.sh
+++ b/download_and_compile.sh
@@ -17,15 +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%\$}"
-
+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)"

 #######################################################
@@ -108,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
@@ -161,48 +143,6 @@ function _make(){
  fi
 }

-# Find 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 _package_alternative(){
-  if [[ $# -lt 1 ]]; then
-    echo "Empty package alternative: this is a bug in the script, aborting."
-    exit 1
-  fi
-
-  echo "Considering a package alternative:" "$@"
-  _package_alternative_inner "$@"
-}
-
-# This function requires the 'dctrl-tools' package
-function _package_alternative_inner(){
-  local pkg
-
-  if [[ $# -lt 1 ]]; then
-    echo "No match found for the package alternative, aborting."
-    exit 1
-  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 "Package alternative matched for $pkg"
-    PKG="$PKG $pkg"
-    return 0
-  else
-    # Try with the next regexp
-    shift
-    _package_alternative_inner "$@"
-  fi
-}
-
 #######################################################
 # set script to stop if an error occours
 set -e
@@ -261,23 +201,6 @@ _logSep

 #######################################################
 #######################################################
-
-if [[ "$DOWNLOAD_PACKAGES" = "y" ]] && [[ "$APT_GET_UPDATE" = "y" ]]; then
-  _aptUpdate
-fi
-
-# Ensure 'dctrl-tools' is installed
-if [[ "$(dpkg-query --showformat='${db:Status-Status}\n' --show dctrl-tools \
-                    2>/dev/null)" != "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"
 # cmake
@@ -287,12 +210,9 @@ PKG="$PKG libcgal-dev libgdal-dev libtiff5-dev"
 # TGGUI/OpenRTI
 PKG="$PKG libqt4-dev"
 # SG/FG
-PKG="$PKG zlib1g-dev freeglut3-dev libboost-dev"
-_package_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"
-_package_alternative libpng-dev libpng12-dev libpng16-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
@@ -304,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

 #######################################################
@@ -455,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
--- a/release_builder/create-release-branch-for.sh
+++ b/release_builder/create-release-branch-for.sh
@@ -12,7 +12,7 @@
 #GNU General Public License for more details.
 #
 #You should have received a copy of the GNU General Public License
-#along with FlightGear  If not, see <http://www.gnu.org/licenses/>.
+#along with Foobar.  If not, see <http://www.gnu.org/licenses/>.

 if [ -z "$1" -o -z "$2" ]; then
  echo "usage: thismajor.thisminor nextmajor.nextminor path"
@@ -65,6 +65,8 @@ createBranch() {
 while [ $# -gt 0 ]; do
  echo "Processing $1"
  pushd $1 > /dev/null
+  git config user.name "Automatic Release Builder"
+  git config user.email "build@flightgear.org"
  createBranch
  popd > /dev/null
  shift  
--- a/release_builder/create-release-branch.sh
+++ b/release_builder/create-release-branch.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

-THIS_RELEASE="2017.2"
-NEXT_RELEASE="2017.3"
+THIS_RELEASE="2017.1"
+NEXT_RELEASE="2017.2"
 SUBMODULES="simgear flightgear fgdata"

 #:<< 'COMMENT_END'
--- a/release_builder/version
+++ b/release_builder/version
@@ -0,0 +1 @@
+2017.2.1
--- a/2
+++ b/2
@@ -1 +1 @@
-2017.2.1
+2017.2.0
@@ -1 +1 @@
 .2.1
 .2.0