fix bugs for Apple plugins. Framework and Library cannot be embeded. apple/unityplugins#20

botaohu · botaohu · commit 2ca8a90948f8 · 2023-11-10T15:17:27.000+08:00
and apple/unityplugins#6
diff --git a/Packages/com.apple.unityplugin.core/Editor/AppleFrameworkUtility.cs b/Packages/com.apple.unityplugin.core/Editor/AppleFrameworkUtility.cs
@@ -32,7 +32,9 @@ public static string GetPluginLibraryPathForBuildTarget(string libraryName, Buil
                     return string.Empty;
             }
 
-            string[] results = AssetDatabase.FindAssets(libraryName);
+            string libraryNameWithoutExtension = Path.GetFileNameWithoutExtension(libraryName);
+            string[] results = AssetDatabase.FindAssets(libraryNameWithoutExtension);
+
             foreach (string currGUID in results)
             {
                 string libraryPath = AssetDatabase.GUIDToAssetPath(currGUID);
@@ -136,7 +138,7 @@ public static void CopyAndEmbed(string source, BuildTarget buildTarget, string p
             {
                 var expectedInstallPath = source.Substring(source.LastIndexOf(searchString) + searchString.Length);
                 Debug.Log($"CopyAndEmbed - Expected install path for {frameworkName}: {expectedInstallPath}");
-                fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine("Frameworks", expectedInstallPath));
+                fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine(frameworkName.EndsWith(".a") ? "Libraries" : "Frameworks", expectedInstallPath));
                 if (string.IsNullOrEmpty(fileGuid))
                 {
                     fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine("Libraries", expectedInstallPath));

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ public static string GetPluginLibraryPathForBuildTarget(string libraryName, Buil`
`32`	`32`	`return string.Empty;`
`33`	`33`	`}`
`34`	`34`
`35`		`- string[] results = AssetDatabase.FindAssets(libraryName);`
	`35`	`+ string libraryNameWithoutExtension = Path.GetFileNameWithoutExtension(libraryName);`
	`36`	`+ string[] results = AssetDatabase.FindAssets(libraryNameWithoutExtension);`
	`37`	`+`
`36`	`38`	`foreach (string currGUID in results)`
`37`	`39`	`{`
`38`	`40`	`string libraryPath = AssetDatabase.GUIDToAssetPath(currGUID);`
`@@ -136,7 +138,7 @@ public static void CopyAndEmbed(string source, BuildTarget buildTarget, string p`
`136`	`138`	`{`
`137`	`139`	`var expectedInstallPath = source.Substring(source.LastIndexOf(searchString) + searchString.Length);`
`138`	`140`	`Debug.Log($"CopyAndEmbed - Expected install path for {frameworkName}: {expectedInstallPath}");`
`139`		`- fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine("Frameworks", expectedInstallPath));`
	`141`	`+ fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine(frameworkName.EndsWith(".a") ? "Libraries" : "Frameworks", expectedInstallPath));`
`140`	`142`	`if (string.IsNullOrEmpty(fileGuid))`
`141`	`143`	`{`
`142`	`144`	`fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine("Libraries", expectedInstallPath));`