set correct release-branch for submodules

.gitignore

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

.gitmodules

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

build_release_windows.bat

@@ -23,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
@@ -34,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
@@ -49,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
@@ -60,7 +57,6 @@ 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
 

catalog/catalog.py

@@ -38,12 +38,8 @@ def scan_set_file(aircraft_dir, set_file, includes):
     variant = {}
     variant['name'] = sim_node.getValue("description", None)
     variant['status'] = sim_node.getValue("status", None)
-
-    if sim_node.hasChild('author'):
-        variant['author'] = sim_node.getValue("author", None)
-
-    if sim_node.hasChild('long-description'):
-        variant['description'] = sim_node.getValue("long-description", 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.
@@ -68,10 +64,6 @@ def scan_set_file(aircraft_dir, set_file, includes):
         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
 
@@ -136,8 +128,7 @@ def scan_aircraft_dir(aircraft_dir, includes):
 
     package = primaryAircraft[0]
     if not 'thumbnail' in package:
-        if (os.path.exists(os.path.join(aircraft_dir, "thumbnail.jpg"))):
-            package['thumbnail'] = "thumbnail.jpg"
+        package['thumbnail'] = "thumbnail.jpg"
 
     # variants is just all the set dicts except the first one
     variants = setDicts
@@ -181,16 +172,8 @@ def make_aircraft_node(aircraftDirName, package, variants, downloadBase):
     package_node = ET.Element('package')
     package_node.append( make_xml_leaf('name', package['name']) )
     package_node.append( make_xml_leaf('status', package['status']) )
-
-    if 'author' in package:
-        package_node.append( make_xml_leaf('author', package['author']) )
-
-    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']) )
-
+    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')
@@ -234,12 +217,11 @@ def make_aircraft_node(aircraftDirName, package, variants, downloadBase):
     package_node.append( make_xml_leaf('dir', aircraftDirName) )
 
     download_url = downloadBase + aircraftDirName + '.zip'
-    package_node.append( make_xml_leaf('url', download_url) )
+    thumbnail_url = downloadBase + 'thumbnails/' + aircraftDirName + '_' + package['thumbnail']
 
-    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']))
+    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)

catalog/catalogTags.py

@@ -58,11 +58,9 @@ manufacturerTags = [
     "messerschmitt",
     "mikoyan-gurevich",
     "mitsubishi",
-    "north-american",
     "northrop",
     "pilatus",
     "piper",
-    "republic",
     "robin",
     "saab",
     "short",

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/f16/f16-common.xml

@@ -7,7 +7,6 @@
       <tag>1980s</tag>
       <tag>glass-cockpit</tag>
     </tags>
-    <minimum-fg-version>2017.4</minimum-fg-version>
   </sim>
 
 </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

@@ -17,7 +17,6 @@ class UpdateCatalogTests(unittest.TestCase):
         self.assertEqual(info['rating_FDM'], 3)
         self.assertEqual(info['rating_model'], 5)
         self.assertEqual(len(info['tags']), 3)
-        self.assertEqual(info['minimum-fg-version'], '2017.4')
 
     def test_scan_dir(self):
         (pkg, variants) = catalog.scan_aircraft_dir("testData/Aircraft/f16", ["testData/OtherDir"])
@@ -26,7 +25,6 @@ class UpdateCatalogTests(unittest.TestCase):
         f16trainer = next(v for v in variants if v['id'] == 'f16-trainer')
         self.assertEqual(pkg['author'], 'Wilbur Wright')
         self.assertEqual(len(variants), 3)
-        self.assertEqual(pkg['minimum-fg-version'], '2017.4')
 
         # test variant relatonship between
         self.assertEqual(pkg['variant-of'], None)
@@ -92,8 +90,6 @@ class UpdateCatalogTests(unittest.TestCase):
         self.assertEqual(parsedPkgNode.getValue('description'), pkg['description']);
         self.assertEqual(parsedPkgNode.getValue('author'), "Wilbur Wright");
 
-        self.assertEqual(parsedPkgNode.getValue('minimum-fg-version'), "2017.4");
-
         parsedVariants = parsedPkgNode.getChildren("variant")
         self.assertEqual(len(parsedVariants), 3)
 
@@ -113,37 +109,8 @@ class UpdateCatalogTests(unittest.TestCase):
                 self.assertEqual(pv.getValue('description'), 'The F16-B is an upgraded version of the F16A.')
                 self.assertEqual(pv.getValue('author'), "James T Kirk");
 
-    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, pretty_print=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()

python3-flightgear/README-l10n.txt

@@ -1,83 +0,0 @@
-Quick start for the localization (l10n) scripts
-===============================================
-
-The following assumes that all of these are in present in
-$FG_ROOT/Translations:
-  - the default translation (default/*.xml);
-  - the legacy FlightGear XML localization files (<language_code>/*.xml);
-  - except for 'fg-convert-translation-files' which creates them, existing
-    XLIFF 1.2 files (<language_code>/FlightGear-nonQt.xlf).
-
-Note: the legacy FlightGear XML localization files are only needed by
-      'fg-convert-translation-files' when migrating to the XLIFF format. The
-      other scripts only need the default translation and obviously, for
-      'fg-update-translation-files', the current XLIFF files.
-
-To get the initial XLIFF files (generated from the default translation in
-$FG_ROOT/Translations/default as well as the legacy FlightGear XML
-localization files in $FG_ROOT/Translations/<language_code>):
-
-  languages="de en_US es fr it nl pl pt zh_CN"
-
-  # Your shell must expand $languages as several words. POSIX shell does that,
-  # but not zsh for instance. Otherwise, don't use a shell variable.
-  fg-convert-translation-files --transl-dir="$FG_ROOT/Translations" $languages
-
-  # Add strings found in the default translation but missing in the legacy FG
-  # XML l10n files
-  fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
-                              merge-new-master $languages
-
-When master strings[1] have changed (in a large sense, i.e.: strings added,
-modified or removed, or categories added or removed[2]):
-
-  fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
-                              merge-new-master $languages
-
-To remove unused translated strings (not to be done too often in my opinion):
-
-  fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
-                              remove-unused $languages
-
-(you may replace 'remove-unused' with 'mark-unused' to just mark the strings
-as not-to-be-translated, however 'merge-new-master' presented above already
-does that)
-
-To create skeleton translations for new languages (e.g., for fr_BE, en_AU and
-ca):
-
-  1) Check (add if necessary) that flightgear/meta/i18n.py knows the plural
-     forms used in the new languages. This is done by editing PLURAL_FORMS
-     towards the top of this i18n.py file (very easy). If the existing entry
-     for, e.g., "zh" is sufficient for zh_TW or zh_HK, just let "zh" handle
-     them: it will be tried as fallback if there is no perfect match on
-     language and territory.
-
-  2) Run a command such as:
-
-       fg-new-translations --transl-dir="$FG_ROOT/Translations" fr_BE en_AU ca
-
-     (if you do this for only one language at a time, you can use the -o
-     option to precisely control where the output goes, otherwise
-     fg-new-translations chooses an appropriate place based on the value
-     specified for --transl-dir)
-
-fg-convert-translation-files, fg-update-translation-files and
-fg-new-translations all support the --help option for more detailed
-information.
-
-
-Footnotes
----------
-
-  [1] Strings in the default translation.
-
-  [2] Only empty categories are removed by this command. An obsolete category
-      can be made empty by manual editing (easy, just locate the right
-      <group>) or this way:
-
-        fg-update-translation-files --transl-dir=... mark-unused
-        fg-update-translation-files --transl-dir=... remove-unused
-
-      (note that this will remove *all* strings marked as unused in the first
-      step, not only those in some particular category!)

python3-flightgear/fg-convert-translation-files

@@ -1,186 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# fg-convert-translation-files --- Convert FlightGear's translation files
-# Copyright (C) 2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import argparse
-import collections
-import locale
-import os
-import sys
-
-try:
-    import xml.etree.ElementTree as et
-except ImportError:
-    import elementtree.ElementTree as et
-
-import flightgear.meta.logging
-import flightgear.meta.i18n as fg_i18n
-
-
-PROGNAME = os.path.basename(sys.argv[0])
-
-# Only messages with severity >= info will be printed to the terminal (it's
-# possible to also log all messages to a file regardless of their level, see
-# the Logger class). Of course, there is also the standard logging module...
-logger = flightgear.meta.logging.Logger(
-    progname=PROGNAME,
-    logLevel=flightgear.meta.logging.LogLevel.info,
-    defaultOutputStream=sys.stderr)
-
-debug = logger.debug
-info = logger.info
-notice = logger.notice
-warning = logger.warning
-error = logger.error
-critical = logger.critical
-
-
-# We could use Translation.__str__(): not as readable (for now) but more
-# accurate on metadata
-def printPlainText(l10nResPoolMgr, translations):
-    """Print output suitable for a quick review (by the programmer)."""
-    firstLang = True
-
-    for langCode, (transl, nbWhitespacePbs) in translations.items():
-        # 'transl' is a Translation instance
-        if firstLang:
-            firstLang = False
-        else:
-            print()
-
-        print("-" * 78 + "\n" + langCode + "\n" + "-" * 78)
-        print("\nNumber of leading and/or trailing whitespace problems: {}"
-              .format(nbWhitespacePbs))
-
-        for cat in transl:
-            print("\nCategory: {cat}\n{underline}".format(
-                cat=cat, underline="~"*(len("Category: ") + len(cat))))
-            t = transl[cat]
-
-            for tid, translUnit in sorted(t.items()):
-                # - Using '{master!r}' and '{transl!r}' prints stuff such as
-                #   \xa0 for nobreak spaces, which can lead to the erroneous
-                #   conclusion that there was an encoding problem.
-                # - Only printing the first target text here (no plural forms)
-                print("\n{id}\n  '{sourceText}'\n  '{targetText}'"
-                      .format(id=tid.id(), sourceText=translUnit.sourceText,
-                              targetText=translUnit.targetTexts[0]))
-
-
-def writeXliff(l10nResPoolMgr, translations):
-    formatHandler = fg_i18n.XliffFormatHandler()
-
-    for langCode, translData in translations.items():
-        translation = translData.transl # Translation instance
-
-        if params.output_dir is None:
-            # Use default locations for the written xliff files
-            l10nResPoolMgr.writeTranslation(formatHandler, translation)
-        else:
-            basename = "{}-{}.{}".format(
-                formatHandler.defaultFileStem(langCode),
-                langCode,
-                formatHandler.standardExtension)
-            filePath = os.path.join(params.output_dir, basename)
-            formatHandler.writeTranslation(translation, filePath)
-
-
-def processCommandLine():
-    params = argparse.Namespace()
-
-    parser = argparse.ArgumentParser(
-        usage="""\
-%(prog)s [OPTION ...] LANGUAGE_CODE...
-Convert FlightGear's old XML translation files into other formats.""",
-        description="""\
-Most notably, XLIFF format can be chosen for output. The script performs
-a few automated checks on the input files too.""",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        # I want --help but not -h (it might be useful for something else)
-        add_help=False)
-
-    parser.add_argument("-t", "--transl-dir",
-                        help="""\
-                        directory containing all translation subdirs (such as
-                        {default!r}, 'en_GB', 'fr_FR', 'de', 'it'...). This
-                        "option" MUST be specified.""".format(
-                        default=fg_i18n.DEFAULT_LANG_DIR))
-    parser.add_argument("lang_code", metavar="LANGUAGE_CODE", nargs="+",
-                        help="""\
-                        codes of languages to read translations for (don't
-                        specify {default!r} this way, it is special and not a
-                        language code)"""
-                        .format(default=fg_i18n.DEFAULT_LANG_DIR))
-    parser.add_argument("-o", "--output-dir",
-                        help="""\
-                        output directory for written XLIFF files
-                        (default: for each output file, use a suitable location
-                        under TRANSL_DIR)""")
-    parser.add_argument("-f", "--output-format", default="xliff",
-                        choices=("xliff", "text"), help="""\
-                        format to use for the output files""")
-    parser.add_argument("--help", action="help",
-                        help="display this message and exit")
-
-    params = parser.parse_args(namespace=params)
-
-    if params.transl_dir is None:
-        error("--transl-dir must be given, aborting")
-        sys.exit(1)
-
-    return params
-
-
-def main():
-    global params
-
-    locale.setlocale(locale.LC_ALL, '')
-    params = processCommandLine()
-
-    l10nResPoolMgr = fg_i18n.L10NResourcePoolManager(params.transl_dir, logger)
-    # English version of all translatable strings
-    masterTransl, nbWhitespaceProblemsInMaster = \
-                                        l10nResPoolMgr.readFgMasterTranslation()
-    translations = collections.OrderedDict()
-
-    # Sort elements of 'translations' according to language code (= the keys)
-    for langCode in sorted(params.lang_code):
-        translationData = l10nResPoolMgr.readFgTranslation(masterTransl,
-                                                           langCode)
-        translations[translationData.transl.targetLanguage] = translationData
-
-    if params.output_format == "xliff":
-        writeFunc = writeXliff           # write to files
-    elif params.output_format == "text":
-        writeFunc = printPlainText       # print to stdout
-    else:
-        assert False, \
-            "Unexpected output format: '{}'".format(params.output_format)
-
-    writeFunc(l10nResPoolMgr, translations)
-
-    nbWhitespaceProblemsInTransl = sum(
-        (translData.nbWhitespacePbs for translData in translations.values() ))
-    info("total number of leading and/or trailing whitespace problems: {}"
-          .format(nbWhitespaceProblemsInMaster + nbWhitespaceProblemsInTransl))
-
-    sys.exit(0)
-
-
-if __name__ == "__main__": main()

python3-flightgear/fg-new-translations

@@ -1,125 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# fg-new-translations --- Create new translations for FlightGear
-# Copyright (C) 2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import argparse
-import collections
-import locale
-import os
-import sys
-
-try:
-    import xml.etree.ElementTree as et
-except ImportError:
-    import elementtree.ElementTree as et
-
-import flightgear.meta.logging
-import flightgear.meta.i18n as fg_i18n
-
-
-PROGNAME = os.path.basename(sys.argv[0])
-
-# Only messages with severity >= info will be printed to the terminal (it's
-# possible to also log all messages to a file regardless of their level, see
-# the Logger class). Of course, there is also the standard logging module...
-logger = flightgear.meta.logging.Logger(
-    progname=PROGNAME,
-    logLevel=flightgear.meta.logging.LogLevel.info,
-    defaultOutputStream=sys.stderr)
-
-
-def processCommandLine():
-    params = argparse.Namespace()
-
-    parser = argparse.ArgumentParser(
-        usage="""\
-%(prog)s [OPTION ...] LANGUAGE_CODE...
-Write the skeleton of XLIFF translation files.""",
-        description="""\
-This program writes XLIFF translation files with the strings to translate
-for the specified languages (target strings are empty). This is what you need
-to start a translation for a new language.""",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        # I want --help but not -h (it might be useful for something else)
-        add_help=False)
-
-    parser.add_argument("-t", "--transl-dir",
-                        help="""\
-                        directory containing all translation subdirs (such as
-                        {default!r}, 'en_GB', 'fr_FR', 'de', 'it'...). This
-                        "option" MUST be specified.""".format(
-                        default=fg_i18n.DEFAULT_LANG_DIR))
-    parser.add_argument("lang_code", metavar="LANGUAGE_CODE", nargs="+",
-                        help="""\
-                        codes of languages to create translations for (e.g., fr,
-                        fr_BE, en_GB, it, es_ES...)""")
-    parser.add_argument("-o", "--output-file",
-                        help="""\
-                        where to write the output to (use '-' for standard
-                        output); if not specified, a suitable file under
-                        TRANSL_DIR will be chosen for each LANGUAGE_CODE.
-                        Note: this option can only be given when exactly one
-                        LANGUAGE_CODE has been specified on the command
-                        line (it doesn't make sense otherwise).""")
-    parser.add_argument("--output-format", default="xliff",
-                        choices=fg_i18n.FORMAT_HANDLERS_NAMES,
-                        help="format to use for the output files")
-    parser.add_argument("--help", action="help",
-                        help="display this message and exit")
-
-    params = parser.parse_args(namespace=params)
-
-    if params.transl_dir is None:
-        logger.error("--transl-dir must be given, aborting")
-        sys.exit(1)
-
-    if params.output_file is not None and len(params.lang_code) > 1:
-        logger.error("--output-file can only be given when exactly one "
-                     "LANGUAGE_CODE has been specified on the command line "
-                     "(it doesn't make sense otherwise)")
-        sys.exit(1)
-
-    return params
-
-
-def main():
-    global params
-
-    locale.setlocale(locale.LC_ALL, '')
-    params = processCommandLine()
-
-    l10nResPoolMgr = fg_i18n.L10NResourcePoolManager(params.transl_dir, logger)
-    xliffFormatHandler = fg_i18n.FORMAT_HANDLERS_MAP[params.output_format]()
-
-    if params.output_file is not None:
-        assert len(params.lang_code) == 1, params.lang_code
-        # Output to one file or to stdout
-        l10nResPoolMgr.writeSkeletonTranslation(
-            xliffFormatHandler, params.lang_code[0],
-            filePath=params.output_file)
-    else:
-        # Output to several files
-        for langCode in params.lang_code:
-            l10nResPoolMgr.writeSkeletonTranslation(xliffFormatHandler,
-                                                    langCode)
-
-    sys.exit(0)
-
-
-if __name__ == "__main__": main()

python3-flightgear/fg-update-translation-files

@@ -1,184 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# fg-update-translation-files --- Merge new default translation,
-#                                 remove obsolete strings from a translation
-# Copyright (C) 2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import argparse
-import enum
-import locale
-import os
-import sys
-
-try:
-    import xml.etree.ElementTree as et
-except ImportError:
-    import elementtree.ElementTree as et
-
-import flightgear.meta.logging
-import flightgear.meta.i18n as fg_i18n
-
-
-PROGNAME = os.path.basename(sys.argv[0])
-
-# Only messages with severity >= info will be printed to the terminal (it's
-# possible to also log all messages to a file regardless of their level, see
-# the Logger class). Of course, there is also the standard logging module...
-logger = flightgear.meta.logging.Logger(
-    progname=PROGNAME,
-    logLevel=flightgear.meta.logging.LogLevel.info,
-    defaultOutputStream=sys.stderr)
-
-
-def processCommandLine():
-    params = argparse.Namespace()
-
-    parser = argparse.ArgumentParser(
-        usage="""\
-%(prog)s [OPTION ...] ACTION LANGUAGE_CODE...
-Update FlightGear XLIFF localization files.""",
-        description="""\
-This program performs the following operations (actions) on FlightGear XLIFF
-translation files (*.xlf):
-
-  - [merge-new-master]
-    Read the default translation[1], add new translated strings it contains to
-    the XLIFF localization files corresponding to the specified language(s),
-    mark the translated strings in said files that need review (modified in
-    the default translation) as well as those that are not used anymore
-    (disappeared in the default translation, or marked in a way that says they
-    don't need to be translated);
-
-  - [mark-unused]
-    Read the default translation and mark translated strings (in the XLIFF
-    localization files corresponding to the specified language(s)) that are
-    not used anymore;
-
-  - [remove-unused]
-    In the XLIFF localization files corresponding to the specified
-    language(s), remove all translated strings that are marked as unused.
-
-A translated string that is marked as unused is still present in the XLIFF
-localization file; it is just presented in a way that tells translators they
-don't need to worry about it. On the other hand, when a translated string is
-removed, translators don't see it anymore and the translation is lost, except
-if rescued by external means such as backups or version control systems (Git,
-Subversion, etc.)
-
-Note that the 'remove-unused' action does *not* imply 'mark-unused'. It only
-removes translation units that are already marked as unused (i.e., with
-translate="no"). Thus, it makes sense to do 'mark-unused' followed by
-'remove-unused' if you really want to get rid of old translations (you need to
-invoke the program twice, or make a small change for this). Leaving unused
-translated strings marked as such in XLIFF files shouldn't harm much in
-general on the short or mid-term: they only take some space.
-
-[1] FlightGear XML files in $FG_ROOT/Translations/default containing strings
-    used for the default locale (English).""",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        # I want --help but not -h (it might be useful for something else)
-        add_help=False)
-
-    parser.add_argument("-t", "--transl-dir",
-                        help="""\
-                        directory containing all translation subdirs (such as
-                        {default!r}, 'en_GB', 'fr_FR', 'de', 'it'...). This
-                        "option" MUST be specified.""".format(
-                        default=fg_i18n.DEFAULT_LANG_DIR))
-    parser.add_argument("action", metavar="ACTION",
-                        choices=("merge-new-master",
-                                 "mark-unused",
-                                 "remove-unused"),
-                        help="""\
-                        what to do: merge a new default (= master)
-                        translation, or mark unused translation units, or
-                        remove those already marked as unused from the XLIFF
-                        files corresponding to each given LANGUAGE_CODE (i.e.,
-                        those that are not in the default translation)""")
-    parser.add_argument("lang_code", metavar="LANGUAGE_CODE", nargs="+",
-                        help="""\
-                        codes of languages to operate on (e.g., fr, en_GB, it,
-                        es_ES...)""")
-    parser.add_argument("--help", action="help",
-                        help="display this message and exit")
-
-    params = parser.parse_args(namespace=params)
-
-    if params.transl_dir is None:
-        logger.error("--transl-dir must be given, aborting")
-        sys.exit(1)
-
-    return params
-
-
-class MarkOrRemoveUnusedAction(enum.Enum):
-    mark, remove = range(2)
-
-
-def markOrRemoveUnused(l10nResPoolMgr, action):
-    formatHandler = fg_i18n.XliffFormatHandler()
-    masterTransl = l10nResPoolMgr.readFgMasterTranslation().transl
-
-    for langCode in params.lang_code:
-        xliffPath = formatHandler.defaultFilePath(params.transl_dir, langCode)
-        transl = formatHandler.readTranslation(xliffPath)
-
-        if action == MarkOrRemoveUnusedAction.mark:
-            transl.markObsoleteOrVanished(masterTransl, logger=logger)
-        elif action == MarkOrRemoveUnusedAction.remove:
-            transl.removeObsoleteOrVanished(logger=logger)
-        else:
-            assert False, "unexpected action: {!r}".format(action)
-
-        l10nResPoolMgr.writeTranslation(formatHandler, transl,
-                                        filePath=xliffPath)
-
-
-def mergeNewMaster(l10nResPoolMgr):
-    formatHandler = fg_i18n.XliffFormatHandler()
-    masterTransl = l10nResPoolMgr.readFgMasterTranslation().transl
-
-    for langCode in params.lang_code:
-        xliffPath = formatHandler.defaultFilePath(params.transl_dir, langCode)
-        transl = formatHandler.readTranslation(xliffPath)
-        transl.mergeMasterTranslation(masterTransl, logger=logger)
-        l10nResPoolMgr.writeTranslation(formatHandler, transl,
-                                        filePath=xliffPath)
-
-
-def main():
-    global params
-
-    locale.setlocale(locale.LC_ALL, '')
-    params = processCommandLine()
-
-    l10nResPoolMgr = fg_i18n.L10NResourcePoolManager(params.transl_dir, logger)
-
-    if params.action == "mark-unused":
-        markOrRemoveUnused(l10nResPoolMgr, MarkOrRemoveUnusedAction.mark)
-    elif params.action == "remove-unused":
-        markOrRemoveUnused(l10nResPoolMgr, MarkOrRemoveUnusedAction.remove)
-    elif params.action == "merge-new-master":
-        mergeNewMaster(l10nResPoolMgr)
-    else:
-        assert False, "Bug: unexpected action: {!r}".format(params.action)
-
-    sys.exit(0)
-
-
-if __name__ == "__main__": main()

python3-flightgear/flightgear/meta/exceptions.py

@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# exceptions.py --- Simple, general-purpose subclass of Exception
-#
-# Copyright (C) 2015, 2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-"""Simple, general-purpose Exception subclass."""
-
-
-class FGPyException(Exception):
-    def __init__(self, message=None, *, mayCapitalizeMsg=True):
-        """Initialize an FGPyException instance.
-
-        Except in cases where 'message' starts with a proper noun or
-        something like that, its first character should be given in
-        lower case. Automated treatments of this exception may print the
-        message with its first character changed to upper case, unless
-        'mayCapitalizeMsg' is False. In other words, if the case of the
-        first character of 'message' must not be changed under any
-        circumstances, set 'mayCapitalizeMsg' to False.
-
-        """
-        self.message = message
-        self.mayCapitalizeMsg = mayCapitalizeMsg
-
-    def __str__(self):
-        return self.completeMessage()
-
-    def __repr__(self):
-        return "{}.{}({!r})".format(__name__, type(self).__name__, self.message)
-
-    # Typically overridden by subclasses with a custom constructor
-    def detail(self):
-        return self.message
-
-    def completeMessage(self):
-        if self.message:
-            return "{shortDesc}: {detail}".format(
-                shortDesc=self.ExceptionShortDescription,
-                detail=self.detail())
-        else:
-            return self.ExceptionShortDescription
-
-    ExceptionShortDescription = "FlightGear Python generic exception"

python3-flightgear/flightgear/meta/logging.py

@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# logging.py --- Simple logging infrastructure (mostly taken from FFGo)
-# Copyright (C) 2015, 2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import sys
-
-from . import misc
-
-
-class LogLevel(misc.OrderedEnum):
-    debug, info, notice, warning, error, critical = range(6)
-
-# List containing the above log levels as strings in increasing priority order
-allLogLevels = [member.name for member in LogLevel]
-allLogLevels.sort(key=lambda n: LogLevel[n].value)
-
-
-def _logFuncFactory(level):
-    def logFunc(self, *args, **kwargs):
-        self.log(LogLevel[level], True, *args, **kwargs)
-
-    def logFunc_noPrefix(self, *args, **kwargs):
-        self.log(LogLevel[level], False, *args, **kwargs)
-
-    return (logFunc, logFunc_noPrefix)
-
-
-class Logger:
-    def __init__(self, progname=None, logLevel=LogLevel.notice,
-                 defaultOutputStream=sys.stdout, logFile=None):
-        self.progname = progname
-        self.logLevel = logLevel
-        self.defaultOutputStream = defaultOutputStream
-        self.logFile = logFile
-
-    def setLogFile(self, *args, **kwargs):
-        self.logFile = open(*args, **kwargs)
-
-    def log(self, level, printLogLevel, *args, **kwargs):
-        if printLogLevel and level >= LogLevel.warning and args:
-            args = [level.name.upper() + ": " + args[0]] + list(args[1:])
-
-        if level >= self.logLevel:
-            if (self.progname is not None) and args:
-                tArgs = [self.progname + ": " + args[0]] + list(args[1:])
-            else:
-                tArgs = args
-
-            kwargs["file"] = self.defaultOutputStream
-            print(*tArgs, **kwargs)
-
-        if self.logFile is not None:
-            kwargs["file"] = self.logFile
-            print(*args, **kwargs)
-
-    # Don't overload log() with too many tests or too much indirection for
-    # little use
-    def logToFile(self, *args, **kwargs):
-        kwargs["file"] = self.logFile
-        print(*args, **kwargs)
-
-    # NP functions are “no prefix” variants which never prepend the log level
-    # (otherwise, it is only prepended for warning and higher levels).
-    debug, debugNP = _logFuncFactory("debug")
-    info, infoNP = _logFuncFactory("info")
-    notice, noticeNP = _logFuncFactory("notice")
-    warning, warningNP = _logFuncFactory("warning")
-    error, errorNP = _logFuncFactory("error")
-    critical, criticalNP = _logFuncFactory("critical")
-
-
-class DummyLogger(Logger):
-    def setLogFile(self, *args, **kwargs):
-        pass
-
-    def log(self, *args, **kwargs):
-        pass
-
-    def logToFile(self, *args, **kwargs):
-        pass

python3-flightgear/flightgear/meta/misc.py

@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# misc.py --- Miscellaneous classes and/or functions
-# Copyright (C) 2015-2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import enum
-
-# Based on an example from the 'enum' documentation
-class OrderedEnum(enum.Enum):
-    """Base class for enumerations whose members can be ordered.
-
-    Contrary to enum.IntEnum, this class maintains normal enum.Enum
-    invariants, such as members not being comparable to members of other
-    enumerations (nor of any other class, actually).
-
-    """
-    def __ge__(self, other):
-        if self.__class__ is other.__class__:
-            return self.value >= other.value
-        return NotImplemented
-
-    def __gt__(self, other):
-        if self.__class__ is other.__class__:
-            return self.value > other.value
-        return NotImplemented
-
-    def __le__(self, other):
-        if self.__class__ is other.__class__:
-            return self.value <= other.value
-        return NotImplemented
-
-    def __lt__(self, other):
-        if self.__class__ is other.__class__:
-            return self.value < other.value
-        return NotImplemented
-
-    def __eq__(self, other):
-        if self.__class__ is other.__class__:
-            return self.value == other.value
-        return NotImplemented
-
-    def __ne__(self, other):
-        if self.__class__ is other.__class__:
-            return self.value != other.value
-        return NotImplemented
-
-
-# Taken from <http://effbot.org/zone/element-lib.htm#prettyprint> and modified
-# by Florent Rougon
-def indentXmlTree(elem, level=0, basicOffset=2, lastChild=False):
-    def indentation(level):
-        return "\n" + level*basicOffset*" "
-
-    if len(elem):
-        if not elem.text or not elem.text.strip():
-            elem.text = indentation(level+1)
-
-        for e in elem[:-1]:
-            indentXmlTree(e, level+1, basicOffset, False)
-        if len(elem):
-            indentXmlTree(elem[-1], level+1, basicOffset, True)
-
-    if level and (not elem.tail or not elem.tail.strip()):
-        if lastChild:
-            elem.tail = indentation(level-1)
-        else:
-            elem.tail = indentation(level)

python3-flightgear/rebuild-fgdata-embedded-resources

@@ -1,172 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# rebuild-fgdata-embedded-resources -- Rebuild FGData-resources.[ch]xx
-# Copyright (C) 2017  Florent Rougon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Only standard modules so that distributors can easily run this script, in
-# case they want to recreate FGData-resources.[ch]xx from source.
-import argparse
-import json
-import locale
-import logging
-import os
-import subprocess
-import sys
-
-PROGNAME = os.path.basename(sys.argv[0])
-CONFIG_FILE = os.path.join(os.path.expanduser('~'),
-                           ".fgmeta",
-                           PROGNAME + ".json")
-
-# chLevel: console handler level
-def setupLogging(level=logging.NOTSET, chLevel=None):
-    global logger
-
-    if chLevel is None:
-        chLevel = level
-
-    logger = logging.getLogger(__name__)
-    # Effective level for all child loggers with NOTSET level
-    logger.setLevel(level)
-    # Create console handler and set its level
-    ch = logging.StreamHandler() # Uses sys.stderr by default
-    ch.setLevel(chLevel)  # NOTSET, DEBUG, INFO, WARNING, ERROR, CRITICAL
-    # Logger name with :%(name)s... many other things available, including
-    # %(levelname)s
-    formatter = logging.Formatter("{}: %(message)s".format(PROGNAME))
-    # Add formatter to ch
-    ch.setFormatter(formatter)
-    # Add ch to logger
-    logger.addHandler(ch)
-
-
-# Modifies 'params' in-place
-def loadCfgFileSection(params, jsonTree, title, items):
-    # NB: !!! each item is subject to os.path.expanduser() !!!
-    try:
-        section = jsonTree[title]
-    except KeyError:
-        pass
-    else:
-        for name in items:
-            try:
-                path = section[name]
-            except KeyError:
-                pass
-            else:
-                setattr(params, name.lower(), os.path.expanduser(path))
-
-
-# Modifies 'params' in-place
-def loadConfigFile(params):
-    if not os.path.isfile(CONFIG_FILE):
-        return
-
-    # The log level is set too late for this one -> commented out
-    # logger.info("Loading config file {}...".format(CONFIG_FILE))
-
-    with open(CONFIG_FILE, "r", encoding="utf-8") as cfgFile:
-        tree = json.load(cfgFile)
-
-    loadCfgFileSection(params, tree, "repositories", ("FlightGear", "FGData"))
-    loadCfgFileSection(params, tree, "executables", ("fgrcc",))
-
-
-def processCommandLine(params):
-    parser = argparse.ArgumentParser(
-        usage="""\
-%(prog)s [OPTION ...]
-Rebuild FGData embedded resources for FlightGear.""",
-        description="""\
-
-Use fgrcc with FGData-resources.xml and the corresponding files in FGData to
-(re)create the FGData-resources.[ch]xx files used in the FlightGear build. The
-existing files in the FlightGear repository are always overwritten
-(FGData-resources.[ch]xx in <FlightGear-repo>/src/EmbeddedResources).
-
-This is a dumb script that simply calls fgrcc with appropriate parameters. In
-order to save some typing, you may want to use a configuration file like this
-(~/.fgmeta/%(prog)s.json):
-
-{"repositories": {"FlightGear": "~/flightgear/src/flightgear",
-                  "FGData":     "~/flightgear/src/fgdata"},
- "executables": {"fgrcc":
-                 "~/flightgear/src/build-fg/src/EmbeddedResources/fgrcc"
-                }
-}""",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        # I want --help but not -h (it might be useful for something else)
-        add_help=False)
-
-    parser.add_argument('--flightgear', action='store', help="""\
-      Path to the FlightGear repository""")
-    parser.add_argument('--fgdata', action='store', help="""\
-      Path to the FGData repository""")
-    parser.add_argument('--fgrcc', action='store', help="""\
-      Path to the fgrcc executable""")
-    parser.add_argument('--log-level', action='store',
-                        choices=("debug", "info", "warning", "error",
-                                 "critical"),
-                        default=None, help="""Set the log level""")
-    parser.add_argument('--help', action="help",
-                        help="display this message and exit")
-
-    parser.parse_args(namespace=params)
-
-    # Don't use the 'default' argparse mechanism for this, in order to allow
-    # the config file to set the log level in a meaningful way if we want (not
-    # implemented at the time of this writing).
-    if params.log_level is not None:
-        logger.setLevel(getattr(sys.modules["logging"],
-                                params.log_level.upper()))
-
-
-def main():
-    locale.setlocale(locale.LC_ALL, '')
-    setupLogging(level=logging.INFO) # may be overridden by options
-
-    params = argparse.Namespace()
-    loadConfigFile(params)      # could set the log level
-    processCommandLine(params)
-
-    if (params.flightgear is None or params.fgdata is None or
-        params.fgrcc is None):
-        logger.error(
-            "--flightgear, --fgdata and --fgrcc must all be specified (they "
-            "may be set in the config file; use --help for more info)")
-        sys.exit(1)
-
-    resDir = os.path.join(params.flightgear, "src", "EmbeddedResources")
-    inputXMLFile = os.path.join(resDir, "FGData-resources.xml")
-    cxxFile = os.path.join(resDir, "FGData-resources.cxx")
-    hxxFile = os.path.join(resDir, "FGData-resources.hxx")
-    args = [params.fgrcc,
-            "--root={}".format(params.fgdata),
-            "--output-cpp-file={}".format(cxxFile),
-            "--init-func-name=initFGDataEmbeddedResources",
-            "--output-header-file={}".format(hxxFile),
-            "--output-header-identifier=_FG_FGDATA_EMBEDDED_RESOURCES",
-            inputXMLFile]
-
-    # encoding="utf-8" requires Python >= 3.6 -> will add it later
-    # (it's not really needed, as we don't process the output)
-    subprocess.run(args, check=True)
-
-    sys.exit(0)
-
-if __name__ == "__main__": main()

release_builder/create-release-branch.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-THIS_RELEASE="2017.3"
-NEXT_RELEASE="2017.4"
-SUBMODULES="simgear flightgear fgdata getstart"
+THIS_RELEASE="2017.2"
+NEXT_RELEASE="2017.3"
+SUBMODULES="simgear flightgear fgdata"
 
 #:<< 'COMMENT_END'
 git checkout next
@@ -28,7 +28,7 @@ read something
 for f in $SUBMODULES .; do
   pushd "$f"
     echo "Pushing $f"
-    git checkout release/${THIS_RELEASE} && git push origin release/${THIS_RELEASE} && git push origin version/${THIS_RELEASE}.1 && git push origin version/${NEXT_RELEASE}.0 && git checkout next && git push
+    git checkout release/${THIS_RELEASE} && git push origin release/${THIS_RELEASE} && git push origin version/${THIS_RELEASE}.1 && git push origin version/${NEXT_RELEASE}.0 && git checkout next && git push 
   popd
 done
 
@@ -42,3 +42,4 @@ done
 svn copy svn+ssh://svn.code.sf.net/p/flightgear/fgaddon/trunk \
          svn+ssh://svn.code.sf.net/p/flightgear/fgaddon/branches/release-${THIS_RELEASE} \
          -m "branching for release ${THIS_RELEASE}"
+

version

@@ -1 +1 @@
-2017.3.1
+2017.2.1