PHXH
/
hybridclr_unity
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] 修复不正确地从EditorUserBuildSettings.selectedBuildTargetGroup获得BuildGroupTarget的bug

main
walon 2023-09-05 16:47:28 +08:00
parent 9cf8f19517
commit 1eaaf44c97
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Editor/BuildProcessors/CheckSettings.cs
View File

@ -7,6 +7,7 @@ using UnityEditor;
using UnityEditor.Build; using UnityEditor.Build;
using UnityEditor.Build.Reporting; using UnityEditor.Build.Reporting;
using UnityEngine; using UnityEngine;
using static UnityEngine.GraphicsBuffer;
namespace HybridCLR.Editor.BuildProcessors namespace HybridCLR.Editor.BuildProcessors
{ {
@ -39,7 +40,7 @@ namespace HybridCLR.Editor.BuildProcessors
{ {
return; return;
} }
BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup; BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
ScriptingImplementation curScriptingImplementation = PlayerSettings.GetScriptingBackend(buildTargetGroup); ScriptingImplementation curScriptingImplementation = PlayerSettings.GetScriptingBackend(buildTargetGroup);
ScriptingImplementation targetScriptingImplementation = ScriptingImplementation.IL2CPP; ScriptingImplementation targetScriptingImplementation = ScriptingImplementation.IL2CPP;
if (curScriptingImplementation != targetScriptingImplementation) if (curScriptingImplementation != targetScriptingImplementation)

2
Editor/Commands/PrebuildCommand.cs
View File

@ -23,7 +23,7 @@ namespace HybridCLR.Editor.Commands
LinkGeneratorCommand.GenerateLinkXml(target); LinkGeneratorCommand.GenerateLinkXml(target);
// 生成裁剪后的aot dll // 生成裁剪后的aot dll
StripAOTDllCommand.GenerateStripedAOTDlls(target, EditorUserBuildSettings.selectedBuildTargetGroup); StripAOTDllCommand.GenerateStripedAOTDlls(target);
// 桥接函数生成依赖于AOT dll，必须保证已经build过，生成AOT dll // 桥接函数生成依赖于AOT dll，必须保证已经build过，生成AOT dll
MethodBridgeGeneratorCommand.GenerateMethodBridge(target); MethodBridgeGeneratorCommand.GenerateMethodBridge(target);

8
Editor/Commands/StripAOTDllCommand.cs
View File

@ -15,7 +15,7 @@ namespace HybridCLR.Editor.Commands
[MenuItem("HybridCLR/Generate/AOTDlls", priority = 105)] [MenuItem("HybridCLR/Generate/AOTDlls", priority = 105)]
public static void GenerateStripedAOTDlls() public static void GenerateStripedAOTDlls()
{ {
GenerateStripedAOTDlls(EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettings.selectedBuildTargetGroup); GenerateStripedAOTDlls(EditorUserBuildSettings.activeBuildTarget);
} }
private static string GetLocationPathName(string buildDir, BuildTarget target) private static string GetLocationPathName(string buildDir, BuildTarget target)
@ -32,7 +32,7 @@ namespace HybridCLR.Editor.Commands
} }
} }
public static void GenerateStripedAOTDlls(BuildTarget target, BuildTargetGroup group) public static void GenerateStripedAOTDlls(BuildTarget target)
{ {
string outputPath = $"{SettingsUtil.HybridCLRDataDir}/StrippedAOTDllsTempProj/{target}"; string outputPath = $"{SettingsUtil.HybridCLRDataDir}/StrippedAOTDllsTempProj/{target}";
BashUtil.RemoveDir(outputPath); BashUtil.RemoveDir(outputPath);
@ -81,7 +81,7 @@ namespace HybridCLR.Editor.Commands
locationPathName = GetLocationPathName(outputPath, target), locationPathName = GetLocationPathName(outputPath, target),
options = buildOptions, options = buildOptions,
target = target, target = target,
targetGroup = group, targetGroup = BuildPipeline.GetBuildTargetGroup(target),
}; };
var report = BuildPipeline.BuildPlayer(buildPlayerOptions); var report = BuildPipeline.BuildPlayer(buildPlayerOptions);
@ -115,7 +115,7 @@ namespace HybridCLR.Editor.Commands
{ {
throw new Exception("GenerateStripedAOTDlls failed"); throw new Exception("GenerateStripedAOTDlls failed");
} }
Debug.Log($"GenerateStripedAOTDlls target:{target} group:{group} path:{outputPath}"); Debug.Log($"GenerateStripedAOTDlls target:{target} path:{outputPath}");
} }
} }
} }