Fix references to sentrysdk and libsentrysdk

limbonaut · limbonaut · commit feeb748ade65 · 2025-05-22T14:15:03.000+02:00
diff --git a/.github/actions/prepare-testing/action.yml b/.github/actions/prepare-testing/action.yml
@@ -26,7 +26,7 @@ runs:
     - name: Set up Godot
       shell: bash
       run: |
-        version=$(sed -n 's/compatibility_minimum = "\([^"]*\)"/\1-stable/p' project/addons/sentrysdk/bin/sentrysdk.gdextension)
+        version=$(sed -n 's/compatibility_minimum = "\([^"]*\)"/\1-stable/p' project/addons/sentry/bin/sentry.gdextension)
         if [[ "$RUNNER_OS" == "Windows" ]]; then
           suffix=win64.exe
         elif [[ "$RUNNER_OS" == "Linux" ]]; then
@@ -61,7 +61,7 @@ runs:
       # timeout-minutes: 5
       run: |
         scons project/addons/gdUnit4
-        chmod +x project/addons/sentrysdk/bin/{linux,macos}/crashpad_handler
+        chmod +x project/addons/sentry/bin/{linux,macos}/crashpad_handler
         echo "--- Rebuilding import cache.."
         ${GODOT} --headless --editor --path project/ --quit-after 2000 || true
         echo "--- Finished rebuilding import cache."
diff --git a/.github/workflows/build_gdextension.yml b/.github/workflows/build_gdextension.yml
@@ -5,15 +5,15 @@ on:
     inputs:
       ref:
         type: string
-        default: ''
-        description: 'The branch, tag or SHA to checkout (leave empty for event SHA)'
+        default: ""
+        description: "The branch, tag or SHA to checkout (leave empty for event SHA)"
 
   workflow_dispatch:
     inputs:
       ref:
         type: string
-        default: ''
-        description: 'The branch, tag or SHA to checkout (leave empty for event SHA)'
+        default: ""
+        description: "The branch, tag or SHA to checkout (leave empty for event SHA)"
 
 env:
   # Default SCons flags applied to each build.
@@ -118,8 +118,8 @@ jobs:
           BUILD_TYPE: ${{matrix.target == 'template_release' && 'release' || 'debug'}}
         shell: bash
         run: |
-          cd project/addons/sentrysdk/bin/linux/
-          lib=libsentrysdk.${{matrix.platform}}.${BUILD_TYPE}.${{matrix.arch}}.so
+          cd project/addons/sentry/bin/linux/
+          lib=libsentry.${{matrix.platform}}.${BUILD_TYPE}.${{matrix.arch}}.so
           objcopy --only-keep-debug ${lib} ${lib}.debug
           objcopy --add-gnu-debuglink ${lib}.debug ${lib}
           strip --strip-debug ${lib}
@@ -128,7 +128,7 @@ jobs:
         if: matrix.platform != 'web' # web is unsupported currently; it is used to test compilation with such platforms (ifdefs)
         uses: actions/upload-artifact@v4
         with:
-          name: libsentrysdk.${{matrix.platform}}.${{matrix.target}}.${{matrix.arch}}
+          name: libsentry.${{matrix.platform}}.${{matrix.target}}.${{matrix.arch}}
           path: |
             project/
             !project/addons/gdUnit4
@@ -143,5 +143,5 @@ jobs:
         uses: actions/upload-artifact/merge@v4
         with:
           name: sentry-godot-gdextension
-          pattern: libsentrysdk.*
+          pattern: libsentry.*
           delete-merged: true
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -60,34 +60,34 @@ jobs:
         run: |
           rcodesign sign --for-notarization \
             --p12-file ${{ env.APPLE_CERT_PATH }} --p12-password ${{ secrets.APPLE_CERT_PASSWORD }} \
-            artifact/addons/sentrysdk/bin/macos/libsentrysdk.macos.debug.framework/libsentrysdk.macos.debug
+            artifact/addons/sentry/bin/macos/libsentry.macos.debug.framework/libsentry.macos.debug
           rcodesign sign --for-notarization \
             --p12-file ${{ env.APPLE_CERT_PATH }} --p12-password ${{ secrets.APPLE_CERT_PASSWORD }} \
-            artifact/addons/sentrysdk/bin/macos/libsentrysdk.macos.release.framework/libsentrysdk.macos.release
+            artifact/addons/sentry/bin/macos/libsentry.macos.release.framework/libsentry.macos.release
           rcodesign sign --for-notarization \
             --p12-file ${{ env.APPLE_CERT_PATH }} --p12-password ${{ secrets.APPLE_CERT_PASSWORD }} \
-            artifact/addons/sentrysdk/bin/macos/crashpad_handler
+            artifact/addons/sentry/bin/macos/crashpad_handler
 
       - name: Notarize macOS binaries
         if: env.DO_CODESIGN == '1'
         run: |
-          zip libsentrysdk.macos.debug.zip artifact/addons/sentrysdk/bin/macos/libsentrysdk.macos.debug.framework/libsentrysdk.macos.debug
+          zip libsentry.macos.debug.zip artifact/addons/sentry/bin/macos/libsentry.macos.debug.framework/libsentry.macos.debug
           rcodesign notary-submit --wait --api-key-file ${{ env.APPLE_API_KEY_PATH }} \
-            libsentrysdk.macos.debug.zip
+            libsentry.macos.debug.zip
 
-          zip libsentrysdk.macos.release.zip artifact/addons/sentrysdk/bin/macos/libsentrysdk.macos.release.framework/libsentrysdk.macos.release
+          zip libsentry.macos.release.zip artifact/addons/sentry/bin/macos/libsentry.macos.release.framework/libsentry.macos.release
           rcodesign notary-submit --wait --api-key-file ${{ env.APPLE_API_KEY_PATH }} \
-            libsentrysdk.macos.release.zip
+            libsentry.macos.release.zip
 
-          zip crashpad_handler.zip artifact/addons/sentrysdk/bin/macos/crashpad_handler
+          zip crashpad_handler.zip artifact/addons/sentry/bin/macos/crashpad_handler
           rcodesign notary-submit --wait --api-key-file ${{ env.APPLE_API_KEY_PATH }} \
             crashpad_handler.zip
 
       - name: Prepare artifact
         shell: bash
         run: |
           # * Fix crashpad_handler permissions, workaround for https://github.com/actions/upload-artifact/issues/38
-          chmod +x artifact/addons/sentrysdk/bin/{linux,macos}/crashpad_handler
+          chmod +x artifact/addons/sentry/bin/{linux,macos}/crashpad_handler
           # * Create release archive
           version=$(grep 'VERSION =' SConstruct | cut -d '"' -f 2)
           git_short_sha=$(git rev-parse --short HEAD)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ brew install scons
     # run from the repository root dir
     scons target=editor debug_symbols=yes
     ```
-    The build process should produce a GDExtension library file for the ***editor target*** at `project/addons/sentrysdk/bin/...`.
+    The build process should produce a GDExtension library file for the ***editor target*** at `project/addons/sentry/bin/...`.
 
     To export a project in Godot that uses this extension, you'll also need the libraries for the export templates:
     ```bash
@@ -60,7 +60,7 @@ In the Godot editor, you can adjust the Sentry SDK settings by going to `Project
 - `src/` -- Godot extension source code
 - `modules/` -- various submodules, such as `godot-cpp` and other SDKs like `sentry-native`
 - `project/` -- example Godot project
-- `project/addons/sentrysdk/` -- where build artifacts are placed
+- `project/addons/sentry/` -- where build artifacts are placed
 - `project/test/` -- unit tests
 - `scripts/` -- various scripts used mostly for maintenance
 - `doc_classes/` -- built-in Godot documentation (class reference)
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ brew install scons
     # run from the repository root dir
     scons target=editor debug_symbols=yes
     ```
-    The build process should produce a GDExtension library file for the ***editor target*** at `project/addons/sentrysdk/bin/...`.
+    The build process should produce a GDExtension library file for the ***editor target*** at `project/addons/sentry/bin/...`.
 
     To export a project in Godot that uses this extension, you'll also need the libraries for the export templates:
     ```bash
diff --git a/src/sentry/native/native_sdk.cpp b/src/sentry/native/native_sdk.cpp
@@ -390,7 +390,7 @@ void NativeSDK::initialize() {
 	String exe_dir = OS::get_singleton()->get_executable_path().get_base_dir();
 	String handler_path = exe_dir.path_join(export_subdir).path_join(handler_fn);
 	if (!FileAccess::file_exists(handler_path)) {
-		const String addon_bin_dir = "res://addons/sentrysdk/bin/";
+		const String addon_bin_dir = "res://addons/sentry/bin/";
 		handler_path = ProjectSettings::get_singleton()->globalize_path(
 				addon_bin_dir.path_join(platform_dir).path_join(handler_fn));
 	}
diff --git a/src/sentry_sdk.cpp b/src/sentry_sdk.cpp
@@ -208,8 +208,8 @@ SentrySDK::SentrySDK() {
 	// Fix crashpad handler executable bit permissions on Unix platforms if the
 	// user extracts the distribution archive without preserving such permissions.
 	if (OS::get_singleton()->is_debug_build()) {
-		_fix_unix_executable_permissions("res://addons/sentrysdk/bin/macos/crashpad_handler");
-		_fix_unix_executable_permissions("res://addons/sentrysdk/bin/linux/crashpad_handler");
+		_fix_unix_executable_permissions("res://addons/sentry/bin/macos/crashpad_handler");
+		_fix_unix_executable_permissions("res://addons/sentry/bin/linux/crashpad_handler");
 	}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ void NativeSDK::initialize() {`
`390`	`390`	`String exe_dir = OS::get_singleton()->get_executable_path().get_base_dir();`
`391`	`391`	`String handler_path = exe_dir.path_join(export_subdir).path_join(handler_fn);`
`392`	`392`	`if (!FileAccess::file_exists(handler_path)) {`
`393`		`- const String addon_bin_dir = "res://addons/sentrysdk/bin/";`
	`393`	`+ const String addon_bin_dir = "res://addons/sentry/bin/";`
`394`	`394`	`handler_path = ProjectSettings::get_singleton()->globalize_path(`
`395`	`395`	`addon_bin_dir.path_join(platform_dir).path_join(handler_fn));`
`396`	`396`	`}`