From 9a6eba238350b11ba68346ac7a750e178899ea0d Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Mon, 5 Apr 2021 15:56:58 -0400
Subject: [PATCH] CI: Upload MSVC PDBs; compress ELF debug info

---
 .github/workflows/build.yml | 23 ++++++++++++++---------
 CMakeLists.txt              | 14 +++++++++++++-
 ci/upload-debug-linux.sh    |  2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff38f9e42..f20271e25 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -213,7 +213,12 @@ jobs:
         run: cmake --build . --config $BUILD_TYPE
 
       - name: Upload debug information
-        run:
+        env:
+          SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
+          SENTRY_URL: ${{secrets.SENTRY_URL}}
+        run: |
+          & "$env:RUNNER_WORKSPACE\temp\sentry-cli.exe" upload-dif --org axiodl --project urde --include-sources `
+            urde.exe urde.pdb hecl.exe hecl.pdb hecl-gui.exe hecl-gui.pdb visigen.exe visigen.pdb
 
       - name: Compress PDBs
         working-directory: ${{github.workspace}}/build/Binaries
@@ -260,14 +265,14 @@ jobs:
           (New-Object Net.WebClient).DownloadFile("https://axiodl.com/files/$Filename", "$TempDir\$Filename")
           7z x "-o$env:RUNNER_WORKSPACE" -aos "$TempDir\$Filename"
 
-      - name: Install Intel IPP
-        run: |
-          $TempDir = "$env:RUNNER_WORKSPACE\temp"
-          $Filename = "w_ipp_oneapi_p_${env:IPP_VERSION}_offline.exe"
-          New-Item -Path "$TempDir" -ItemType Directory -ea 0
-          (New-Object Net.WebClient).DownloadFile("https://registrationcenter-download.intel.com/akdlm/irc_nas/$Filename", "$TempDir\$Filename")
-          Start-Process "$TempDir\$Filename" -ArgumentList "--x --s --f $TempDir\ipp" -Wait
-          Start-Process "$TempDir\ipp\bootstrapper.exe" -ArgumentList "--eula accept -c --action install" -Wait
+#      - name: Install Intel IPP
+#        run: |
+#          $TempDir = "$env:RUNNER_WORKSPACE\temp"
+#          $Filename = "w_ipp_oneapi_p_${env:IPP_VERSION}_offline.exe"
+#          New-Item -Path "$TempDir" -ItemType Directory -ea 0
+#          (New-Object Net.WebClient).DownloadFile("https://registrationcenter-download.intel.com/akdlm/irc_nas/$Filename", "$TempDir\$Filename")
+#          Start-Process "$TempDir\$Filename" -ArgumentList "--x --s --f $TempDir\ipp" -Wait
+#          Start-Process "$TempDir\ipp\bootstrapper.exe" -ArgumentList "--eula accept -c --action install" -Wait
 
       - name: Install dependencies
         run: choco install ninja vulkan-sdk
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7df5ef986..7cbea5661 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,19 @@ if(MSVC)
       _SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
       _ENABLE_EXTENDED_ALIGNED_STORAGE=1 NOMINMAX=1)
   add_compile_options(/IGNORE:4221
-          "$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4018 /wd4800 /wd4005 /wd4311 /wd4068 /wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805>"
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4018>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4800>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4005>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4311>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4068>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4267>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4244>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4200>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4305>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4067>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4146>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4309>
+          $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4805>
           ${VS_OPTIONS})
 
   add_compile_options(
diff --git a/ci/upload-debug-linux.sh b/ci/upload-debug-linux.sh
index ea9629fc1..1d0f6d499 100755
--- a/ci/upload-debug-linux.sh
+++ b/ci/upload-debug-linux.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 cd build/Binaries
 for f in hecl hecl-gui urde visigen; do
-  objcopy --only-keep-debug $f $f.dbg
+  objcopy --only-keep-debug --compress-debug-sections=zlib $f $f.dbg
 done
 strip -S hecl hecl-gui urde visigen
 sentry-cli upload-dif --org axiodl --project urde {hecl,hecl-gui,urde,visigen}{,.dbg} --include-sources