Skip to content

merge changes to get npython working again on windows #41

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
tonyroberts merged 5 commits into from
Apr 11, 2014
Merged

merge changes to get npython working again on windows #41

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10a2f8f
Reference the assembly loader in the Main method to stop it being opt…
tonyroberts Apr 10, 2014
2b11631
make sure the GIL is released in ThreadTest
tonyroberts Apr 11, 2014
dfdcfe7
Use the assembly short name to find the embedded Python.Runtime (othe…
tonyroberts Apr 11, 2014
b65fa30
Use Assembly.Load(Byte[]) instead of Assembly.LoadFrom.
tonyroberts Apr 11, 2014
56bebfa
add C:\Python to PATH
tonyroberts Apr 11, 2014
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
Next Next commit
Reference the assembly loader in the Main method to stop it being opt… 
…imized away, and don't reload assemblies once they're already loaded.
  • Loading branch information
@tonyroberts
tonyroberts committed Apr 11, 2014
commit 10a2f8f661bcf616bce5f132db8603dd4b235a13
16 changes: 15 additions & 1 deletion pythonnet/src/console/pythonconsole.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using System;
using System.Reflection;
using System.Collections.Generic;
using Python.Runtime;

namespace Python.Runtime {
Expand All @@ -19,6 +20,9 @@ private PythonConsole() {}

[STAThread]
public static int Main(string[] args) {
// reference the static assemblyLoader to stop it being optimized away
AssemblyLoader a = assemblyLoader;

string [] cmd = Environment.GetCommandLineArgs();
PythonEngine.Initialize();

Expand All @@ -31,16 +35,26 @@ public static int Main(string[] args) {
// Register a callback function to load embedded assmeblies.
// (Python.Runtime.dll is included as a resource)
private sealed class AssemblyLoader {
Dictionary<string, Assembly> loadedAssemblies;

public AssemblyLoader() {
loadedAssemblies = new Dictionary<string, Assembly>();

AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => {
String resourceName = new AssemblyName(args.Name).Name + ".dll";

if (loadedAssemblies.ContainsKey(resourceName)) {
return loadedAssemblies[resourceName];
}

// looks for the assembly from the resources and load it
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)) {
if (stream != null) {
Byte[] assemblyData = new Byte[stream.Length];
stream.Read(assemblyData, 0, assemblyData.Length);
return Assembly.Load(assemblyData);
Assembly assembly = Assembly.Load(assemblyData);
loadedAssemblies[resourceName] = assembly;
return assembly;
}
}

Expand Down