Skip to content

Fixes #24 (sluggish CompilerSettings window) #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veblush merged 1 commit into from
Feb 11, 2017
Merged

Fixes #24 (sluggish CompilerSettings window) #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions core/UnityPackage/Assets/Editor/CompilerSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public struct IncrementalCompilerSettings
private DateTime _icsLastWriteTime;
private IncrementalCompilerSettings _ics;

private string _version;
private Process icProcess;

[MenuItem("Assets/Open C# Compiler Settings...")]
public static void ShowWindow()
{
Expand Down Expand Up @@ -161,8 +164,13 @@ private void SaveUniversalCompilerSettings()

private string GetUniversalCompilerVersion()
{
if (_version != null) {
return _version;
}

var assemblyName = AssemblyName.GetAssemblyName("./Compiler/UniversalCompiler.exe");
return assemblyName != null ? assemblyName.Version.ToString() : "";
_version = assemblyName != null ? assemblyName.Version.ToString() : "";
return _version;
}

private void ShowUniversalCompilerClientLog()
Expand Down Expand Up @@ -326,14 +334,19 @@ private string GetIncrementalCompilerVersion()

private Process GetIncrementalCompilerProcess()
{
if (icProcess != null) {
return icProcess;
}

try
{
var processes = Process.GetProcessesByName("IncrementalCompiler");
foreach (var process in processes)
{
var dir = Directory.GetCurrentDirectory();
if (process.MainModule.FileName.StartsWith(dir))
return process;
icProcess = process;
return icProcess;
}
return null;
}
Expand Down