new version: 2020.3.2

build_appimage.sh

@@ -53,6 +53,7 @@ cp -a /usr/lib64/qt5/qml/QtQuick.2 appdir/usr/qml
 
 cp /usr/lib64/libsoftokn3.* appdir/usr/lib
 cp /usr/lib64/libnsspem.so appdir/usr/lib
+cp /usr/lib64/libfreebl* appdir/usr/lib
 cp /etc/pki/tls/certs/ca-bundle.crt appdir/usr/ssl/cacert.pem
 
 #modify the desktop file so that linuxdeployqt doesn't barf (version to 1.0, add semicolon to end of certain line types)

release_builder/create_scenerypack.sh

@@ -1,26 +1,29 @@
 #!/bin/bash
-#
-# Create the scenery pack for a release distribution
-# Make sure to 
-# * set SCENERY and point it to your local (full) mirror of terrasync scenery
-# * name the SCENERY_PACK correctly
-# * carefully select the tiles to copy, usually 2x2, 2x3 or 3x2 keeps the pack small enough
-#
-SCENERY=/path/to/your/scenery
-SCENERY_PACK=SceneryPack.PHNL
-TILES="w160n[12]0/w???n??"
 
-if [ ! -d "$SCENERY" ]; then
-  echo "Scenery directory not found or not readable"
-  exit 1
-fi
+# the name to create
+SCENERY_PACK=SceneryPack.BIKF
 
-if [ ! -d "$SCENERY"/Objects -o ! -d  "$SCENERY"/Terrain -o ! -d  "$SCENERY"/Airports -o ! -d  "$SCENERY"/Models ]; then
-  echo "Scenery directory does not look like a scenery directory"
-  exit 1
-fi
+# the tiles to select
+TILES="w030n60/w???n??";
+
+# tiles for PHNL for C172 tutorials
+TUTORIAL_TILES="w160n[12]0/w???n??";
 
 rm -f SceneryPack.*.tgz
-ln -s "$SCENERY" ${SCENERY_PACK}
-tar --format=gnu --create --owner=root --group=root --gzip --exclude="**/.dirindex" --file=${SCENERY_PACK}.tgz ${SCENERY_PACK}/Objects/${TILES} ${SCENERY_PACK}/Terrain/${TILES} ${SCENERY_PACK}/Airports ${SCENERY_PACK}/Models
+
+# note the path to the TerraSync root here
+ln -s /var/www/uk-mirror/fgscenery ${SCENERY_PACK}
+
+tar --format=gnu --create --owner=root --group=root --gzip --file=${SCENERY_PACK}.tgz \
+    ${SCENERY_PACK}/Objects/${TILES} \
+    ${SCENERY_PACK}/Terrain/${TILES} \
+    ${SCENERY_PACK}/Objects/${TUTORIAL_TILES} \
+    ${SCENERY_PACK}/Terrain/${TUTORIAL_TILES} \
+    ${SCENERY_PACK}/Airports/B/I/K \
+    ${SCENERY_PACK}/Airports/P/H \
+    ${SCENERY_PACK}/Models
+
 rm ${SCENERY_PACK}
+
+# upload to frs.sourceforge.net /home/frs/project/fquitfl/flightgear/scenery/ 
+

release_builder/reset-git-author.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+#This file is part of FlightGear
+#
+#FlightGear is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 2 of the License, or
+#(at your option) any later version.
+#
+#FlightGear is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with FlightGear  If not, see <http://www.gnu.org/licenses/>.
+
+if [ -z "$1" -o -z "$2" ]; then
+  echo "usage: author email"
+  exit
+fi
+
+resetAuthor() {
+    pushd $3 > /dev/null
+  git config user.name "$1"
+  git config user.email $2
+  popd > /dev/null
+}
+
+resetAuthor "$1" $2 flightgear
+resetAuthor "$1" $2 simgear
+resetAuthor "$1" $2 fgdata
+resetAuthor "$1" $2 getstart
+resetAuthor "$1" $2 .
+

version

@@ -1 +1 @@
-2020.3.1
+2020.3.2