Merge pull request pythonnet#38 from tonyroberts/develop

tonyroberts · tonyroberts · commit 0ac66b315447 · 2014-04-10T11:48:27.000+01:00
embed Python.Runtime.dll in nPython fixes pythonnet#26
diff --git a/pythonnet/src/console/Console.csproj b/pythonnet/src/console/Console.csproj
@@ -192,6 +192,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="python-clear.ico" />
+    <EmbeddedResource Include="$(PythonBuildDir)\Python.Runtime.dll">
+        <LogicalName>Python.Runtime.dll</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/pythonnet/src/console/pythonconsole.cs b/pythonnet/src/console/pythonconsole.cs
@@ -8,6 +8,7 @@
 // ==========================================================================
 
 using System;
+using System.Reflection;
 using Python.Runtime;
 
 namespace Python.Runtime {
@@ -27,6 +28,30 @@ public static int Main(string[] args) {
         return i;
     }
 
-}
+    // Register a callback function to load embedded assmeblies.
+    // (Python.Runtime.dll is included as a resource)
+    private sealed class AssemblyLoader {
+        public AssemblyLoader() {
+            AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => {
+                String resourceName = new AssemblyName(args.Name).Name + ".dll";
+
+                // 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);
+                    }
+                }
+
+                return null;
+            };
+        }
+    };
+
+    private static AssemblyLoader assemblyLoader = new AssemblyLoader();
+
+};
+
 
 }
