Move interface to separate DLL for simpler dynamic loading

filmor · filmor · commit 908f0f09ba10 · 2019-12-16T23:13:19.000+01:00
diff --git a/Python.Runtime.Interfaces/ILibPython.cs b/Python.Runtime.Interfaces/ILibPython.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Collections.Generic;
 
-namespace Python.Runtime.Native
+namespace Python.Runtime.Interfaces
 {
     public interface ILibPython
     {
@@ -347,6 +347,7 @@ public interface ILibPython
         int Py_AddPendingCall(IntPtr func, IntPtr arg);
         int Py_MakePendingCalls();
 
-        int Py_NoSiteFlag { get; set; }
+        int GetPyNoSiteFlag();
+        void SetPyNoSiteFlag(int val);
     }
 }
diff --git a/Python.Runtime.Interfaces/Python.Runtime.Interfaces.csproj b/Python.Runtime.Interfaces/Python.Runtime.Interfaces.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/Python.Runtime.Native/AssemblyInfo.cs b/Python.Runtime.Native/AssemblyInfo.cs
diff --git a/Python.Runtime.Native/Python.Runtime.Native.csproj b/Python.Runtime.Native/Python.Runtime.Native.csproj
@@ -9,4 +9,8 @@
     <PackageReference Include="AdvancedDLSupport" Version="3.1.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Python.Runtime.Interfaces\Python.Runtime.Interfaces.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Python.Runtime/CustomMarshaler.cs b/Python.Runtime/CustomMarshaler.cs
@@ -218,7 +218,7 @@ public static ICustomMarshaler GetInstance(string cookie)
     internal class Utf8Marshaler : MarshalerBase
     {
         private static readonly MarshalerBase Instance = new Utf8Marshaler();
-        private static readonly Encoding PyEncoding = Encoding.UTF8;
+        private static new readonly Encoding PyEncoding = Encoding.UTF8;
 
         public override IntPtr MarshalManagedToNative(object managedObj)
         {
diff --git a/Python.Runtime/Python.Runtime.csproj b/Python.Runtime/Python.Runtime.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Python.Runtime.Native\Python.Runtime.Native.csproj" />
+    <ProjectReference Include="..\Python.Runtime.Interfaces\Python.Runtime.Interfaces.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Python.Runtime/runtime.cs b/Python.Runtime/runtime.cs
@@ -979,9 +979,9 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)
 
         internal static void SetNoSiteFlag()
         {
-            Py_NoSiteFlag = 1;
+            SetPyNoSiteFlag(1);
         }
 
-        static Native.ILibPython LibPython;
+        static Interfaces.ILibPython LibPython;
     }
 }
diff --git a/Python.Runtime/runtime_.cs b/Python.Runtime/runtime_.cs
@@ -213,9 +213,7 @@ partial class Runtime {
         internal static System.IntPtr PyMethod_Function(System.IntPtr ob) => LibPython.PyMethod_Function(ob);
         internal static System.Int32 Py_AddPendingCall(System.IntPtr func, System.IntPtr arg) => LibPython.Py_AddPendingCall(func, arg);
         internal static System.Int32 Py_MakePendingCalls() => LibPython.Py_MakePendingCalls();
-        internal static System.Int32 Py_NoSiteFlag {
-            get => LibPython.Py_NoSiteFlag;
-            set { LibPython.Py_NoSiteFlag = value; }
-        }
+        internal static System.Int32 GetPyNoSiteFlag() => LibPython.GetPyNoSiteFlag();
+        internal static void SetPyNoSiteFlag(System.Int32 val) => LibPython.SetPyNoSiteFlag(val);
     }
 }
diff --git a/Python.Runtime/runtime_.tt b/Python.Runtime/runtime_.tt
@@ -20,9 +20,9 @@ namespace Python.Runtime {
         return type.ToString();
     }
 
-    var path = $"{Directory.GetCurrentDirectory()}/Python.Runtime.Native/bin/Debug/netstandard2.0/Python.Runtime.Native.dll";
+    var path = $"{Directory.GetCurrentDirectory()}/Python.Runtime.Interfaces/bin/Debug/netstandard2.0/Python.Runtime.Interfaces.dll";
     var assembly = Assembly.LoadFile(path);
-    var type = assembly.GetType("Python.Runtime.Native.ILibPython");
+    var type = assembly.GetType("Python.Runtime.Interfaces.ILibPython");
     const BindingFlags flags = BindingFlags.Public | BindingFlags.FlattenHierarchy | BindingFlags.Instance;
     var methods = type.GetMethods(flags);
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`
`8`		`-namespace Python.Runtime.Native`
	`8`	`+namespace Python.Runtime.Interfaces`
`9`	`9`	`{`
`10`	`10`	`public interface ILibPython`
`11`	`11`	`{`
`@@ -347,6 +347,7 @@ public interface ILibPython`
`347`	`347`	`int Py_AddPendingCall(IntPtr func, IntPtr arg);`
`348`	`348`	`int Py_MakePendingCalls();`
`349`	`349`
`350`		`- int Py_NoSiteFlag { get; set; }`
	`350`	`+ int GetPyNoSiteFlag();`
	`351`	`+ void SetPyNoSiteFlag(int val);`
`351`	`352`	`}`
`352`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public static ICustomMarshaler GetInstance(string cookie)`
`218`	`218`	`internal class Utf8Marshaler : MarshalerBase`
`219`	`219`	`{`
`220`	`220`	`private static readonly MarshalerBase Instance = new Utf8Marshaler();`
`221`		`- private static readonly Encoding PyEncoding = Encoding.UTF8;`
	`221`	`+ private static new readonly Encoding PyEncoding = Encoding.UTF8;`
`222`	`222`
`223`	`223`	`public override IntPtr MarshalManagedToNative(object managedObj)`
`224`	`224`	`{`
Original file line number	Diff line number	Diff line change
`@@ -979,9 +979,9 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)`
`979`	`979`
`980`	`980`	`internal static void SetNoSiteFlag()`
`981`	`981`	`{`
`982`		`- Py_NoSiteFlag = 1;`
	`982`	`+ SetPyNoSiteFlag(1);`
`983`	`983`	`}`
`984`	`984`
`985`		`- static Native.ILibPython LibPython;`
	`985`	`+ static Interfaces.ILibPython LibPython;`
`986`	`986`	`}`
`987`	`987`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,7 @@ partial class Runtime {`
`213`	`213`	`internal static System.IntPtr PyMethod_Function(System.IntPtr ob) => LibPython.PyMethod_Function(ob);`
`214`	`214`	`internal static System.Int32 Py_AddPendingCall(System.IntPtr func, System.IntPtr arg) => LibPython.Py_AddPendingCall(func, arg);`
`215`	`215`	`internal static System.Int32 Py_MakePendingCalls() => LibPython.Py_MakePendingCalls();`
`216`		`- internal static System.Int32 Py_NoSiteFlag {`
`217`		`- get => LibPython.Py_NoSiteFlag;`
`218`		`- set { LibPython.Py_NoSiteFlag = value; }`
`219`		`- }`
	`216`	`+ internal static System.Int32 GetPyNoSiteFlag() => LibPython.GetPyNoSiteFlag();`
	`217`	`+ internal static void SetPyNoSiteFlag(System.Int32 val) => LibPython.SetPyNoSiteFlag(val);`
`220`	`218`	`}`
`221`	`219`	`}`