Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add: Sentry QT integration for windows OS #7205

Draft
wants to merge 39 commits into
base: development
Choose a base branch
from

Conversation

mehulmathur001
Copy link

Sentry QT integration for windows OS

@mehulmathur001 mehulmathur001 requested review from a team as code owners April 13, 2024 19:57
@add-deployment-links
Copy link

add-deployment-links bot commented Apr 13, 2024

Hey there! Thanks for helping Mudlet improve. 🌟

Test versions

You can directly test the changes here:

No need to install anything - just unzip and run.
Let us know if it works well, and if it doesn't, please give details.

@mehulmathur001 mehulmathur001 changed the title Sentry QT integration for windows OS add: Sentry QT integration for windows OS Apr 13, 2024
Copy link
Member

@SlySven SlySven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically you need the same sort of conditional inclusion as we've worked out for #7151 but extended to cover the Windows OS case as well...

@@ -202,6 +202,12 @@ git_submodule_init(
CHECK_FILE "3rdparty/edbee-lib/CMakeLists.txt" SUBMODULE_PATH
"3rdparty/edbee-lib" READABLE_NAME "edbee-lib editor widget")

if(APPLE OR WIN32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to import the sort of changes that were made for the MacOS one here (although we don't use CMake for Windows CI/CB builds currently. It also need to be made conditional on a USE_SENTRY like CMake variable - which is extended to both MacOs and Windows cases now I see.

Comment on lines +264 to +270
set(SENTRY_BACKEND "crashpad")
set(SENTRY_INTEGRATION_QT "ON")
set(SENTRY_INCLUDE_DIR "3rdparty/sentry-native/include")
set(SENTRY_LIBRARIES "3rdparty/sentry-native")

if(APPLE OR WIN32)
add_subdirectory(3rdparty/sentry-native)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like the MacOS PR these all need to be conditional on something like a USE_SENTRY CMake variable.

Comment on lines +449 to +451
if(APPLE OR WIN32)
find_package(sentry REQUIRED)
endif()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, conditional on using sentry.

@@ -557,6 +561,10 @@ if(USE_UPDATER)
target_compile_definitions(mudlet PRIVATE INCLUDE_UPDATER)
endif(USE_UPDATER)

if(APPLE OR WIN32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, conditional on using Sentry.

@@ -685,3 +693,36 @@ if(UNIX AND NOT APPLE)
WORLD_READ
WORLD_EXECUTE)
endif()

if(APPLE OR WIN32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And more stuff conditional on Sentry.

@mehulmathur001
Copy link
Author

Hi @SlySven, I'll copy the checks like we have for macOS here too. Currently I'm just trying to make the windows build pass somehow.

@mehulmathur001 mehulmathur001 marked this pull request as draft April 18, 2024 05:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants