From bbbc00f204f77ca547340b010ec21662a62e3203 Mon Sep 17 00:00:00 2001 From: RogueAI42 Date: Sat, 17 Jun 2017 00:31:09 +1000 Subject: Fixed multiple compilations for the Python API Previously, only one assembly could be compiled per startup. You could compile all of your mods by restarting the game over and over, loading the previously compiled mods from the cache. Now, that's not necessary. Oh yeah, also, more bugs in the Linux "port". Yippee. Whoops. --- ShiftOS_TheReturn/PythonAPI.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ShiftOS_TheReturn') diff --git a/ShiftOS_TheReturn/PythonAPI.cs b/ShiftOS_TheReturn/PythonAPI.cs index 49baa04..cc3798c 100644 --- a/ShiftOS_TheReturn/PythonAPI.cs +++ b/ShiftOS_TheReturn/PythonAPI.cs @@ -167,11 +167,7 @@ namespace ShiftOS.Engine scopes = new Dictionary(); var resman = new System.Resources.ResourceManager("ShiftOS.Engine.Properties.Resources", typeof(Properties.Resources).Assembly); var provider = new CSharpCodeProvider(); - var parameters = new CompilerParameters(); - parameters.ReferencedAssemblies.AddRange(AppDomain.CurrentDomain.GetAssemblies().Select(f => f.Location).ToArray()); - parameters.ReferencedAssemblies.Add("Microsoft.CSharp.dll"); - parameters.GenerateInMemory = false; // We need to keep the temporary file around long enough to copy it to the cache. - parameters.GenerateExecutable = false; + var refs = AppDomain.CurrentDomain.GetAssemblies().Select(f => f.Location).Concat(new string[] { "Microsoft.CSharp.dll" }).ToArray(); var types = new List(); var sha = new SHA512Managed(); var oldcache = new Dictionary(); @@ -203,6 +199,7 @@ namespace ShiftOS.Engine { Console.WriteLine("[dev] Failed to execute Python script " + fname); Console.WriteLine(ex.ToString()); + continue; } if (oldcache.ContainsKey(fname)) { @@ -229,6 +226,10 @@ namespace ShiftOS.Engine int pos = 0; var entry = new AsmCacheEntry(); entry.checksum = checksum; + var parameters = new CompilerParameters(); + parameters.ReferencedAssemblies.AddRange(refs); + parameters.GenerateInMemory = false; // We need to keep the temporary file around long enough to copy it to the cache. + parameters.GenerateExecutable = false; try { while (pos < scriptlines.Length) @@ -264,7 +265,6 @@ namespace ShiftOS.Engine } types.AddRange(results.CompiledAssembly.GetTypes()); // We did it! entry.asms.Add(File.ReadAllBytes(results.PathToAssembly)); - File.Delete(results.PathToAssembly); pos++; // keep scanning the file for more classes } } -- cgit v1.2.3