Changes to create a debug build

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "simgear"]
 	path = simgear
 	url = ../simgear
-	branch = release/2020.3
+	branch = next
 [submodule "flightgear"]
 	path = flightgear
 	url = ../flightgear
-	branch = release/2020.3
+	branch = next
 [submodule "fgrun"]
 	path = fgrun
 	url = ../fgrun
@@ -13,12 +13,12 @@
 [submodule "fgdata"]
 	path = fgdata
 	url = ../fgdata
-	branch = release/2020.3
+	branch = next
 [submodule "windows-3rd-party"]
 	path = windows-3rd-party
 	url = ../windows-3rd-party
-	branch = release/2020.3
+	branch = master
 [submodule "getstart"]
 	path = getstart
 	url = ../getstart
-	branch = release/2020.3
+	branch = next

build_appimage.sh

@@ -1,85 +0,0 @@
-#!/bin/bash
-#
-# 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 3 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, see <http://www.gnu.org/licenses/>.
-#
-# builds Appimage on Centos 7 using linuxdeployqt from continuous build
-# expects to work in $WORKSPACE, uses the contents of dist/{bin,share,lib64} copied into an appdir
-# missing qt plugins are copied in manually, as are osgPlugins
-# libcurl in SIMGEAR needs a setting to find the tls certificate, and OSG needs LD_LIBRARY_PATH so it can find osgPlugins
-# currently not including FGDATA, but this could be done easily once FG is updated to change Nav database checks from path to some kind of checksum
-# 
-# issues/errors:
-# can't find qt translations - missing something in my build?
-# 
-# errors/comments to enrogue@gmail.com
-
-#clean up any previous build
-
-rm -rf appdir
-
-#create basic structure
-
-mkdir -p appdir/usr/bin
-mkdir -p appdir/usr/lib
-mkdir -p appdir/usr/share
-mkdir -p appdir/usr/qml
-mkdir -p appdir/usr/ssl
-
-#copy everything we need in
-
-cp dist/bin/* appdir/usr/bin
-
-cp -a dist/lib64/* appdir/usr/lib
-
-# remove SimGearCore,Scene and any other static libs which leaked
-rm appdir/usr/lib/lib*.a 
-
-cp -a dist/lib64/osgPlugins-3.4.2 appdir/usr/lib
-
-cp -r dist/share appdir/usr
-
-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)
-sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/applications/org.flightgear.FlightGear.desktop
-
-#generate AppRun script
-
-cat << 'EOF' > appdir/AppRun
-#!/bin/bash
-HERE="$(dirname "$(readlink -f "${0}")")"
-export SIMGEAR_TLS_CERT_PATH=$HERE/usr/ssl/cacert.pem
-echo SIMGEAR_TLS_CERT_PATH=$SIMGEAR_TLS_CERT_PATH
-export LD_LIBRARY_PATH=${HERE}/usr/lib:${LD_LIBRARY_PATH}
-export OSG_LIBARARY_PATH=${HERE}/usr/lib
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-exec "${HERE}/usr/bin/fgfs" "$@"
-EOF
-
-
-chmod +x appdir/AppRun
-
-#grab continuous linuxdeployqt
-wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
-chmod +x linuxdeployqt-continuous-x86_64.AppImage
-
-#set VERSION for AppImage creation
-export VERSION=`cat flightgear/flightgear-version`
-
-./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/org.flightgear.FlightGear.desktop -appimage

build_release_linux.sh

@@ -5,9 +5,7 @@ if [ "$WORKSPACE" == "" ]; then
     exit 1
 fi
 
-cmakeGenerator=Ninja
-cmakeCommonArgs="-DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo"
-VERSION=`cat flightgear/flightgear-version`
+VERSION=`cat flightgear/version`
 
 #####################################################################################
 # ensure fgrcc can run when linked against libSimGearCore, for example
@@ -24,68 +22,43 @@ rm -rf output/*
 #####################################################################################
 echo "Starting on SimGear"
 cd sgBuild
-cmake -G $cmakeGenerator $cmakeCommonArgs ../simgear
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_DNS:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" ../simgear
 
 # compile
-ninja
+make
 
 if [ $? -ne '0' ]; then
     echo "make simgear failed"
     exit 1
 fi
 
-ninja install
+make install
 
 # build source package and copy to output
-ninja package_source
+make package_source
 cp simgear-*.tar.bz2 ../output/.
 
 #####################################################################################
 echo "Starting on FlightGear"
 cd ../fgBuild
-cmake -G $cmakeGenerator $cmakeCommonArgs -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
 
 # compile
-ninja
+make
 
 if [ $? -ne '0' ]; then
     echo "make flightgear failed"
     exit 1
 fi
 
-ninja install
+make install
 
 # build source package and copy to output
-ninja package_source
+make package_source
 cp flightgear-*.tar.bz2 ../output/.
 
 #####################################################################################
 
-if which sentry-cli >/dev/null; then
-    echo "Uploading symbols"
-
-    export SENTRY_ORG=flightgear
-    export SENTRY_PROJECT=flightgear
-    
-    # set in the Jenkins environment for the builder
-  #  export SENTRY_AUTH_TOKEN=YOUR_AUTH_TOKEN
-
-    ERROR=$(sentry-cli upload-dif --include-sources "$WORKSPACE/dist/bin/fgfs" 2>&1 >/dev/null)
-    if [ ! $? -eq 0 ]; then
-        echo "warning: sentry-cli - $ERROR"
-    fi
-else
-    echo "warning: sentry-cli not installed, download from https://github.com/getsentry/sentry-cli/releases"
-fi
-
-# now we uploaded symnbols, strip the binaries
-
-strip --strip-debug $WORKSPACE/dist/bin/fgfs
-strip --strip-debug $WORKSPACE/dist/bin/fgviewer
-strip --strip-debug $WORKSPACE/dist/bin/fgjs
-
-#####################################################################################
-
 echo "Assembling base package"
 cd $WORKSPACE
 

build_release_windows.bat

@@ -118,10 +118,10 @@ SET SENTRY_ORG=flightgear
 SET SENTRY_PROJECT=flightgear
 REM ensure SENTRY_AUTH_TOKEN is set in the environment
 
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg32\%FGFS_PDB%
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg64\%FGFS_PDB%
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg32-compositor\%FGFS_PDB%
-sentry-cli upload-dif --include-sources %WORKSPACE%\build-fg64-compositor\%FGFS_PDB%
+sentry-cli upload-dif %WORKSPACE%\build-fg32\%FGFS_PDB%
+sentry-cli upload-dif %WORKSPACE%\build-fg64\%FGFS_PDB%
+sentry-cli upload-dif %WORKSPACE%\build-fg32-compositor\%FGFS_PDB%
+sentry-cli upload-dif %WORKSPACE%\build-fg64-compositor\%FGFS_PDB%
 
 REM indirect way to get command output into an environment variable
 set PATH=%OSG32%\bin;%PATH%
@@ -129,7 +129,7 @@ osgversion --so-number > %TEMP%\osg-so-number.txt
 osgversion --version-number > %TEMP%\osg-version.txt
 osgversion --openthreads-soversion-number > %TEMP%\openthreads-so-number.txt
 
-SET /P FLIGHTGEAR_VERSION=<flightgear\flightgear-version
+SET /P FLIGHTGEAR_VERSION=<flightgear\version
 SET /P OSG_VERSION=<%TEMP%\osg-version.txt
 SET /P OSG_SO_NUMBER=<%TEMP%\osg-so-number.txt
 SET /P OT_SO_NUMBER=<%TEMP%\openthreads-so-number.txt

hudson_mac_build_release.sh

@@ -22,7 +22,7 @@ echo "Build path is: $PATH"
 # to be necessary all the same
 #export PKG_CONFIG_PATH=$WORKSPACE/dist/lib/pkgconfig
 
-cmakeCommonArgs="-G Ninja -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+cmakeCommonArgs="-G Ninja -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=Debug"
 
 ###############################################################################
 echo "Starting on SimGear"
@@ -30,7 +30,6 @@ pushd sgBuild
 cmake ${cmakeCommonArgs} ../simgear
 
 # compile
-cmake --build . --target debug_symbols
 cmake --build . --target install
 
 if [ $? -ne '0' ]; then
@@ -52,7 +51,6 @@ fi
 
 cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DENABLE_SWIFT:BOOL=ON ${cmakeCommonArgs} ../flightgear
 
-cmake --build . --target debug_symbols
 cmake --build . --target install
 
 if [ $? -ne '0' ]; then
@@ -62,15 +60,7 @@ fi
 
 popd
 
-
-crashpad_bin_path=$WORKSPACE/dist/fgfs.app/Contents/MacOS/crashpad_handler
-if [ -f $crashpad_bin_path ]; then
-  chmod +x $crashpad_bin_path
-fi
-
 chmod +x $WORKSPACE/dist/bin/osgversion
-echo "Running symbol upload script"
-./sentry-dSYM-upload-mac.sh
 
 ################################################################################
 

hudson_mac_package_release.rb

@@ -70,7 +70,7 @@ t = Time.new
 fgCurrentYear = t.year
 fgBundleIdentifier = "org.flightgear.mac"
 
-fgVersion = File.read("#{srcDir}/flightgear-version").strip
+fgVersion = File.read("#{srcDir}/version").strip
 volName="\"FlightGear #{fgVersion}\""
 
 if $isRelease

release_builder/create-release-branch-for.sh

@@ -42,8 +42,8 @@ NEXT_MINOR_VERSION=${VERSION_A[1]}
 setVersionTo() {
   local V="$1"
   echo "setting version to $V"
-  echo "$V" > flightgear-version
-  git add flightgear-version
+  echo "$V" > version
+  git add version
   echo "new version: $V" | git commit --file=-
 #  git tag "version/$V"
 }

release_builder/create-release-branch.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-THIS_RELEASE="2020.2"
-NEXT_RELEASE="2020.3"
+THIS_RELEASE="2020.1"
+NEXT_RELEASE="2020.2"
 SUBMODULES="simgear flightgear fgdata getstart"
 
 #:<< 'COMMENT_END'

release_builder/create_scenerypack.sh

@@ -1,29 +1,26 @@
 #!/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??"
 
-# the name to create
-SCENERY_PACK=SceneryPack.BIKF
+if [ ! -d "$SCENERY" ]; then
+  echo "Scenery directory not found or not readable"
+  exit 1
+fi
 
-# the tiles to select
-TILES="w030n60/w???n??";
-
-# tiles for PHNL for C172 tutorials
-TUTORIAL_TILES="w160n[12]0/w???n??";
+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
 
 rm -f SceneryPack.*.tgz
-
-# 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
-
+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
 rm ${SCENERY_PACK}
-
-# upload to frs.sourceforge.net /home/frs/project/fquitfl/flightgear/scenery/ 
-

release_builder/reset-git-author.sh

@@ -1,34 +0,0 @@
-#!/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 .
-

release_builder/set-version.sh

@@ -33,9 +33,9 @@ MICRO_VERSION=${VERSION_A[2]}
 
 setVersionTo() {
   local V="$1"
-  echo "setting version to $V in $2"
-  echo "$V" > $2
-  git add $2
+  echo "setting version to $V"
+  echo "$V" > version
+  git add version
   echo "new version: $V" | git commit --file=-
   git tag "version/$V"
 }
@@ -43,22 +43,9 @@ setVersionTo() {
 while [ $# -gt 0 ]; do
   echo "Processing $1"
   pushd $1 > /dev/null
-
-  case $1 in
-  flightgear)
-    versionFileName="flightgear-version"
-    ;;
-  simgear)
-    versionFileName="simgear-version"
-    ;;
-  *)
-    versionFileName="version"
-    ;;
-  esac
-
   git config user.name "Automatic Release Builder"
   git config user.email "build@flightgear.org"
-  setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}" $versionFileName
+  setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
   popd > /dev/null
   shift  
 done

version

@@ -1 +1 @@
-2020.3.2
+2020.2.0