- load IronPython.Stdlib.dll form / or /Bin

- update alpha to 2014.11.7
keepwn · Nov 7, 2014 · 85cbee2 · 85cbee2
1 parent f9fb085
commit 85cbee2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Source/Altman.Plugin/Mef/ImportPythonPlugins.cs b/Source/Altman.Plugin/Mef/ImportPythonPlugins.cs
@@ -58,7 +58,16 @@ public void Compose<T>(string pluginPath,string servicePath, T exportedValue)
 				// create python
 				var engine = Python.CreateEngine();
 				var path = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-				engine.Runtime.LoadAssembly(Assembly.LoadFrom(Path.Combine(path, "IronPython.Stdlib.dll")));
+				var dlla = Path.Combine(path, "IronPython.Stdlib.dll");
+				var dllb = Path.Combine(path, "Bin", "IronPython.Stdlib.dll");
+				if (File.Exists(dlla))
+				{
+					engine.Runtime.LoadAssembly(Assembly.LoadFrom(dlla));
+				}
+				else if (File.Exists(dllb))
+				{
+					engine.Runtime.LoadAssembly(Assembly.LoadFrom(dllb));
+				}
 				//var paths = engine.GetSearchPaths();
 				//paths.Add(currentDir);
 				//engine.SetSearchPaths(paths);

diff --git a/Source/Altman/Forms/FormMain.UI.cs b/Source/Altman/Forms/FormMain.UI.cs
@@ -17,7 +17,7 @@ public void Init()
 			//this.ToolBar = GenerateToolBar();
 			this.Content = GenerateContent();
 
-			this.Title = AltStrRes.Title + " [alpha 2014.11.1]";
+			this.Title = AltStrRes.Title + " [alpha 2014.11.7]";
 			this.Style = "main";
 			this.Icon = Icons.AltmanIcon;
 			this.ClientSize = new Size(800, 500);