LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added crashpad handler for macos

Browse source
This commit is contained in:
Igor Korsukov 2020-11-23 04:54:13 -08:00
parent d98bc4beb4
commit 968fa81d86
6 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/platform.cmake
View file

@ -5,7 +5,7 @@ if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
set(PLATFORM_IS_LINUX 1)
elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
set(PLATFORM_IS_OSX 1)
set(PLATFORM_IS_MACOS 1)
else()
message(FATAL_ERROR "Unknown platform")
endif()

2
framework/audio/CMakeLists.txt
View file

@ -32,7 +32,7 @@ elseif(PLATFORM_IS_LINUX)
${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/linuxaudiodriver.cpp
${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/linuxaudiodriver.h
)
elseif(PLATFORM_IS_OSX)
elseif(PLATFORM_IS_MACOS)
set(DRIVER_SRC
${CMAKE_CURRENT_LIST_DIR}/internal/platform/osx/osxaudiodriver.cpp
${CMAKE_CURRENT_LIST_DIR}/internal/platform/osx/osxaudiodriver.h

2
framework/midi/CMakeLists.txt
View file

@ -38,7 +38,7 @@ elseif(PLATFORM_IS_LINUX)
${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/alsamidiinport.cpp
${CMAKE_CURRENT_LIST_DIR}/internal/platform/lin/alsamidiinport.h
)
elseif(PLATFORM_IS_OSX)
elseif(PLATFORM_IS_MACOS)
set(DRIVER_SRC
${CMAKE_CURRENT_LIST_DIR}/internal/platform/osx/coremidioutport.cpp
${CMAKE_CURRENT_LIST_DIR}/internal/platform/osx/coremidioutport.h

11
framework/telemetry/CMakeLists.txt
View file

@ -86,13 +86,12 @@ endif(BUILD_CRASHPAD_CLIENT)
include(${PROJECT_SOURCE_DIR}/build/module.cmake)
# === Install crashpad handler ===
set(CRASHPAD_HANDLER_PATH )
set(CPAD_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}/crashpad_handler)
if (PLATFORM_IS_LINUX)
set(CRASHPAD_HANDLER_PATH crashpad_handler/linux/x86-64/crashpad_handler)
install(PROGRAMS ${CPAD_ROOT_PATH}/linux/x86-64/crashpad_handler DESTINATION bin)
elseif(PLATFORM_IS_WINDOWS)
set(CRASHPAD_HANDLER_PATH crashpad_handler/windows/x86-64/crashpad_handler.exe)
install(PROGRAMS ${CPAD_ROOT_PATH}/windows/x86-64/crashpad_handler.exe DESTINATION bin)
elseif(PLATFORM_IS_MACOS)
install(PROGRAMS ${CPAD_ROOT_PATH}/macos/x86-64/crashpad_handler DESTINATION ${Mscore_SHARE_NAME}Contents/MacOS)
endif()
if (CRASHPAD_HANDLER_PATH)
install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/${CRASHPAD_HANDLER_PATH} DESTINATION "bin")
endif(CRASHPAD_HANDLER_PATH)

BIN
framework/telemetry/crashpad_handler/macos/x86-64/crashpad_handler Executable file
View file

Binary file not shown.

4
framework/telemetry/telemetrysetup.cpp
View file

@ -91,8 +91,8 @@ void TelemetrySetup::onInit()
}
//! NOTE For test creating a dump
auto crash = []() { volatile int* a = (int*)(NULL); *a = 1; };
crash();
// auto crash = []() { volatile int* a = (int*)(NULL); *a = 1; };
// crash();
#else
LOGW() << "crash handling disabled";