Don’t wipe dist when building, since we need it

OpenSceneGraph is copied into dist, don’t blank it.

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = https://git.code.sf.net/p/flightgear/simgear
-	branch = next
+	branch = release/2017.3
 [submodule "flightgear"]
 	path = flightgear
 	url = https://git.code.sf.net/p/flightgear/flightgear
-	branch = next
+	branch = release/2017.3
 [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 = next
+	branch = release/2017.3
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = https://git.code.sf.net/p/flightgear/windows-3rd-party
@@ -21,4 +21,4 @@
 [submodule "getstart"]
 	path = getstart
 	url = https://git.code.sf.net/p/flightgear/getstart
-	branch = next
+	branch = release/2017.3

FlightGear.iss

@@ -20,6 +20,13 @@
 
 #include "InstallConfig.iss"
 
+#if GetEnv("VSINSTALLDIR") == ""
+  #define VSInstallDir "C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+#else
+  #define VSInstallDir GetEnv("VSINSTALLDIR")
+#endif
+
+#define VCInstallDir VSInstallDir + "\VC"
 #define InstallDir32 "X:\install\msvc140"
 #define OSGInstallDir InstallDir32 + "\OpenSceneGraph"
 #define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion
@@ -62,7 +69,7 @@ ArchitecturesAllowed=x86 x64
 
 ; Sign tool must be defined in the Inno Setup GUI, to avoid
 ; exposing the certificate password
-; SignTool=fg_code_sign1
+; SignTool=fg_code_sign1
 
 [Tasks]
 ; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required.
@@ -85,6 +92,7 @@ Source: "{#ThirdPartyDir}\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Che
 Source: "{#ThirdPartyDir}\3rdParty\bin\CrashRpt1403.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty\bin\CrashSender1403.exe"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
+Source: "{#VCInstallDir}\redist\x86\Microsoft.VC140.CRT\*.dll"; DestDir:  "{app}\bin"; Check: not Is64BitInstallMode
 
 ; 64 bits install
 Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode
@@ -99,6 +107,7 @@ Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libintl-8.dll"; DestDir: "{app}\bin";
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\CrashRpt1403.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 Source: "{#ThirdPartyDir}\3rdParty.x64\bin\CrashSender1403.exe"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
+Source: "{#VCInstallDir}\redist\x64\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode
 
 ; Include the base package
 #if IncludeData == "TRUE"
@@ -319,66 +328,6 @@ begin
   end;
 end;
 
-var
-  UninstallCheckCleanPage: TNewNotebookPage;
-  UninstallBackButton: TNewButton;
-  UninstallNextButton: TNewButton;
-  DoCleanCheckbox : TNewCheckBox;
-  CleanHelp : TNewStaticText;
-
-procedure InitializeUninstallProgressForm();
-begin
-  UninstallProgressForm
-
-  UninstallCheckCleanPage := TNewNotebookPage.Create(UninstallProgressForm);
-  UninstallCheckCleanPage.Notebook := UninstallProgressForm.InnerNotebook;
-  UninstallCheckCleanPage.Parent := UninstallProgressForm.InnerNotebook;
-  UninstallCheckCleanPage.Align := alClient
-
-  DoCleanCheckbox := TNewCheckBox.Create(UninstallProgressForm);
-  DoCleanCheckbox.Parent := UninstallCheckCleanPage;
-  DoCleanCheckbox.Caption := 'Remove all settings, downloaded scenery and aircraft';
-  DoCleanCheckbox.Left := ScaleX(10);
-  DoCleanCheckbox.Top := ScaleY(10);
-
-  DoCleanCheckbox.Width := UninstallProgressForm.InnerNotebook.Width - ScaleX(20)
-  DoCleanCheckbox.Height := ScaleY(30)
-
-  CleanHelp := TNewStaticText.Create(UninstallProgressForm);
-  CleanHelp.Parent := UninstallCheckCleanPage;
-  CleanHelp.Top := DoCleanCheckbox.Top + DoCleanCheckbox.Height + ScaleY(10);
-  CleanHelp.Left := DoCleanCheckbox.Left;
-  CleanHelp.Width := DoCleanCheckbox.Width;
-  CleanHelp.Height := CleanHelp.AdjustHeight();
-
-  CleanHelp.WordWrap := True;
-  CleanHelp.Caption := 'FlightGear stores some settings in your user folder. In addition, ' +
-       'scenery or aircraft data may have been downloaded to the download directory. ' +
-       'To completely remove all these files, select this option.';
-
-  UninstallProgressForm.InnerNotebook.ActivePage := UninstallCheckCleanPage;
-
-   UninstallNextButton := TNewButton.Create(UninstallProgressForm);
-   UninstallNextButton.Caption := 'Next';
-    UninstallNextButton.Parent := UninstallProgressForm;
-    UninstallNextButton.Left :=
-      UninstallProgressForm.CancelButton.Left -
-      UninstallProgressForm.CancelButton.Width -
-      ScaleX(10);
-    UninstallNextButton.Top := UninstallProgressForm.CancelButton.Top;
-    UninstallNextButton.Width := UninstallProgressForm.CancelButton.Width;
-    UninstallNextButton.Height := UninstallProgressForm.CancelButton.Height;
-     UninstallNextButton.ModalResult := mrOk;
-
-    UninstallProgressForm.CancelButton.Enabled := True;
-    UninstallProgressForm.CancelButton.ModalResult := mrCancel;
-
-    if UninstallProgressForm.ShowModal = mrCancel then Abort;
-
-    UninstallProgressForm.InnerNotebook.ActivePage := UninstallProgressForm.InstallingPage;
-end;
-
-
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   Version: TWindowsVersion;
@@ -404,18 +353,7 @@ begin
 end;
 
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
-     var ResultCode: Integer;
 begin
-  if CurUninstallStep = usUninstall then
-  begin
-     if DoCleanCheckbox.Checked = True then
-     begin
-         Log('Running clean uninstall');
-         Exec(ExpandConstant('{app}\bin\fgfs.exe'), '--uninstall', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-         Log('clean uninstall completed');
-     end;
-  end;
-
   if CurUninstallStep = usPostUninstall then
     begin
       RemoveFirewallException('FlightGear', ExpandConstant('{app}') + '\bin\fgfs.exe');

build_release_linux.sh

@@ -7,10 +7,6 @@ fi
 
 VERSION=`cat flightgear/version`
 
-#####################################################################################
-# ensure fgrcc can run when linked against libSimGearCore, for example
-export LD_LIBRARY_PATH=$WORKSPACE/dist/lib64:$WORKSPACE/dist/lib:$LD_LIBRARY_PATH
-
 #####################################################################################
 # remove old and create fresh build directories
 cd $WORKSPACE

build_release_windows.bat

@@ -1,6 +1,5 @@
 
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
-IF NOT DEFINED IS_NIGHTLY_BUILD SET IS_NIGHTLY_BUILD=1
 
 IF %IS_NIGHTLY_BUILD% EQU 1 (
   SET FGBUILDTYPE=Nightly
@@ -68,9 +67,8 @@ cmake --build . --config RelWithDebInfo --target INSTALL
 cd ..
 
 REM Qt5 deployment
-SET QMLDIR=%WORKSPACE%/flightgear/src/GUI/qml
-%QT5SDK32%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140/bin/fgfs.exe
-%QT5SDK64%\bin\windeployqt --release --list target --qmldir %QMLDIR% %WORKSPACE%/install/msvc140-64/bin/fgfs.exe
+%QT5SDK32%\bin\windeployqt --release --list target %WORKSPACE%/install/msvc140/bin/fgfs.exe
+%QT5SDK64%\bin\windeployqt --release --list target %WORKSPACE%/install/msvc140-64/bin/fgfs.exe
 
 REM build setup
 ECHO Packaging root is %WORKSPACE%

catalog/catalog.py

@@ -35,18 +35,8 @@ def scan_set_file(aircraft_dir, set_file, includes):
     if sim_node == None:
         return None
 
-    # allow -set.xml files to specifcially exclude themselves from
-    # the creation process, by setting <exclude-from-catalog>true</>
-    if (sim_node.getValue("exclude-from-catalog", False) == True):
-        return None
-
     variant = {}
-    name = sim_node.getValue("description", None)
-    if (name == None or len(name) == 0):
-        print "Set file " + set_file + " is missing a <description>, skipping"
-        return None
-
-    variant['name'] =  name
+    variant['name'] = sim_node.getValue("description", None)
     variant['status'] = sim_node.getValue("status", None)
 
     if sim_node.hasChild('author'):
@@ -121,7 +111,6 @@ def scan_aircraft_dir(aircraft_dir, includes):
     files = os.listdir(aircraft_dir)
     for file in sorted(files, key=lambda s: s.lower()):
         if file.endswith('-set.xml'):
-            # print 'trying:', file
             try:
                 d = scan_set_file(aircraft_dir, file, includes)
                 if d == None:
@@ -137,9 +126,8 @@ def scan_aircraft_dir(aircraft_dir, includes):
             elif d['variant-of'] == None:
                 primaryAircraft.append(d)
 
-    # print setDicts
     if len(setDicts) == 0:
-        return None, None
+        return None
 
     # use the first one
     if len(primaryAircraft) == 0:

catalog/fgaddon-catalog/template.xml

@@ -6,12 +6,13 @@
     <version n="1">3.5.*</version>
     <version n="2">3.6.*</version>
     <version n="3">3.7.*</version>
+    <version n="4">2016.1.*</version>
     <version n="5">2016.*.*</version>
     <version n="6">2017.*.*</version>
     <id>org.flightgear.fgaddon</id>
     <license>GPL</license>
     <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-    <name>FlightGear aircraft distribution from fgaddon</name>
+    <name>FlightGear Aircraft Distribution From fgaddon</name>
     <description>This hangar provides aircraft officially supported and maintained by the FlightGear project, under a free-software license.</description>
     <de>
       <description>Auf Deutsch</description>

catalog/sgprops.py

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

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

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

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

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

catalog/update-catalog.py

@@ -144,10 +144,7 @@ def process_aircraft_dir(name, repo_path):
     package_node = catalog.make_aircraft_node(name, package, variants, download_base)
 
     download_url = download_base + name + '.zip'
-    if 'thumbnail' in package:
-        # this is never even used, but breaks the script by assuming
-        # all aircraft packages have thumbnails defined?
-        thumbnail_url = download_base + 'thumbnails/' + name + '_' + package['thumbnail']
+    thumbnail_url = download_base + 'thumbnails/' + name + '_' + package['thumbnail']
 
     # get cached md5sum if it exists
     md5sum = get_xml_text(md5sum_root.find(str('aircraft_' + name)))
@@ -304,7 +301,6 @@ for scm in scm_list:
             continue
 
         # process each aircraft in turn
-        # print name, repo_path
         process_aircraft_dir(name, repo_path)
 
 # write out the master catalog file

download_and_compile.sh

@@ -26,7 +26,6 @@ VERSION="$(echo "$script_blob_id" | sed 's@\$Id: *\([0-9a-f]\+\) *@\1@')"
 # Then remove the trailing '$'
 VERSION="${VERSION%\$}"
 
-PROGNAME=$(basename "$0")
 FGVERSION="release/$(git ls-remote --heads https://git.code.sf.net/p/flightgear/flightgear|grep '\/release\/'|cut -f4 -d'/'|sort -t . -k 1,1n -k2,2n -k3,3n|tail -1)"
 
 #######################################################
@@ -55,8 +54,6 @@ BUILD_TYPE="RelWithDebInfo"
 SG_CMAKEARGS=""
 FG_CMAKEARGS=""
 
-declare -a UNMATCHED_OPTIONAL_PKG_ALTERNATIVES
-
 while getopts "shc:p:a:d:r:j:O:ib:" OPTION; do
   case $OPTION in
     s) STABLE="STABLE" ;;
@@ -164,72 +161,29 @@ function _make(){
   fi
 }
 
-# Add an available, non-virtual package matching one of the given regexps.
+# 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 _mandatory_pkg_alternative(){
-  local pkg
-
+function _package_alternative(){
   if [[ $# -lt 1 ]]; then
-    echo "Empty package alternative: this is a bug in the script, aborting." \
-      | tee -a "$LOGFILE"
+    echo "Empty package alternative: this is a bug in the script, aborting."
     exit 1
   fi
 
-  echo "Considering a package alternative:" "$@" | tee -a "$LOGFILE"
-  pkg=$(_find_package_alternative "$@")
-
-  if [[ -n "$pkg" ]]; then
-    echo "Package alternative matched for $pkg" | tee -a "$LOGFILE"
-    PKG="$PKG $pkg"
-  else
-    echo "No match found for the package alternative, aborting." \
-      | tee -a "$LOGFILE"
-    exit 1
-  fi
-
-  return 0
-}
-
-# If available, add a non-virtual package matching one of the given regexps.
-#
-# Returning 0 or 1 on success to indicate whether a match was found could be
-# done, but would need to be specifically handled at the calling site,
-# since the script is run under 'set -e' regime.
-function _optional_pkg_alternative(){
-  local pkg
-
-  if [[ $# -lt 1 ]]; then
-    echo "Empty optional package alternative: this is a bug in the script," \
-         "aborting." | tee -a "$LOGFILE"
-    exit 1
-  fi
-
-  echo "Considering an optional package alternative:" "$@" | tee -a "$LOGFILE"
-  pkg=$(_find_package_alternative "$@")
-
-  if [[ -n "$pkg" ]]; then
-    echo "Optional package alternative matched for $pkg" | tee -a "$LOGFILE"
-    PKG="$PKG $pkg"
-  else
-    echo "No match found for the optional package alternative, continuing" \
-         "anyway." | tee -a "$LOGFILE"
-    # "$*" so that we only add one element to the array in this line
-    UNMATCHED_OPTIONAL_PKG_ALTERNATIVES+=("$*")
-  fi
-
-  return 0
+  echo "Considering a package alternative:" "$@"
+  _package_alternative_inner "$@"
 }
 
 # This function requires the 'dctrl-tools' package
-function _find_package_alternative(){
+function _package_alternative_inner(){
   local pkg
 
   if [[ $# -lt 1 ]]; then
-    return 0                    # Nothing could be found
+    echo "No match found for the package alternative, aborting."
+    exit 1
   fi
 
   # This finds non-virtual packages only (on purpose)
@@ -239,12 +193,13 @@ function _find_package_alternative(){
          sed -ne '1s/^Package:[[:space:]]*//gp')"
 
   if [[ -n "$pkg" ]]; then
-    echo "$pkg"
+    echo "Package alternative matched for $pkg"
+    PKG="$PKG $pkg"
     return 0
   else
     # Try with the next regexp
     shift
-    _find_package_alternative "$@"
+    _package_alternative_inner "$@"
   fi
 }
 
@@ -312,8 +267,8 @@ if [[ "$DOWNLOAD_PACKAGES" = "y" ]] && [[ "$APT_GET_UPDATE" = "y" ]]; then
 fi
 
 # Ensure 'dctrl-tools' is installed
-if [[ "$(dpkg-query --showformat='${Status}\n' --show dctrl-tools \
-                    2>/dev/null | awk '{print $3}')" != "installed" ]]; then
+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
@@ -333,16 +288,11 @@ PKG="$PKG libcgal-dev libgdal-dev libtiff5-dev"
 PKG="$PKG libqt4-dev"
 # SG/FG
 PKG="$PKG zlib1g-dev freeglut3-dev libboost-dev"
-_mandatory_pkg_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \
-                           'libopenscenegraph-[0-9]+\.[0-9]+-dev'
+_package_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \
+                     'libopenscenegraph-[0-9]+\.[0-9]+-dev'
 # FG
 PKG="$PKG libopenal-dev libudev-dev qt5-default qtdeclarative5-dev libdbus-1-dev libplib-dev"
-_mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev
-# The following packages are needed for the built-in launcher
-_optional_pkg_alternative qtbase5-private-dev
-_optional_pkg_alternative qtdeclarative5-private-dev
-_optional_pkg_alternative qml-module-qtquick2
-_optional_pkg_alternative qml-module-qtquick-window2
+_package_alternative libpng-dev libpng12-dev libpng16-dev
 # FGPanel
 PKG="$PKG fluid libbz2-dev libfltk1.3-dev libxi-dev libxmu-dev"
 # FGAdmin
@@ -913,24 +863,6 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="TERRAGEARGUI"' ]]; then
   echo "./TerraGUI \$@" >> run_terrageargui.sh
 fi
 
-# Print optional package alternatives that didn't match (this helps with
-# troubleshooting)
-if [[ ${#UNMATCHED_OPTIONAL_PKG_ALTERNATIVES[@]} -gt 0 ]]; then
-    echo | tee -a "$LOGFILE"
-    printf "The following optional package alternative(s) didn't match:\n\n" \
-        | tee -a "$LOGFILE"
-
-    for alt in "${UNMATCHED_OPTIONAL_PKG_ALTERNATIVES[@]}"; do
-        printf "  %s\n" "$alt" | tee -a "$LOGFILE"
-    done
-
-    printf "\nThis could explain missing optional features in FlightGear or \
-other software\ninstalled by $PROGNAME.\n" | tee -a "$LOGFILE"
-else
-    printf "All optional package alternatives have found a matching package.\n" \
-        | tee -a "$LOGFILE"
-fi
-
 echo ""
 echo "download_and_compile.sh has finished to work"
 

hudson_mac_package_release.rb

@@ -40,7 +40,6 @@ puts "Is-release? : ##{$isRelease}"
 $prefixDir=Dir.pwd + "/dist"
 dmgDir=Dir.pwd + "/image"
 srcDir=Dir.pwd + "/flightgear"
-qmlDir=srcDir + "/src/GUI/qml"
 
 puts "Erasing previous image dir"
 `rm -rf #{dmgDir}`
@@ -49,10 +48,8 @@ bundle=dmgDir + "/FlightGear.app"
 
 # run macdeployt before we rename the bundle, otherwise it
 # can't find the bundle executable
-# also note if adding options here, the bundle path has to be
-# the first argument to macdeployqt
 puts "Running macdeployqt on the bundle to copy Qt libraries"
-`macdeployqt #{$prefixDir}/fgfs.app -qmldir=#{qmlDir}`
+`macdeployqt #{$prefixDir}/fgfs.app`
 
 puts "Moving & renaming app bundle"
 `mkdir -p #{dmgDir}`

python3-flightgear/README-l10n.txt

@@ -1,5 +1,3 @@
--*- coding: utf-8 -*-
-
 Quick start for the localization (l10n) scripts
 ===============================================
 
@@ -13,11 +11,7 @@ $FG_ROOT/Translations:
 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[1].
-
-
-Creating XLIFF files from existing FlightGear legacy XML translation files
---------------------------------------------------------------------------
+      '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
@@ -25,10 +19,8 @@ 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 for the following
-  # commands to work. POSIX shell does that, Bash too apparently, but not Zsh
-  # (by default). In Zsh, you can use $=languages or ${=languages} to ensure
-  # the expansion uses word splitting.
+  # 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
@@ -36,18 +28,12 @@ localization files in $FG_ROOT/Translations/<language_code>):
   fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
                               merge-new-master $languages
 
-Updating XLIFF files to reflect changes in the default translation
-------------------------------------------------------------------
-
-When master strings[2] have changed (in a large sense, i.e.: strings added,
-modified or removed, or categories added or removed[3]):
+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
 
-Updating XLIFF files to mark or remove obsolete translated strings
-------------------------------------------------------------------
-
 To remove unused translated strings (not to be done too often in my opinion):
 
   fg-update-translation-files --transl-dir="$FG_ROOT/Translations" \
@@ -57,29 +43,6 @@ To remove unused translated strings (not to be done too often in my opinion):
 as not-to-be-translated, however 'merge-new-master' presented above already
 does that)
 
-Merging contents from an XLIFF file into another one
-----------------------------------------------------
-
-Suppose a translator has been working on a particular translation file, and
-meanwhile the official XLIFF file for this translation has been updated in
-FGData (new translatable strings added, obsolete strings marked or removed,
-etc.). In such a case, 'fg-merge-xliff-into-xliff' can be used to merge the
-translator's work into the project file. Essentially, this means that for all
-strings that have the same source text, plural status, number of plural forms
-and of course target language, the target texts, “approved” status and
-translator comments will be taken from the first file passed in the following
-command:
-
-  fg-merge-xliff-into-xliff TRANSLATOR_FILE PROJECT_FILE
-
-Used like this, PROJECT_FILE will be updated with data from TRANSLATOR_FILE.
-If you don't want to modify PROJECT_FILE, use the -o (--output) option. If '-'
-is passed as argument to this option, then the result is written to the
-standard output.
-
-Creating skeleton XLIFF files for new translations
---------------------------------------------------
-
 To create skeleton translations for new languages (e.g., for fr_BE, en_AU and
 ca):
 
@@ -99,23 +62,17 @@ ca):
      fg-new-translations chooses an appropriate place based on the value
      specified for --transl-dir)
 
-Getting more information on the scripts
----------------------------------------
-
-fg-convert-translation-files, fg-update-translation-files,
-fg-merge-xliff-into-xliff and fg-new-translations all support the --help
-option for more detailed information.
+fg-convert-translation-files, fg-update-translation-files and
+fg-new-translations all support the --help option for more detailed
+information.
 
 
 Footnotes
 ---------
 
-  [1] Except for the fg-merge-xliff-into-xliff script, which doesn't have any
-      of these requirements.
+  [1] Strings in the default translation.
 
-  [2] Strings in the default translation.
-
-  [3] Only empty categories are removed by this command. An obsolete category
+  [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:
 

python3-flightgear/fg-convert-translation-files

@@ -24,6 +24,11 @@ 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
 

python3-flightgear/fg-merge-xliff-into-xliff

@@ -1,123 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# fg-merge-xliff-into-xliff --- Merge translations from one XLIFF file into
-#                               another one
-# 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 locale
-import os
-import sys
-
-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 ...] SOURCE INTO
-Merge strings from a FlightGear XLIFF localization file into another one.""",
-        description="""\
-This program merges a FlightGear XLIFF localization file into another one.
-This means that every translatable string that:
-
- (1) exists in both SOURCE and INTO;
-
- (2) has the same target language, source text, plural status and number of
-     plural forms in SOURCE and in INTO;
-
-is updated from SOURCE, i.e.: the target texts, 'approved' status and
-translator comments are copied from SOURCE.
-
-The result is written to INTO unless the -o (--output) option is given.
-
-Note that this program is different from fg-update-translation-files's
-'merge-new-master' command, which is for updating an XLIFF file according to
-the default translation ("master").
-
-Expected use case: suppose that a translator is working on a translation
-file, and meanwhile the official XLIFF file for this translation is updated
-in the project repository (new translatable strings added, obsolete strings
-marked or removed, etc.). This program can then be used to merge the
-translator work into the project file for all strings for which it makes
-sense (source text unchanged, same plural status, etc.).""",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        # I want --help but not -h (it might be useful for something else)
-        add_help=False)
-
-    parser.add_argument("source", metavar="SOURCE",
-                        help="""\
-                        input XLIFF file; read updated translated strings
-                        from this file""")
-    parser.add_argument("into", metavar="INTO",
-                        help="""\
-                        XLIFF file to compare to SOURCE in order to decide
-                        which translated strings to update; unless the -o
-                        option is used, updated strings are written to this
-                        file""")
-    parser.add_argument("-o", "--output",
-                        help="""\
-                        write the XLIFF merged output to OUTPUT instead of
-                        INTO. When this option is used, INTO is read but not
-                        modified. If OUTPUT is '-', write the XLIFF merged
-                        output to the standard output.""")
-    parser.add_argument("--help", action="help",
-                        help="display this message and exit")
-
-    return parser.parse_args(namespace=params)
-
-
-def mergeXliffIntoXliff(source, into, output):
-    formatHandler = fg_i18n.XliffFormatHandler()
-
-    srcTransl = formatHandler.readTranslation(source)
-    transl = formatHandler.readTranslation(into)
-    # Merge 'srcTransl' into 'transl'
-    transl.mergeNonMasterTransl(srcTransl, logger=logger)
-
-    # File path, or '-' for the standard output
-    outputFile = into if output is None else output
-    formatHandler.writeTranslation(transl, outputFile)
-
-
-def main():
-    global params
-
-    locale.setlocale(locale.LC_ALL, '')
-    params = processCommandLine()
-
-    mergeXliffIntoXliff(params.source, params.into, params.output)
-
-    sys.exit(0)
-
-
-if __name__ == "__main__": main()

python3-flightgear/fg-new-translations

@@ -24,6 +24,11 @@ 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
 

python3-flightgear/fg-update-translation-files

@@ -25,6 +25,11 @@ 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
 

python3-flightgear/flightgear/meta/i18n.py

@@ -684,7 +684,8 @@ class Translation:
 
     def mergeMasterForCategory(self, masterTransl, cat, logger=dummyLogger):
         if cat not in masterTransl:
-            raise BadAPIUse("category {!r} not in 'masterTransl'".format(cat))
+            raise BadAPIUse("Bad API use: category {!r} not in " \
+                            "'masterTransl'".format(cat))
         elif cat not in self:
             # Category appeared in 'masterTransl' that wasn't in 'self'
             self.resetCategory(cat)
@@ -746,110 +747,6 @@ class Translation:
                 .format(lang=self.targetLanguage, cat=cat))
             del self[cat]
 
-    # Helper method for mergeNonMasterTranslForCategory()
-    def _mergeNonMasterTranslForCategory_CheckMatchingParams(
-            self, cat, tid, srcTu, logger):
-        translUnit = self.translations[cat][tid]
-
-        if srcTu.targetLanguage != translUnit.targetLanguage:
-            logger.warning(
-                "ignoring translatable string '{id}', because the target "
-                "languages don't match between the two translations"
-                .format(id=tid))
-            return False
-
-        if srcTu.sourceText != translUnit.sourceText:
-            logger.warning(
-                "ignoring translatable string '{id}', because the source "
-                "texts differ between the two translations"
-                .format(id=tid))
-            return False
-
-        if len(srcTu.targetTexts) != len(translUnit.targetTexts):
-            logger.warning(
-                "ignoring translatable string '{id}', because the lists "
-                "of target texts (= number of singular + plural forms) differ "
-                "between the two translations".format(id=tid))
-            return False
-
-        if srcTu.isPlural != translUnit.isPlural:
-            logger.warning(
-                "ignoring translatable string '{id}', because the plural "
-                "statuses don't match".format(id=tid))
-            return False
-
-        return True
-
-    def mergeNonMasterTranslForCategory(self, srcTransl, cat,
-                                        logger=dummyLogger):
-        """Merge a non-master Translation into 'self' for category 'cat'.
-
-        See mergeNonMasterTransl()'s docstring for more info.
-
-        """
-        if cat not in srcTransl:
-            return              # nothing to merge in this category
-        elif cat not in self:
-            raise BadAPIUse(
-                "cowardly refusing to create category {!r} in the destination "
-                "translation for an XLIFF-to-XLIFF merge operation "
-                "(new categories should be first added to the master "
-                "translation, then merged into each XLIFF translation file)"
-                .format(cat))
-
-        if srcTransl.targetLanguage != self.targetLanguage:
-            raise BadAPIUse(
-                "cowardly refusing to merge two XLIFF files with different "
-                "target languages")
-
-        thisCatTranslations = self.translations[cat]
-        idsSet = { str(tid) for tid in thisCatTranslations.keys() }
-
-        for tid, srcTu in srcTransl.translations[cat].items():
-            if str(tid) not in idsSet:
-                logger.warning(
-                    "translatable string '{id}' not found in the "
-                    "destination translation during an XLIFF-to-XLIFF merge "
-                    "operation. The string will be ignored, because new "
-                    "translatable strings must be brought by the default "
-                    "translation.".format(id=tid))
-                continue
-            # If some parameters don't match (sourceText, isPlural...), the
-            # translation in 'srcTu' is probably outdated, so don't use it.
-            elif not self._mergeNonMasterTranslForCategory_CheckMatchingParams(
-                    cat, tid, srcTu, logger):
-                continue
-            else:
-                translUnit = thisCatTranslations[tid]
-                translUnit.targetTexts = srcTu.targetTexts[:] # copy
-                translUnit.approved = srcTu.approved
-                translUnit.translatorComments = srcTu.translatorComments[:]
-
-    def mergeNonMasterTransl(self, srcTransl, logger=dummyLogger):
-        """Merge the non-master Translation 'srcTransl' into 'self'.
-
-        Contrary to mergeMasterTranslation(), this method doesn't add
-        new translatable strings to 'self', doesn't mark strings as
-        obsolete or vanished, nor does it add or remove categories in
-        'self'. It only updates strings in 'self' from 'srcTransl' when
-        they:
-          - already exist in 'self';
-          - have the same target language, source text, plural status
-            and number of plural forms in 'self' and in 'srcTransl'.
-
-        Expected use case: suppose that a translator is working on a
-        translation file, and meanwhile the official XLIFF file (for
-        instance) for this translation is updated in the project
-        repository (new translatable strings added, obsolete strings
-        marked or removed, etc.). This method can then be used to merge
-        the translator work into the project file for all strings for
-        which it makes sense (source text unchanged, same plural status,
-        etc.).
-
-        """
-        for cat in srcTransl:
-            self.mergeNonMasterTranslForCategory(srcTransl, cat, logger=logger)
-
     def nbPluralForms(self):
         return nbPluralFormsForLanguage(self.targetLanguage)
 

release_builder/create-release-branch.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-THIS_RELEASE="2018.1"
-NEXT_RELEASE="2018.2"
+THIS_RELEASE="2017.3"
+NEXT_RELEASE="2017.4"
 SUBMODULES="simgear flightgear fgdata getstart"
 
 #:<< 'COMMENT_END'

version

@@ -1 +1 @@
-2018.1.1
+2017.3.1