diff --git a/Packages/UIParticle/Scripts/Editor/AsmdefEx.cs b/Packages/UIParticle/Scripts/Editor/AsmdefEx.cs deleted file mode 100644 index 1146492..0000000 --- a/Packages/UIParticle/Scripts/Editor/AsmdefEx.cs +++ /dev/null @@ -1,510 +0,0 @@ -#if UNITY_EDITOR -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text.RegularExpressions; -using UnityEditor; -using UnityEngine; -using UnityEditor.Compilation; - -namespace __GENARATED_ASMDEF__.Coffee.UIParticle.Editor -{ - internal static class PackageSettings - { - public const string PackageId = "OpenSesame.Net.Compilers.3.4.0-beta.1"; - } - - internal static class ReflectionExtensions - { - const BindingFlags FLAGS = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; - - static object Inst(this object self) - { - return (self is Type) ? null : self; - } - - static Type Type(this object self) - { - return (self as Type) ?? self.GetType(); - } - - public static object New(this Type self, params object[] args) - { - var types = args.Select(x => x.GetType()).ToArray(); - return self.Type().GetConstructor(types) - .Invoke(args); - } - - public static object Call(this object self, string methodName, params object[] args) - { - var types = args.Select(x => x.GetType()).ToArray(); - return self.Type().GetMethod(methodName, types) - .Invoke(self.Inst(), args); - } - - public static object Call(this object self, Type[] genericTypes, string methodName, params object[] args) - { - return self.Type().GetMethod(methodName, FLAGS) - .MakeGenericMethod(genericTypes) - .Invoke(self.Inst(), args); - } - - public static object Get(this object self, string memberName, MemberInfo mi = null) - { - mi = mi ?? self.Type().GetMember(memberName, FLAGS)[0]; - return mi is PropertyInfo - ? (mi as PropertyInfo).GetValue(self.Inst(), new object[0]) - : (mi as FieldInfo).GetValue(self.Inst()); - } - - public static void Set(this object self, string memberName, object value, MemberInfo mi = null) - { - mi = mi ?? self.Type().GetMember(memberName, FLAGS)[0]; - if (mi is PropertyInfo) - (mi as PropertyInfo).SetValue(self.Inst(), value, new object[0]); - else - (mi as FieldInfo).SetValue(self.Inst(), value); - } - } - - internal class Settings - { - public bool IgnoreAccessChecks; - public string ModifySymbols = ""; - public string CustomCompiler = ""; - - public bool SholdChangeCompilerProcess - { - get { return IgnoreAccessChecks || !string.IsNullOrEmpty(ModifySymbols) || !string.IsNullOrEmpty(CustomCompiler); } - } - - public bool UseCustomCompiler - { - get { return IgnoreAccessChecks || !string.IsNullOrEmpty(CustomCompiler); } - } - - public static Settings GetAtPath(string path) - { - var setting = new Settings(); - if (string.IsNullOrEmpty(path)) - return setting; - - // If input path is directory, find asmdef file. - if (Directory.Exists(path)) - path = Directory.GetFiles(path, "*.asmdef") - .Select(x => x.Replace(Environment.CurrentDirectory + Path.DirectorySeparatorChar, "")) - .FirstOrDefault(); - - // Not find asmdef file. - if (string.IsNullOrEmpty(path) || !File.Exists(path) || !File.Exists(path + ".meta")) - return setting; - - try - { - var json = AssetImporter.GetAtPath(path).userData; - GetSettingssFromJson(json, out setting.IgnoreAccessChecks, out setting.ModifySymbols, out setting.CustomCompiler); - } - catch - { - } - - return setting; - } - - public string ToJson() - { - return string.Format("{{" + - "\"IgnoreAccessChecks\":{0}," + - "\"ModifySymbols\":\"{1}\"," + - "\"CustomCompiler\":\"{2}\"" + - "}}", - IgnoreAccessChecks ? "true" : "false", - ModifySymbols ?? "", - CustomCompiler ?? "" - ); - } - - public static Settings CreateFromJson(string json = "") - { - var setting = new Settings(); - GetSettingssFromJson(json, out setting.IgnoreAccessChecks, out setting.ModifySymbols, out setting.CustomCompiler); - return setting; - } - - static void GetSettingssFromJson(string json, out bool ignoreAccessChecks, out string modifySymbols, out string customCompiler) - { - ignoreAccessChecks = false; - modifySymbols = ""; - customCompiler = ""; - if (string.IsNullOrEmpty(json)) - return; - - ignoreAccessChecks = Regex.Match(json, "\"IgnoreAccessChecks\":\\s*(true|false)").Groups[1].Value == "true"; - modifySymbols = Regex.Match(json, "\"ModifySymbols\":\\s*\"([^\"]*)\"").Groups[1].Value; - customCompiler = Regex.Match(json, "\"CustomCompiler\":\\s*\"([^\"]*)\"").Groups[1].Value; - } - } - - internal static class CustomCompiler - { - static string s_InstallPath; - const string k_LogHeader = "[CustomCompiler] "; - - static void Log(string format, params object[] args) - { - if (Core.LogEnabled) - UnityEngine.Debug.LogFormat(k_LogHeader + format, args); - } - - public static string GetInstalledPath(string packageId = "") - { - if (!string.IsNullOrEmpty(s_InstallPath) && File.Exists(s_InstallPath)) - return s_InstallPath; - - try - { - packageId = string.IsNullOrEmpty(packageId) ? PackageSettings.PackageId : packageId; - s_InstallPath = Install(packageId); - } - catch (Exception ex) - { - UnityEngine.Debug.LogException(new Exception(k_LogHeader + ex.Message, ex.InnerException)); - } - finally - { - EditorUtility.ClearProgressBar(); - } - - return s_InstallPath; - } - - static string Install(string packageId) - { - char sep = Path.DirectorySeparatorChar; - string url = "https://globalcdn.nuget.org/packages/" + packageId.ToLower() + ".nupkg"; - string downloadPath = ("Temp/" + Path.GetFileName(Path.GetTempFileName())).Replace('/', sep); - string installPath = ("Library/" + packageId).Replace('/', sep); - string cscToolExe = (installPath + "/tools/csc.exe").Replace('/', sep); - - // Custom compiler is already installed. - if (File.Exists(cscToolExe)) - { - Log("Custom compiler '{0}' is already installed at {1}", packageId, cscToolExe); - return cscToolExe; - } - - if (Directory.Exists(installPath)) - Directory.Delete(installPath, true); - - try - { - UnityEngine.Debug.LogFormat(k_LogHeader + "Install custom compiler '{0}'", packageId); - - // Download custom compiler package from nuget. - { - UnityEngine.Debug.LogFormat(k_LogHeader + "Download {0} from nuget: {1}", packageId, url); - EditorUtility.DisplayProgressBar("Custom Compiler Installer", string.Format("Download {0} from nuget", packageId), 0.2f); - - switch (Application.platform) - { - case RuntimePlatform.WindowsEditor: - ExecuteCommand("PowerShell.exe", string.Format("curl -O {0} {1}", downloadPath, url)); - break; - case RuntimePlatform.OSXEditor: - ExecuteCommand("curl", string.Format("-o {0} -L {1}", downloadPath, url)); - break; - case RuntimePlatform.LinuxEditor: - ExecuteCommand("wget", string.Format("-O {0} {1}", downloadPath, url)); - break; - } - } - - // Extract nuget package (unzip). - { - UnityEngine.Debug.LogFormat(k_LogHeader + "Extract {0} to {1} with 7z", downloadPath, installPath); - EditorUtility.DisplayProgressBar("Custom Compiler Installer", string.Format("Extract {0}", downloadPath), 0.4f); - - string appPath = EditorApplication.applicationContentsPath.Replace('/', sep); - string args = string.Format("x {0} -o{1}", downloadPath, installPath); - - switch (Application.platform) - { - case RuntimePlatform.WindowsEditor: - ExecuteCommand(appPath + "\\Tools\\7z.exe", args); - break; - case RuntimePlatform.OSXEditor: - case RuntimePlatform.LinuxEditor: - ExecuteCommand(appPath + "/Tools/7za", args); - break; - } - } - - UnityEngine.Debug.LogFormat(k_LogHeader + "Custom compiler '{0}' has been installed in {1}.", packageId, installPath); - } - catch - { - throw new Exception(string.Format("Custom compiler '{0}' installation failed.", packageId)); - } - finally - { - EditorUtility.ClearProgressBar(); - } - - if (File.Exists(cscToolExe)) - return cscToolExe; - - throw new FileNotFoundException(string.Format("Custom compiler '{0}' is not found at {1}", packageId, cscToolExe)); - } - - static void ExecuteCommand(string exe, string args) - { - UnityEngine.Debug.LogFormat(k_LogHeader + "Execute command: {0} {1}", exe, args); - - Process p = Process.Start(new ProcessStartInfo() - { - FileName = exe, - Arguments = args, - CreateNoWindow = true, - UseShellExecute = false, - RedirectStandardError = true, - }); - p.WaitForExit(); - - if (p.ExitCode != 0) - { - UnityEngine.Debug.LogErrorFormat(k_LogHeader + p.StandardError.ReadToEnd()); - throw new Exception(); - } - } - } - - [InitializeOnLoad] - internal static class Core - { - public static bool LogEnabled { get; private set; } - public static string k_LogHeader = "[AsmdefEx] "; - - static void Log(string format, params object[] args) - { - if (LogEnabled) - LogEx(format, args); - } - - public static void LogEx(string format, params object[] args) - { - UnityEngine.Debug.LogFormat(k_LogHeader + format, args); - } - - public static void Error(Exception e) - { - UnityEngine.Debug.LogException(new Exception(k_LogHeader + e.Message, e.InnerException)); - } - - public static object GetScriptAssembly(string assemblyName) - { - Type tEditorCompilationInterface = Type.GetType("UnityEditor.Scripting.ScriptCompilation.EditorCompilationInterface, UnityEditor"); - Type tCSharpLanguage = Type.GetType("UnityEditor.Scripting.Compilers.CSharpLanguage, UnityEditor"); - return tEditorCompilationInterface.Call(new[] {tCSharpLanguage}, "GetScriptAssemblyForLanguage", assemblyName); - } - - public static string[] ModifyDefines(IEnumerable defines, bool ignoreAccessChecks, string modifySymbols) - { - var symbols = modifySymbols.Split(';', ','); - var add = symbols.Where(x => 0 < x.Length && !x.StartsWith("!")); - var remove = symbols.Where(x => 1 < x.Length && x.StartsWith("!")).Select(x => x.Substring(1)); - return defines - .Union(add ?? Enumerable.Empty()) - .Except(remove ?? Enumerable.Empty()) - .Union(ignoreAccessChecks ? new[] {"IGNORE_ACCESS_CHECKS"} : Enumerable.Empty()) - .Union(new[] {"ASMDEF_EX"}) - .Distinct() - .ToArray(); - } - - public static void ModifyFiles(IEnumerable files, bool ignoreAccessChecks) - { - const string s_If = "#if IGNORE_ACCESS_CHECKS // [ASMDEFEX] DO NOT REMOVE THIS LINE MANUALLY."; - const string s_EndIf = "#endif // [ASMDEFEX] DO NOT REMOVE THIS LINE MANUALLY."; - - // Add #if and #endif to all source files. - foreach (var file in files) - { - var text = File.ReadAllText(file); - Log("ModifyFiles: {0} {1} {2}", file, ignoreAccessChecks, text.Contains(s_If)); - if (text.Contains(s_If) == ignoreAccessChecks) - continue; - - var m = Regex.Match(text, "[\r\n]+"); - if (!m.Success) - continue; - - var nl = m.Value; - if (ignoreAccessChecks) - { - text = s_If + nl + text + nl + s_EndIf; - } - else - { - text = text.Replace(s_If + nl, ""); - text = text.Replace(nl + s_EndIf, ""); - } - - Log("ModifyFiles: Write {0} {1} {2}", file, ignoreAccessChecks, text.Contains(s_If)); - File.WriteAllText(file, text); - } - } - - public static void ChangeCompilerProcess(object compiler, Settings setting) - { - Type tProgram = Type.GetType("UnityEditor.Utils.Program, UnityEditor"); - Type tScriptCompilerBase = Type.GetType("UnityEditor.Scripting.Compilers.ScriptCompilerBase, UnityEditor"); - FieldInfo fiProcess = tScriptCompilerBase.GetField("process", BindingFlags.NonPublic | BindingFlags.Instance); - - Log("Kill previous compiler process"); - var psi = compiler.Get("process", fiProcess).Call("GetProcessStartInfo") as ProcessStartInfo; - compiler.Call("Dispose"); - - // Convert response file for Mono to .Net. - // - Add preferreduilang option (en-US) - // - Change language version to 'latest' - // - Change 'debug' to 'debug:portable' - // - Change compiler switch prefix '-' to '/' - string responseFile = Regex.Replace(psi.Arguments, "^.*@(.+)$", "$1"); - bool isMono = compiler.GetType().Name == "MonoCSharpCompiler"; - var text = File.ReadAllText(responseFile); - text = Regex.Replace(text, "[\r\n]+", "\n"); - text = Regex.Replace(text, "^-", "/", RegexOptions.Multiline); - - // Modify scripting define symbols. - { - Log("Modify scripting define symbols: {0}", responseFile); - var defines = Regex.Matches(text, "^/define:(.*)$", RegexOptions.Multiline) - .Cast() - .Select(x => x.Groups[1].Value); - - text = Regex.Replace(text, "[\r\n]+/define:[^\r\n]+", ""); - foreach (var d in ModifyDefines(defines, setting.IgnoreAccessChecks, setting.ModifySymbols)) - { - text += "\n/define:" + d; - } - } - - // Add/remove '#if IGNORE_ACCESS_CHECKS' and '#endif' preprocessor. - var files = Regex.Matches(text, "^\"(.*)\"$", RegexOptions.Multiline) - .Cast() - .Select(x => x.Groups[1].Value) - .Where(x => Path.GetExtension(x) == ".cs") - .Where(x => Path.GetFileName(x) != "AsmdefEx.cs"); - ModifyFiles(files, setting.IgnoreAccessChecks); - - // To access to non-publics in other assemblies, use custom compiler instead of default csc. - if (setting.UseCustomCompiler) - { - text = Regex.Replace(text, "^/langversion:\\d+$", "/langversion:latest", RegexOptions.Multiline); - text = Regex.Replace(text, "^/debug$", "/debug:portable", RegexOptions.Multiline); - text += "\n/preferreduilang:en-US"; - - // Change exe file path. - var cscToolExe = CustomCompiler.GetInstalledPath(setting.CustomCompiler); - Log("Change csc tool exe to {0}", cscToolExe); - if (Application.platform == RuntimePlatform.WindowsEditor) - { - psi.FileName = Path.GetFullPath(cscToolExe); - psi.Arguments = "/shared /noconfig @" + responseFile; - } - else - { - psi.FileName = Path.Combine(EditorApplication.applicationContentsPath, "MonoBleedingEdge/bin/mono"); - psi.Arguments = cscToolExe + " /noconfig @" + responseFile; - } - } - // Revert prefix symbols for mono compiler - else if (isMono) - { - text = Regex.Replace(text, "^/", "-", RegexOptions.Multiline); - } - - text = Regex.Replace(text, "\n", System.Environment.NewLine); - File.WriteAllText(responseFile, text); - - Log("Restart compiler process: {0} {1}", psi.FileName, psi.Arguments); - var program = tProgram.New(psi); - program.Call("Start"); - compiler.Set("process", program, fiProcess); - } - - static void OnAssemblyCompilationStarted(string name) - { - try - { - string assemblyName = Path.GetFileNameWithoutExtension(name); - string assemblyFilename = assemblyName + ".dll"; - - if (assemblyName != typeof(Core).Assembly.GetName().Name) - return; - - Type tEditorCompilationInterface = Type.GetType("UnityEditor.Scripting.ScriptCompilation.EditorCompilationInterface, UnityEditor"); - var compilerTasks = tEditorCompilationInterface.Get("Instance").Get("compilationTask").Get("compilerTasks") as IDictionary; - var scriptAssembly = compilerTasks.Keys.Cast().FirstOrDefault(x => (x.Get("Filename") as string) == assemblyFilename); - - // Should change compiler process for the assembly? - var asmdefPath = CompilationPipeline.GetAssemblyDefinitionFilePathFromAssemblyName(assemblyName); - var setting = Settings.GetAtPath(asmdefPath); - if (!setting.SholdChangeCompilerProcess) - return; - - // Create new compiler to recompile. - Log("Assembly compilation started: {0} should be recompiled.", assemblyName); - Core.ChangeCompilerProcess(compilerTasks[scriptAssembly], setting); - } - catch (Exception e) - { - UnityEngine.Debug.LogException(new Exception(k_LogHeader + e.Message, e.InnerException)); - } - } - - static Core() - { - var assemblyName = typeof(Core).Assembly.GetName().Name; - if (assemblyName == "Coffee.AsmdefEx") - return; - - k_LogHeader = string.Format("[AsmdefEx ({0})] ", assemblyName); - LogEnabled = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup) - .Split(';', ',') - .Any(x => x == "ASMDEF_EX_LOG"); - - Log("Start watching assembly '{0}' compilation.", typeof(Core).Assembly.GetName().Name); - CompilationPipeline.assemblyCompilationStarted += OnAssemblyCompilationStarted; - } - } - -#if !ASMDEF_EX - [InitializeOnLoad] - internal class RecompileRequest - { - static RecompileRequest() - { - var assemblyName = typeof(RecompileRequest).Assembly.GetName().Name; - if (assemblyName == "Coffee.AsmdefEx") - return; - - // Should change compiler process for the assembly? - var asmdefPath = CompilationPipeline.GetAssemblyDefinitionFilePathFromAssemblyName(assemblyName); - var setting = Settings.GetAtPath(asmdefPath); - if (!setting.SholdChangeCompilerProcess) - return; - - if (Core.LogEnabled) - UnityEngine.Debug.LogFormat("Request to recompile: {0} ({1})", assemblyName, asmdefPath); - - AssetDatabase.ImportAsset(asmdefPath); - } - } -#endif -} -#endif diff --git a/Packages/UIParticle/Scripts/Editor/AsmdefEx.cs.meta b/Packages/UIParticle/Scripts/Editor/AsmdefEx.cs.meta deleted file mode 100644 index 3e8920f..0000000 --- a/Packages/UIParticle/Scripts/Editor/AsmdefEx.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0defeb6d13f61475eacce2b101cb2248 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/UIParticle/Scripts/Editor/Coffee.UIParticle.Editor.asmdef.meta b/Packages/UIParticle/Scripts/Editor/Coffee.UIParticle.Editor.asmdef.meta index 63d621d..46b5918 100644 --- a/Packages/UIParticle/Scripts/Editor/Coffee.UIParticle.Editor.asmdef.meta +++ b/Packages/UIParticle/Scripts/Editor/Coffee.UIParticle.Editor.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 69deabfe8eed7495886c9daa69c9826a AssemblyDefinitionImporter: externalObjects: {} - userData: '{"IgnoreAccessChecks":true,"ModifySymbols":""}' + userData: assetBundleName: assetBundleVariant: diff --git a/Packages/UIParticle/Scripts/Editor/UIParticleEditor.cs b/Packages/UIParticle/Scripts/Editor/UIParticleEditor.cs index 11e55e6..c3fdace 100644 --- a/Packages/UIParticle/Scripts/Editor/UIParticleEditor.cs +++ b/Packages/UIParticle/Scripts/Editor/UIParticleEditor.cs @@ -1,4 +1,3 @@ -#if IGNORE_ACCESS_CHECKS // [ASMDEFEX] DO NOT REMOVE THIS LINE MANUALLY. using UnityEditor; using UnityEditor.UI; using UnityEngine; @@ -300,4 +299,3 @@ void OnSceneGUI() } } } -#endif // [ASMDEFEX] DO NOT REMOVE THIS LINE MANUALLY. diff --git a/Packages/UIParticle/Scripts/Editor/UIParticleMenu.cs b/Packages/UIParticle/Scripts/Editor/UIParticleMenu.cs index 1a9ec9b..149167b 100644 --- a/Packages/UIParticle/Scripts/Editor/UIParticleMenu.cs +++ b/Packages/UIParticle/Scripts/Editor/UIParticleMenu.cs @@ -1,4 +1,3 @@ -#if IGNORE_ACCESS_CHECKS // [ASMDEFEX] DO NOT REMOVE THIS LINE MANUALLY. #if !UNITY_2019_1_OR_NEWER using System.IO; using System.Text.RegularExpressions; @@ -59,4 +58,3 @@ static void ImportSample() } } #endif -#endif // [ASMDEFEX] DO NOT REMOVE THIS LINE MANUALLY.