From 5ab8f3f350a43ff70c7eab378fed62f70385049e Mon Sep 17 00:00:00 2001
From: Automatic Release Builder <build@flightgear.org>
Date: Tue, 22 Sep 2020 18:24:15 +0100
Subject: [PATCH] Upload symbols for Linux builds

---
 build_release_linux.sh    | 22 ++++++++++++++++++++++
 build_release_windows.bat |  8 ++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/build_release_linux.sh b/build_release_linux.sh
index 189ef77..46f1133 100755
--- a/build_release_linux.sh
+++ b/build_release_linux.sh
@@ -61,6 +61,28 @@ 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 binary
+strip $WORKSPACE/dist/bin/fgfs
+
+#####################################################################################
+
 echo "Assembling base package"
 cd $WORKSPACE
 
diff --git a/build_release_windows.bat b/build_release_windows.bat
index 9d5bb4a..d6785d9 100755
--- a/build_release_windows.bat
+++ b/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 %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%
+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%
 
 REM indirect way to get command output into an environment variable
 set PATH=%OSG32%\bin;%PATH%