Clean up

Try fix linux run

FIx execute permission for post build scripts

Test

Test

Format code

chore: update scripts/update-android-gradle-plugin.sh to 5.11.0 (#1078)

Co-authored-by: GitHub <[email protected]>

Test with larger runners

Revert test changes

Try without sentry init

Fix editor executable

Test

Test

Remove target name param

Test

Test

Try comment commandlet execution

Restore commandlet execution

Move commadlet to runtime module

Fix commandlet context

Test

Test

test

Revert "test"

This reverts commit a6f7d76.

Author: tustanivsky

CHANGELOG.md

@@ -2,9 +2,11 @@
 
 ## Unreleased
 
-### Features
+### Dependencies
 
-- Add commandlet for debug symbols upload ([#1076](https://github.com/getsentry/sentry-unreal/pull/1076))
+- Bump Android Gradle Plugin from v5.10.0 to v5.11.0 ([#1078](https://github.com/getsentry/sentry-unreal/pull/1078))
+  - [changelog](https://github.com/getsentry/sentry-android-gradle-plugin/blob/main/CHANGELOG.md#5110)
+  - [diff](https://github.com/getsentry/sentry-android-gradle-plugin/compare/5.10.0...5.11.0)
 
 ## 1.1.1
 

plugin-dev/Scripts/post-build-steps-linux.sh

@@ -1,24 +1,29 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 TARGET_PLATFORM="$1"
-TARGET_NAME="$2"
-TARGET_TYPE="$3"
-TARGET_CONFIGURATION="$4"
-PROJECT_FILE="$5"
-PLUGIN_DIR="$6"
-ENGINE_DIR="$7"
+TARGET_TYPE="$2"
+TARGET_CONFIGURATION="$3"
+PROJECT_FILE="$4"
+PLUGIN_DIR="$5"
+ENGINE_DIR="$6"
 
 # Grant execute permissions to sentry-cli binary (FAB version of the plugin doesn't preserve file permissions)
 if [ -f "$PLUGIN_DIR/Source/ThirdParty/CLI/sentry-cli-Linux-x86_64" ]; then
   chmod +x "$PLUGIN_DIR/Source/ThirdParty/CLI/sentry-cli-Linux-x86_64"
 fi
 
+# Skip commandlet execution for Editor target type
+if [ "$TARGET_TYPE" = "Editor" ]; then
+  echo "Skipping SentrySymbolUpload commandlet for Editor target type"
+  exit 0
+fi
+
 ENGINE_VERSION=$(grep -o '"EngineAssociation": *"[^"]*"' "$PROJECT_FILE" | cut -d'"' -f4)
 
 if [ "$(printf %.1s "$ENGINE_VERSION")" = "4" ]; then
-  EDITOR_EXE="$ENGINE_DIR/Binaries/Linux/UE4Editor"
+  EDITOR_EXE="$ENGINE_DIR/Binaries/Linux/UE4Editor-Cmd"
 else
-  EDITOR_EXE="$ENGINE_DIR/Binaries/Linux/UnrealEditor"
+  EDITOR_EXE="$ENGINE_DIR/Binaries/Linux/UnrealEditor-Cmd"
 fi
 
-"$EDITOR_EXE" "$PROJECT_FILE" -run=SentrySymbolUpload -target-platform="$TARGET_PLATFORM" -target-name="$TARGET_NAME" -target-type="$TARGET_TYPE" -target-configuration="$TARGET_CONFIGURATION" -unattended -nopause -nullrhi
+"$EDITOR_EXE" "$PROJECT_FILE" -run=SentrySymbolUpload -target-platform="$TARGET_PLATFORM" -target-type="$TARGET_TYPE" -target-configuration="$TARGET_CONFIGURATION" -unattended -nopause -stdout -CrashForUAT

plugin-dev/Scripts/post-build-steps-mac.sh

@@ -1,12 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 TARGET_PLATFORM="$1"
-TARGET_NAME="$2"
-TARGET_TYPE="$3"
-TARGET_CONFIGURATION="$4"
-PROJECT_FILE="$5"
-PLUGIN_DIR="$6"
-ENGINE_DIR="$7"
+TARGET_TYPE="$2"
+TARGET_CONFIGURATION="$3"
+PROJECT_FILE="$4"
+PLUGIN_DIR="$5"
+ENGINE_DIR="$6"
 
 # Copy sentry.dylib to plugin's Binaries\Mac dir if it doesn't exist there to ensure FAB version of the plugin works correctly - Epic obfuscates any extra binaries when pre-building the plugin
 if [ "$TARGET_PLATFORM" = "Mac" ] && [ ! -f "$PLUGIN_DIR/Binaries/Mac/sentry.dylib" ]; then
@@ -18,12 +17,18 @@ if [ -f "$PLUGIN_DIR/Source/ThirdParty/CLI/sentry-cli-Darwin-universal" ]; then
   chmod +x "$PLUGIN_DIR/Source/ThirdParty/CLI/sentry-cli-Darwin-universal"
 fi
 
+# Skip commandlet execution for Editor target type
+if [ "$TARGET_TYPE" = "Editor" ]; then
+  echo "Skipping SentrySymbolUpload commandlet for Editor target type"
+  exit 0
+fi
+
 ENGINE_VERSION=$(grep -o '"EngineAssociation": *"[^"]*"' "$PROJECT_FILE" | cut -d'"' -f4)
 
 if [[ "${ENGINE_VERSION:0:1}" == "4" ]]; then
-  EDITOR_EXE="$ENGINE_DIR/Binaries/Mac/UE4Editor"
+  EDITOR_EXE="$ENGINE_DIR/Binaries/Mac/UE4Editor-Cmd"
 else
-  EDITOR_EXE="$ENGINE_DIR/Binaries/Mac/UnrealEditor"
+  EDITOR_EXE="$ENGINE_DIR/Binaries/Mac/UnrealEditor-Cmd"
 fi
 
-"$EDITOR_EXE" "$PROJECT_FILE" -run=SentrySymbolUpload -target-platform="$TARGET_PLATFORM" -target-name="$TARGET_NAME" -target-type="$TARGET_TYPE" -target-configuration="$TARGET_CONFIGURATION" -unattended -nopause -nullrhi
+"$EDITOR_EXE" "$PROJECT_FILE" -run=SentrySymbolUpload -target-platform="$TARGET_PLATFORM" -target-type="$TARGET_TYPE" -target-configuration="$TARGET_CONFIGURATION" -unattended -nopause

plugin-dev/Scripts/post-build-steps-win.bat

@@ -1,13 +1,13 @@
 @echo off
+
 setlocal enabledelayedexpansion
 
 set "TARGET_PLATFORM=%~1"
-set "TARGET_NAME=%~2"
-set "TARGET_TYPE=%~3"
-set "TARGET_CONFIGURATION=%~4"
-set "PROJECT_FILE=%~5"
-set "PLUGIN_DIR=%~6"
-set "ENGINE_DIR=%~7"
+set "TARGET_TYPE=%~2"
+set "TARGET_CONFIGURATION=%~3"
+set "PROJECT_FILE=%~4"
+set "PLUGIN_DIR=%~5"
+set "ENGINE_DIR=%~6"
 
 :: Copy crashpad handler executable to plugin's Binaries\Linux dir if it doesn't exist there to enable cross-compilation for Linux on Windows with FAB version of the plugin
 set "CRASHPAD_HANDLER_LINUX=%PLUGIN_DIR%\Binaries\Linux\crashpad_handler"
@@ -21,11 +21,19 @@ if "%TARGET_PLATFORM%"=="Win64" (
   if not exist "%CRASHPAD_HANDLER_WIN%" (xcopy "%PLUGIN_DIR%\Source\ThirdParty\Win64\Crashpad\bin\*" "%PLUGIN_DIR%\Binaries\Win64\" /F /R /Y /I)
 )
 
+:: Skip commandlet execution for Editor target type
+if "%TARGET_TYPE%"=="Editor" (
+  echo Sentry: Automatic symbols upload is not required for Editor target. Skipping...
+  exit /B 0
+)
+
 for /f "tokens=2 delims=:, " %%i in ('type "%PROJECT_FILE%" ^| findstr /C:"EngineAssociation"') do set "ENGINE_VERSION=%%~i"
 set "ENGINE_VERSION=!ENGINE_VERSION:~0,1!"
 
 if "!ENGINE_VERSION!"=="4" (set "EDITOR_EXE=%ENGINE_DIR%\Binaries\Win64\UE4Editor-Cmd.exe") else (set "EDITOR_EXE=%ENGINE_DIR%\Binaries\Win64\UnrealEditor-Cmd.exe")
 
-"!EDITOR_EXE!" "%PROJECT_FILE%" -run=SentrySymbolUpload -target-platform=%TARGET_PLATFORM% -target-name=%TARGET_NAME% -target-type=%TARGET_TYPE% -target-configuration=%TARGET_CONFIGURATION% -unattended -nopause -nullrhi
+"!EDITOR_EXE!" "%PROJECT_FILE%" -run=SentrySymbolUpload -target-platform=%TARGET_PLATFORM% -target-type=%TARGET_TYPE% -target-configuration=%TARGET_CONFIGURATION% -unattended -nopause
+
+endlocal
 
-endlocal
+exit /B 0