iOS: native support #254
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| [submodule "src/sentry-dotnet"] | ||
| path = src/sentry-dotnet | ||
| url = https://github.com/getsentry/sentry-dotnet.git | ||
| [submodule "src/sentry-cocoa"] | ||
| path = src/sentry-cocoa | ||
| url = https://github.com/getsentry/sentry-cocoa |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| <Project InitialTargets="RestoreSubmodules"> | ||
| <!-- If sentry-dotnet is not found, restore git submodules --> | ||
| <Target Name="RestoreSubmodules" | ||
| Condition="!Exists('src/sentry-dotnet/src/Sentry/Sentry.csproj') | ||
| OR !Exists('src/sentry-cocoa/Sentry.xcodeproj')"> | ||
| <Message Importance="High" Text="Restoring git submodules."></Message> | ||
| <Exec Command="git submodule update --init --recursive"></Exec> | ||
| </Target> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| using System; | ||
| using Sentry.Extensibility; | ||
| using UnityEditor; | ||
| using UnityEditor.Callbacks; | ||
|
|
||
| namespace Sentry.Unity.Editor.iOS | ||
| { | ||
| public static class BuildPostProcess | ||
| { | ||
| [PostProcessBuild(1)] | ||
| public static void OnPostProcessBuild(BuildTarget target, string pathToProject) | ||
| { | ||
| if (target != BuildTarget.iOS) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var options = ScriptableSentryUnityOptions.LoadSentryUnityOptions(); | ||
| if (!options.ShouldInitializeSdk()) | ||
| { | ||
| return; | ||
| } | ||
bruno-garcia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if (!options!.IOSNativeSupportEnabled) | ||
| { | ||
| options.DiagnosticLogger?.LogDebug("iOS Native support disabled. Won't modify the xcode project"); | ||
| return; | ||
bruno-garcia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| try | ||
| { | ||
| using var sentryXcodeProject = SentryXcodeProject.Open(pathToProject, options); | ||
| sentryXcodeProject.AddSentryFramework(); | ||
| sentryXcodeProject.AddNativeOptions(); | ||
| sentryXcodeProject.AddSentryToMain(); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| options.DiagnosticLogger?.LogError("Failed to add Sentry to the xcode project", e); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Text.RegularExpressions; | ||
| using Sentry.Extensibility; | ||
|
|
||
| namespace Sentry.Unity.Editor.iOS | ||
| { | ||
| internal interface INativeMain | ||
| { | ||
| public void AddSentry(string pathToMain, IDiagnosticLogger? logger); | ||
| } | ||
|
|
||
| internal class NativeMain : INativeMain | ||
| { | ||
| private const string Include = @"#include <Sentry/Sentry.h> | ||
| #include ""SentryOptions.m"" | ||
| "; | ||
| private const string Init = @" | ||
| [SentrySDK startWithOptions:getSentryOptions()]; | ||
| "; | ||
|
|
||
| public void AddSentry(string pathToMain, IDiagnosticLogger? logger) | ||
| { | ||
| if (!File.Exists(pathToMain)) | ||
| { | ||
| throw new FileNotFoundException("Could not find main.", pathToMain); | ||
| } | ||
|
|
||
| var main = File.ReadAllText(pathToMain); | ||
| if (ContainsSentry(main, logger)) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var sentryMain = AddSentryToMain(main); | ||
| File.WriteAllText(pathToMain, sentryMain); | ||
|
There was a problem hiding this comment. There are 3 exit conditions before we add Sentry. It could be useful when troubleshooting to log Debug (or error on |
||
| } | ||
|
|
||
| internal bool ContainsSentry(string main, IDiagnosticLogger? logger) | ||
| { | ||
| if (main.Contains(Include)) | ||
| { | ||
| logger?.LogInfo("'main.mm' already contains Sentry."); | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| internal string AddSentryToMain(string main) | ||
| { | ||
| main = main.Insert(0, Include); | ||
|
|
||
| var initRegex = new Regex(@"int main\(int argc, char\* argv\[\]\)\s+{\s+@autoreleasepool\s+{"); | ||
| var match = initRegex.Match(main); | ||
| if (match.Success) | ||
| { | ||
| return main.Insert(match.Index + match.Length, Init); | ||
| } | ||
|
|
||
| throw new ArgumentException($"Failed to add Sentry to main.\n{main}", nameof(main)); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.