Move files around, rename framework to netfx, add build script

Author: filmor

.gitignore

@@ -71,3 +71,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# Compiled DLLs
+clr_loader/ffi/dlls/*

build_netfx_loader.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+S=`dirname $0`
+P=netfx_loader/
+O=clr_loader/ffi/dlls/
+
+dotnet build $P -r win-x86 -o $O/x86
+dotnet build $P -r win-x64 -o $O/amd64

clr_loader/__init__.py

@@ -34,6 +34,7 @@ def get_function(self, name, func=None):
 
     def __getitem__(self, name):
         return self.get_function(name)
+
     def __repr__(self):
         return f"<Assembly {self._path} in {self._runtime}>"
 
@@ -45,6 +46,7 @@ def __init__(self, impl):
     @classmethod
     def get_mono(cls, domain=None):
         from .mono import Mono
+
         impl = Mono(domain=domain)
         return cls(impl)
 
@@ -56,10 +58,10 @@ def get_coreclr(cls, runtime_config, dotnet_root=None):
         return cls(impl)
 
     @classmethod
-    def get_framework(cls, name=None, config_file=None):
-        from .framework import Framework
+    def get_netfx(cls, name=None, config_file=None):
+        from .netfx import NetFx
 
-        impl = Framework(name=name, config_file=config_file)
+        impl = NetFx(name=name, config_file=config_file)
         return cls(impl)
 
     def get_assembly(self, path):

clr_loader/ffi/__init__.py

@@ -1,15 +1,16 @@
+import sys
 import os
 import shutil
 
 import cffi
 
-from . import coreclr, hostfxr, mono, framework
+from . import coreclr, hostfxr, mono, netfx
 
-__all__ = ["ffi", "load_coreclr", "load_hostfxr", "load_mono", "load_framework"]
+__all__ = ["ffi", "load_coreclr", "load_hostfxr", "load_mono", "load_netfx"]
 
 ffi = cffi.FFI()
 
-for cdef in coreclr.cdef + hostfxr.cdef + mono.cdef + framework.cdef:
+for cdef in coreclr.cdef + hostfxr.cdef + mono.cdef + netfx.cdef:
     ffi.cdef(cdef)
 
 
@@ -40,15 +41,22 @@ def load_mono(path=None, gc=None):
     return ffi.dlopen(path)
 
 
-def load_framework():
-    path = "netframework_loader/bin/x64/Debug/net472/ClrLoader.dll"
+def load_netfx():
+    if sys.platform != "win32":
+        raise RuntimeError(".NET Framework is only supported on Windows")
+
+    dirname = os.path.join(os.path.dirname(__file__), "dlls")
+    if sys.maxsize > 2 ** 32:
+        arch = "amd64"
+    else:
+        arch = "x86"
+    
+    path = os.path.join(dirname, arch, "ClrLoader.dll")
 
     return ffi.dlopen(path)
 
 
 def _get_dll_name(name):
-    import sys
-
     if sys.platform == "win32":
         return f"{name}.dll"
     elif sys.platform == "darwin":

clr_loader/ffi/coreclr.py

@@ -1,4 +1,5 @@
-cdef = ["""
+cdef = [
+    """
 __stdcall unsigned int coreclr_initialize(
     const char* exePath,
     const char* appDomainFriendlyName,
@@ -28,4 +29,5 @@
 );
 
 __stdcall int coreclr_shutdown(void* hostHandle, unsigned int domainId);
-"""]
+"""
+]

clr_loader/ffi/mono.py

@@ -21,4 +21,4 @@
 
 void* mono_object_unbox(MonoObject *object);
 """
-)
+)

clr_loader/ffi/framework.py renamed to clr_loader/ffi/netfx.py

@@ -45,8 +45,7 @@ class MethodDesc:
     def __init__(self, typename, function):
         self._desc = f"{typename}:{function}"
         self._ptr = _MONO.mono_method_desc_new(
-            self._desc.encode("utf8"),
-            1 # include_namespace
+            self._desc.encode("utf8"), 1  # include_namespace
         )
 
     def search(self, image):
@@ -56,10 +55,11 @@ def __del__(self):
         if _MONO:
             _MONO.mono_method_desc_free(self._ptr)
 
+
 class MonoMethod:
     def __init__(self, domain, ptr):
         self._ptr = ptr
-    
+
     def __call__(self, ptr, size):
         exception = ffi.new("MonoObject**")
         params = ffi.new("void*[2]")

clr_loader/mono.py

@@ -1,14 +1,14 @@
-from .ffi import ffi, load_framework
+from .ffi import ffi, load_netfx
 
 
 _FW = None
 
 
-class Framework:
+class NetFx:
     def __init__(self, name=None, config_file=None):
         global _FW
         if _FW is None:
-            _FW = load_framework()
+            _FW = load_netfx()
 
         self._domain = _FW.pyclr_create_appdomain(
             name or ffi.NULL, config_file or ffi.NULL
@@ -23,7 +23,7 @@ def get_callable(self, assembly_path, typename, function):
         )
 
         return func
-    
+
     def __del__(self):
         if self._domain and _FW:
             _FW.pyclr_close_appdomain(self._domain)

clr_loader/framework.py renamed to clr_loader/netfx.py

@@ -13,7 +13,6 @@ def __str__(self):
         else:
             return f"{hex(self.hresult)}"
 
-    
     def __repr__(self):
         return f"<ClrError {str(self)}>"