Implement backwards compatible loading for Windows

filmor · filmor · commit fbc03766f291 · 2020-09-24T13:47:21.000+02:00
diff --git a/clr.py b/clr.py
@@ -0,0 +1,23 @@
+"""
+Legacy Python.NET loader for backwards compatibility
+"""
+
+def _load():
+    import os, sys
+    import importlib.util as util
+
+    if sys.maxsize > 2 ** 32:
+        arch = "amd64"
+    else:
+        arch = "x86"
+
+    path = os.path.join(os.path.dirname(__file__), "pythonnet", "dlls", arch, "clr.pyd")
+    del sys.modules["clr"]
+
+    spec = util.spec_from_file_location("clr", path)
+    clr = util.module_from_spec(spec)
+    spec.loader.exec_module(clr)
+
+    sys.modules["clr"] = clr
+
+_load()
diff --git a/setup.py b/setup.py
@@ -120,7 +120,9 @@ def run(self):
                 _write_configure_props()
 
         for lib in dotnet_modules:
-            output = lib.args.pop("output")
+            output = os.path.join(self.build_lib, lib.args.pop("output"))
+            rename = lib.args.pop("rename", {})
+
             opts = sum(
                 [
                     ["--" + name.replace("_", "-"), value]
@@ -130,15 +132,30 @@ def run(self):
             )
 
             opts.extend(["--configuration", self.dotnet_config])
-            opts.extend(["--output", os.path.join(self.build_lib, output)])
+            opts.extend(["--output", output])
 
+            self.announce("Running dotnet build...", level=distutils.log.INFO)
             self.spawn(["dotnet", "build", lib.path] + opts)
 
-        self.distribution.ext_modules = other_modules
+            for k, v in rename.items():
+                source = os.path.join(output, k)
+                dest = os.path.join(output, v)
+
+                if os.path.isfile(source):
+                    try:
+                        os.remove(dest)
+                    except OSError:
+                        pass
 
-        super().run()
+                    self.move_file(src=source, dst=dest, level=distutils.log.INFO)
+                else:
+                    self.warn("Can't find file to rename: %s" % source)
 
-        self.distribution.ext_modules = orig_modules
+        if other_modules:
+            self.distribution.ext_modules = other_modules
+            super().run()
+            self.distribution.ext_modules = orig_modules
+        # If no modules need to be compiled, skip
 
 
 class bdist_wheel_patched(bdist_wheel):
@@ -159,12 +176,14 @@ def finalize_options(self):
         "src/clrmodule/",
         runtime="win-x64",
         output="pythonnet/dlls/amd64",
+        rename={"clr.dll": "clr.pyd"},
     ),
     DotnetLib(
         "clrmodule-x86",
         "src/clrmodule/",
         runtime="win-x86",
         output="pythonnet/dlls/x86",
+        rename={"clr.dll": "clr.pyd"},
     ),
 ]
 
@@ -186,9 +205,6 @@ def finalize_options(self):
     )
     ext_modules.append(clr_ext)
 except Exception:
-    import traceback
-
-    traceback.print_exc()
     print("Failed to find mono libraries via pkg-config, skipping the Mono CLR loader")
 
 
@@ -208,6 +224,7 @@ def finalize_options(self):
         "bdist_wheel": bdist_wheel_patched,
         "configure": Configure,
     },
+    py_modules=["clr"],
     ext_modules=ext_modules,
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/src/clrmodule/clrmodule.csproj b/src/clrmodule/clrmodule.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net472</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    <AssemblyName>clr</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
