Simplify the Unity custom patch

BadSingleton · BadSingleton · commit 0d7498b75741 · 2021-01-26T13:19:02.000-05:00
Lay the burden to provide the library name and directory on the user.
A.K.A.: Improve portability.
diff --git a/src/runtime/platform/LibraryLoader.cs b/src/runtime/platform/LibraryLoader.cs
@@ -1,12 +1,13 @@
 using System;
 using System.ComponentModel;
+using System.IO;
 using System.Runtime.InteropServices;
 
 namespace Python.Runtime.Platform
 {
     interface ILibraryLoader
     {
-        IntPtr Load(string dllToLoad);
+        IntPtr Load(string dllToLoad, string directory = "");
 
         IntPtr GetFunction(IntPtr hModule, string procedureName);
 
@@ -47,9 +48,9 @@ class LinuxLoader : ILibraryLoader
         private static IntPtr RTLD_DEFAULT = IntPtr.Zero;
         private const string NativeDll = "libdl.so";
 
-        public IntPtr Load(string dllToLoad)
+        public IntPtr Load(string dllToLoad, string directory = "")
         {
-            var filename = $"lib{dllToLoad}.so";
+            var filename = $"{directory}lib{dllToLoad}.so";
             ClearError();
             var res = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
             if (res == IntPtr.Zero)
@@ -118,9 +119,9 @@ class DarwinLoader : ILibraryLoader
         private const string NativeDll = "/usr/lib/libSystem.dylib";
         private static IntPtr RTLD_DEFAULT = new IntPtr(-2);
 
-        public IntPtr Load(string dllToLoad)
+        public IntPtr Load(string dllToLoad, string directory = "")
         {
-            var filename = $"lib{dllToLoad}.dylib";
+            var filename = $"{directory}lib{dllToLoad}.dylib";
             ClearError();
             var res = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
             if (res == IntPtr.Zero)
@@ -187,8 +188,9 @@ class WindowsLoader : ILibraryLoader
         private const string NativeDll = "kernel32.dll";
 
 
-        public IntPtr Load(string dllToLoad)
+        public IntPtr Load(string dllToLoad, string directory = "")
         {
+            dllToLoad = Path.GetFullPath($"{directory}{dllToLoad}.dll");
             var res = WindowsLoader.LoadLibrary(dllToLoad);
             if (res == IntPtr.Zero)
                 throw new DllNotFoundException($"Could not load {dllToLoad}", new Win32Exception());
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -150,6 +150,17 @@ public static int RunSimpleString(string code)
             return Runtime.PyRun_SimpleString(code);
         }
 
+        static bool libraryLoaded = false;
+        public static void InitializeLibrary(string library, string directory)
+        {
+            if (!libraryLoaded)
+            {
+                var _loader = Python.Runtime.Platform.LibraryLoader.Get(Python.Runtime.Platform.NativeCodePageHelper.OperatingSystem);
+                _loader.Load(library, directory);
+                libraryLoaded = true;
+            }
+        }
+
         public static void Initialize()
         {
             Initialize(setSysArgv: true);
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -57,11 +57,7 @@ public class Runtime
 
         public static readonly string PythonDLL = _PythonDll;
 
-#if PYTHON_WITHOUT_ENABLE_SHARED && !NETSTANDARD
         internal const string _PythonDll = "__Internal";
-#else
-        internal const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
-#endif
 
         // set to true when python is finalizing
         internal static object IsFinalizingLock = new object();
