Drop monoclr and clrmodule

pythonnet · filmor · Nov 9, 2019 · Nov 26, 2019 · Nov 26, 2019 · Nov 26, 2019
commit 5a45156cacd2871cd5ec522fa910f3211c1ea8b9
diff --git a/pythonnet.15.sln b/pythonnet.15.sln
@@ -6,8 +6,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Runtime.15", "src\ru
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.EmbeddingTest.15", "src\embed_tests\Python.EmbeddingTest.15.csproj", "{66B8D01A-9906-452A-B09E-BF75EA76468F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clrmodule.15", "src\clrmodule\clrmodule.15.csproj", "{E08678D4-9A52-4AD5-B63D-8EBC7399981B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console.15", "src\console\Console.15.csproj", "{CDAD305F-8E72-492C-A314-64CF58D472A0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Test.15", "src\testing\Python.Test.15.csproj", "{F94B547A-E97E-4500-8D53-B4D64D076E5F}"

diff --git a/pythonnet.sln b/pythonnet.sln
@@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clrmodule", "src\clrmodule\clrmodule.csproj", "{86E834DE-1139-4511-96CC-69636A56E7AC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		DebugMono|x64 = DebugMono|x64

diff --git a/setup.py b/setup.py
@@ -167,23 +167,6 @@ def _get_interop_filename():
     return os.path.join("src", "runtime", interop_filename)
 
 
-def _get_source_files():
-    """Walk project and collect the files needed for ext_module"""
-    for ext in (".sln",):
-        for path in glob.glob("*" + ext):
-            yield path
-
-    for root, dirnames, filenames in os.walk("src"):
-        for ext in (".cs", ".csproj", ".snk", ".config", ".py", ".c", ".h", ".ico"):
-            for filename in fnmatch.filter(filenames, "*" + ext):
-                yield os.path.join(root, filename)
-
-    for root, dirnames, filenames in os.walk("tools"):
-        for ext in (".exe", ".py", ".c", ".h"):
-            for filename in fnmatch.filter(filenames, "*" + ext):
-                yield os.path.join(root, filename)
-
-
 def _get_long_description():
     """Helper to populate long_description for pypi releases"""
     return open("README.rst").read()
@@ -362,8 +345,6 @@ def build_extension(self, ext):
                 ),
                 shell=use_shell,
             )
-        if DEVTOOLS == "Mono" or DEVTOOLS == "dotnet":
-            self._build_monoclr()
 
     def _get_manifest(self, build_dir):
         if DEVTOOLS != "MsDev" and DEVTOOLS != "MsDev15":
@@ -379,30 +360,6 @@ def _get_manifest(self, build_dir):
         subprocess.check_call(" ".join(cmd), shell=False)
         return manifest
 
-    def _build_monoclr(self):
-        try:
-            mono_libs = _check_output("pkg-config --libs mono-2", shell=True)
-        except:
-            if DEVTOOLS == "dotnet":
-                print("Skipping building monoclr module...")
-                return
-            raise
-        mono_cflags = _check_output("pkg-config --cflags mono-2", shell=True)
-        glib_libs = _check_output("pkg-config --libs glib-2.0", shell=True)
-        glib_cflags = _check_output("pkg-config --cflags glib-2.0", shell=True)
-        cflags = mono_cflags.strip() + " " + glib_cflags.strip()
-        libs = mono_libs.strip() + " " + glib_libs.strip()
-
-        # build the clr python module
-        clr_ext = Extension(
-            "clr",
-            sources=["src/monoclr/pynetinit.c", "src/monoclr/clrmod.c"],
-            extra_compile_args=cflags.split(" "),
-            extra_link_args=libs.split(" "),
-        )
-
-        build_ext.build_ext.build_extension(self, clr_ext)
-
     def _install_packages(self):
         """install packages using nuget"""
         use_shell = DEVTOOLS == "Mono" or DEVTOOLS == "dotnet"
@@ -643,6 +600,7 @@ def run(self):
     author="The Python for .Net developers",
     author_email="pythondotnet@python.org",
     setup_requires=setup_requires,
+    install_requires=["clr_loader"],
     long_description=_get_long_description(),
     ext_modules=[Extension("clr", sources=list(_get_source_files()))],
     data_files=[("{install_platlib}", ["{build_lib}/Python.Runtime.dll"])],

diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs
diff --git a/src/clrmodule/Properties/AssemblyInfo.cs b/src/clrmodule/Properties/AssemblyInfo.cs
diff --git a/src/clrmodule/clrmodule.15.csproj b/src/clrmodule/clrmodule.15.csproj