Fixes crash handler for jenkins builds. (HarbourMasters#1445)

* Fixes crash handler for jenkins builds. We must include the pdb in redistributables. * Properly selects PDB file path for inclusion Co-authored-by: Christopher Leggett <[email protected]>
sheryam · Sep 12, 2022 · a2d4f47 · a2d4f47
1 parent a9f3aed
commit a2d4f47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libultraship/libultraship/CrashHandler.cpp b/libultraship/libultraship/CrashHandler.cpp
@@ -293,7 +293,9 @@ static void printStack(CONTEXT* ctx) {
 
     process = GetCurrentProcess();
     thread = GetCurrentThread();
-    SymInitialize(process, nullptr, true);
+
+    SymSetOptions(SYMOPT_NO_IMAGE_SEARCH | SYMOPT_IGNORE_IMAGEDIR);
+    SymInitialize(process, "debug", true);
 
 
     constexpr DWORD machineType =

diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -1992,6 +1992,10 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS")
 INSTALL(TARGETS soh DESTINATION . COMPONENT ship)
 endif()
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+INSTALL(FILES $<TARGET_PDB_FILE:soh> DESTINATION ./debug COMPONENT ship)
+endif()
+
 find_program(CURL NAMES curl DOC "Path to the curl program.  Used to download files.")
 execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt OUTPUT_VARIABLE RESULT)
 
@@ -2015,7 +2019,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch")
 nx_generate_nacp(Ship.nacp
    NAME "Ship of Harkinian"
    AUTHOR "Harbour Masters"
-   VERSION "3.1.0"
+   VERSION "4.0.0"
 )
 
 nx_create_nro(soh