Compare commits

...

4 Commits

9 changed files with 40 additions and 27 deletions
+6 -1
View File
@@ -2,8 +2,13 @@
"versions": [
{
"unity_version":"2021",
"hybridclr" : { "branch":"v3.0.0"},
"hybridclr" : { "branch":"v3.0.2"},
"il2cpp_plus": { "branch":"v2021-3.0.0"}
},
{
"unity_version":"2022",
"hybridclr" : { "branch":"v3.0.2"},
"il2cpp_plus": { "branch":"v2022-3.0.0"}
}
]
}
+13 -3
View File
@@ -12,13 +12,17 @@ namespace HybridCLR.Editor.Commands
{
public class CompileDllCommand
{
public static void CompileDll(string buildDir, BuildTarget target)
public static void CompileDll(string buildDir, BuildTarget target, bool developmentBuild)
{
var group = BuildPipeline.GetBuildTargetGroup(target);
ScriptCompilationSettings scriptCompilationSettings = new ScriptCompilationSettings();
scriptCompilationSettings.group = group;
scriptCompilationSettings.target = target;
if (developmentBuild)
{
scriptCompilationSettings.options |= ScriptCompilationOptions.DevelopmentBuild;
}
Directory.CreateDirectory(buildDir);
ScriptCompilationResult scriptCompilationResult = PlayerBuildInterface.CompilePlayerScripts(scriptCompilationSettings, buildDir);
foreach (var ass in scriptCompilationResult.assemblies)
@@ -28,9 +32,9 @@ namespace HybridCLR.Editor.Commands
Debug.Log("compile finish!!!");
}
public static void CompileDll(BuildTarget target)
public static void CompileDll(BuildTarget target, bool developmentBuild = false)
{
CompileDll(SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target), target);
CompileDll(SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target), target, developmentBuild);
}
[MenuItem("HybridCLR/CompileDll/ActiveBuildTarget", priority = 100)]
@@ -39,6 +43,12 @@ namespace HybridCLR.Editor.Commands
CompileDll(EditorUserBuildSettings.activeBuildTarget);
}
[MenuItem("HybridCLR/CompileDll/ActiveBuildTarget_Development", priority = 101)]
public static void CompileDllActiveBuildTargetDevelopment()
{
CompileDll(EditorUserBuildSettings.activeBuildTarget, true);
}
[MenuItem("HybridCLR/CompileDll/Win32", priority = 200)]
public static void CompileDllWin32()
{
-7
View File
@@ -12,13 +12,6 @@ namespace HybridCLR.Editor.Commands
{
public static class StripAOTDllCommand
{
[MenuItem("HybridCLR/CreateAOTDllSnapshot", priority = 201)]
public static void CreateAOTDllSnapshot()
{
BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
BashUtil.CopyDir(SettingsUtil.GetAssembliesPostIl2CppStripDir(target), SettingsUtil.GetAOTAssemblySnapshotDir(target), true);
}
[MenuItem("HybridCLR/Generate/AOTDlls", priority = 105)]
public static void GenerateStripedAOTDlls()
{
+2 -2
View File
@@ -103,7 +103,7 @@ namespace HybridCLR.Editor.Installer
switch(majorVersion)
{
case 2021: return $"2021.3.{min2021_3_CompatibleMinorVersion}";
case 2022: return $"2022.2.{min2022_3_CompatibleMinorVersion}";
case 2022: return $"2022.3.{min2022_3_CompatibleMinorVersion}";
default: throw new Exception($"not support version:{majorVersion}");
}
}
@@ -123,7 +123,7 @@ namespace HybridCLR.Editor.Installer
}
case 2022:
{
if (version.minor1 != 2)
if (version.minor1 != 3)
{
return false;
}
@@ -19,7 +19,6 @@ namespace HybridCLR.Editor
private SerializedProperty _hotUpdateDllCompileOutputRootDir;
private SerializedProperty _externalHotUpdateAssembliyDirs;
private SerializedProperty _strippedAOTDllOutputRootDir;
private SerializedProperty _strippedAOTDllSnapshotDir;
private SerializedProperty _patchAOTAssemblies;
private SerializedProperty _outputLinkFile;
private SerializedProperty _outputAOTGenericReferenceFile;
@@ -47,7 +46,6 @@ namespace HybridCLR.Editor
_hotUpdateDllCompileOutputRootDir = _serializedObject.FindProperty("hotUpdateDllCompileOutputRootDir");
_externalHotUpdateAssembliyDirs = _serializedObject.FindProperty("externalHotUpdateAssembliyDirs");
_strippedAOTDllOutputRootDir = _serializedObject.FindProperty("strippedAOTDllOutputRootDir");
_strippedAOTDllSnapshotDir = _serializedObject.FindProperty("strippedAOTDllSnapshotDir");
_patchAOTAssemblies = _serializedObject.FindProperty("patchAOTAssemblies");
_outputLinkFile = _serializedObject.FindProperty("outputLinkFile");
_outputAOTGenericReferenceFile = _serializedObject.FindProperty("outputAOTGenericReferenceFile");
@@ -136,7 +134,6 @@ namespace HybridCLR.Editor
EditorGUILayout.PropertyField(_hotUpdateDllCompileOutputRootDir);
EditorGUILayout.PropertyField(_externalHotUpdateAssembliyDirs);
EditorGUILayout.PropertyField(_strippedAOTDllOutputRootDir);
EditorGUILayout.PropertyField(_strippedAOTDllSnapshotDir);
EditorGUILayout.PropertyField(_patchAOTAssemblies);
EditorGUILayout.PropertyField(_outputLinkFile);
EditorGUILayout.PropertyField(_outputAOTGenericReferenceFile);
+2 -5
View File
@@ -32,11 +32,8 @@ namespace HybridCLR.Editor
[Header("外部热更新dll搜索路径")]
public string[] externalHotUpdateAssembliyDirs;
[Header("裁减后AOT dll的输出目录")]
public string strippedAOTDllOutputRootDir = "HybridCLRData/AOTDllOutput";
[Header("裁减后AOT dll的备份目录")]
public string strippedAOTDllSnapshotDir = "HybridCLRData/AOTDllSnapshot";
[Header("裁减后AOT dll输出根目录")]
public string strippedAOTDllOutputRootDir = "HybridCLRData/AssembliesPostIl2CppStrip";
[Header("补充元数据AOT dlls")]
public string[] patchAOTAssemblies;
-5
View File
@@ -55,11 +55,6 @@ namespace HybridCLR.Editor
return $"{AssembliesPostIl2CppStripDir}/{target}";
}
public static string GetAOTAssemblySnapshotDir(BuildTarget target)
{
return $"{HybridCLRSettings.Instance.strippedAOTDllSnapshotDir}/{target}";
}
class AssemblyDefinitionData
{
public string name;
+16
View File
@@ -1,5 +1,21 @@
# 发布日志
## 3.0.2
### 改动
- 移除 `HybridCLR/CreateAOTDllSnapshot`菜单
### 修复
- 修复Memory Profiler中创建内存快照时崩溃的bug
## 3.0.1
### 改动
- 支持2022.3.0
## 3.0.0
### 修复
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "com.code-philosophy.hybridclr",
"version": "3.0.0",
"version": "3.0.2",
"displayName": "HybridCLR",
"description": "HybridCLR is a fully featured, zero-cost, high-performance, low-memory solution for Unity's all-platform native c# hotupdate.",
"category": "Runtime",