Skip to content

Commit dd8d812

Browse files
committed
[change] add UnityVersion.h.tpl and AssemblyManifest.cpp.tpl, Il2CppDefGenerator doesn't generates and override code file from same one
1 parent c19b345 commit dd8d812

4 files changed

Lines changed: 34 additions & 10 deletions

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#include "../Il2CppCompatibleDef.h"
2+
3+
namespace hybridclr
4+
{
5+
const char* g_placeHolderAssemblies[] =
6+
{
7+
//!!!{{PLACE_HOLDER
8+
9+
//!!!}}PLACE_HOLDER
10+
nullptr,
11+
};
12+
}

Data~/Templates/UnityVersion.h.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#pragma once
2+
3+
//!!!{{UNITY_VERSION
4+
5+
6+
//!!!}}UNITY_VERSION

Editor/Commands/Il2CppDefGeneratorCommand.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ public static void GenerateIl2CppDef()
2020
{
2121
UnityVersion = Application.unityVersion,
2222
HotUpdateAssemblies = SettingsUtil.HotUpdateAssemblyNamesIncludePreserved,
23-
OutputFile = $"{SettingsUtil.LocalIl2CppDir}/libil2cpp/hybridclr/generated/UnityVersion.h",
24-
OutputFile2 = $"{SettingsUtil.LocalIl2CppDir}/libil2cpp/hybridclr/generated/AssemblyManifest.cpp",
23+
UnityVersionTemplateFile = $"{SettingsUtil.TemplatePathInPackage}/UnityVersion.h.tpl",
24+
UnityVersionOutputFile = $"{SettingsUtil.LocalIl2CppDir}/libil2cpp/hybridclr/generated/UnityVersion.h",
25+
AssemblyManifestTemplateFile = $"{SettingsUtil.TemplatePathInPackage}/AssemblyManifest.cpp.tpl",
26+
AssemblyManifestOutputFile = $"{SettingsUtil.LocalIl2CppDir}/libil2cpp/hybridclr/generated/AssemblyManifest.cpp",
2527
EnableProfilerInReleaseBuild = HybridCLRSettings.Instance.enableProfilerInReleaseBuild,
2628
EnableStraceTraceInWebGLReleaseBuild = HybridCLRSettings.Instance.enableStraceTraceInWebGLReleaseBuild,
2729
};

Editor/Il2CppDef/Il2CppDefGenerator.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ public class Options
1717
{
1818
public List<string> HotUpdateAssemblies { get; set; }
1919

20-
public string OutputFile { get; set; }
20+
public string UnityVersionTemplateFile { get; set; }
2121

22-
public string OutputFile2 { get; set; }
22+
public string UnityVersionOutputFile { get; set; }
23+
24+
public string AssemblyManifestTemplateFile { get; set; }
25+
26+
public string AssemblyManifestOutputFile { get; set; }
2327

2428
public string UnityVersion { get; set; }
2529

@@ -45,7 +49,7 @@ public void Generate()
4549

4650
private void GenerateIl2CppConfig()
4751
{
48-
var frr = new FileRegionReplace(File.ReadAllText(_options.OutputFile));
52+
var frr = new FileRegionReplace(File.ReadAllText(_options.UnityVersionTemplateFile));
4953

5054
List<string> lines = new List<string>();
5155

@@ -93,13 +97,13 @@ private void GenerateIl2CppConfig()
9397

9498
frr.Replace("UNITY_VERSION", string.Join("\n", lines));
9599

96-
frr.Commit(_options.OutputFile);
97-
Debug.Log($"[HybridCLR.Editor.Il2CppDef.Generator] output:{_options.OutputFile}");
100+
frr.Commit(_options.UnityVersionOutputFile);
101+
Debug.Log($"[HybridCLR.Editor.Il2CppDef.Generator] output:{_options.UnityVersionOutputFile}");
98102
}
99103

100104
private void GeneratePlaceHolderAssemblies()
101105
{
102-
var frr = new FileRegionReplace(File.ReadAllText(_options.OutputFile2));
106+
var frr = new FileRegionReplace(File.ReadAllText(_options.AssemblyManifestTemplateFile));
103107

104108
List<string> lines = new List<string>();
105109

@@ -110,8 +114,8 @@ private void GeneratePlaceHolderAssemblies()
110114

111115
frr.Replace("PLACE_HOLDER", string.Join("\n", lines));
112116

113-
frr.Commit(_options.OutputFile2);
114-
Debug.Log($"[HybridCLR.Editor.Il2CppDef.Generator] output:{_options.OutputFile2}");
117+
frr.Commit(_options.AssemblyManifestOutputFile);
118+
Debug.Log($"[HybridCLR.Editor.Il2CppDef.Generator] output:{_options.AssemblyManifestOutputFile}");
115119
}
116120
}
117121
}

0 commit comments

Comments
 (0)