Skip to content

Commit 5a45156

Browse files
committed
Drop monoclr and clrmodule
1 parent 5f2e2e2 commit 5a45156

File tree

11 files changed

+1
-733
lines changed

11 files changed

+1
-733
lines changed

pythonnet.15.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Runtime.15", "src\ru
66
EndProject
77
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.EmbeddingTest.15", "src\embed_tests\Python.EmbeddingTest.15.csproj", "{66B8D01A-9906-452A-B09E-BF75EA76468F}"
88
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clrmodule.15", "src\clrmodule\clrmodule.15.csproj", "{E08678D4-9A52-4AD5-B63D-8EBC7399981B}"
10-
EndProject
119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console.15", "src\console\Console.15.csproj", "{CDAD305F-8E72-492C-A314-64CF58D472A0}"
1210
EndProject
1311
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Test.15", "src\testing\Python.Test.15.csproj", "{F94B547A-E97E-4500-8D53-B4D64D076E5F}"

pythonnet.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src
1010
EndProject
1111
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}"
1212
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clrmodule", "src\clrmodule\clrmodule.csproj", "{86E834DE-1139-4511-96CC-69636A56E7AC}"
14-
EndProject
1513
Global
1614
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1715
DebugMono|x64 = DebugMono|x64

setup.py

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -167,23 +167,6 @@ def _get_interop_filename():
167167
return os.path.join("src", "runtime", interop_filename)
168168

169169

170-
def _get_source_files():
171-
"""Walk project and collect the files needed for ext_module"""
172-
for ext in (".sln",):
173-
for path in glob.glob("*" + ext):
174-
yield path
175-
176-
for root, dirnames, filenames in os.walk("src"):
177-
for ext in (".cs", ".csproj", ".snk", ".config", ".py", ".c", ".h", ".ico"):
178-
for filename in fnmatch.filter(filenames, "*" + ext):
179-
yield os.path.join(root, filename)
180-
181-
for root, dirnames, filenames in os.walk("tools"):
182-
for ext in (".exe", ".py", ".c", ".h"):
183-
for filename in fnmatch.filter(filenames, "*" + ext):
184-
yield os.path.join(root, filename)
185-
186-
187170
def _get_long_description():
188171
"""Helper to populate long_description for pypi releases"""
189172
return open("README.rst").read()
@@ -362,8 +345,6 @@ def build_extension(self, ext):
362345
),
363346
shell=use_shell,
364347
)
365-
if DEVTOOLS == "Mono" or DEVTOOLS == "dotnet":
366-
self._build_monoclr()
367348

368349
def _get_manifest(self, build_dir):
369350
if DEVTOOLS != "MsDev" and DEVTOOLS != "MsDev15":
@@ -379,30 +360,6 @@ def _get_manifest(self, build_dir):
379360
subprocess.check_call(" ".join(cmd), shell=False)
380361
return manifest
381362

382-
def _build_monoclr(self):
383-
try:
384-
mono_libs = _check_output("pkg-config --libs mono-2", shell=True)
385-
except:
386-
if DEVTOOLS == "dotnet":
387-
print("Skipping building monoclr module...")
388-
return
389-
raise
390-
mono_cflags = _check_output("pkg-config --cflags mono-2", shell=True)
391-
glib_libs = _check_output("pkg-config --libs glib-2.0", shell=True)
392-
glib_cflags = _check_output("pkg-config --cflags glib-2.0", shell=True)
393-
cflags = mono_cflags.strip() + " " + glib_cflags.strip()
394-
libs = mono_libs.strip() + " " + glib_libs.strip()
395-
396-
# build the clr python module
397-
clr_ext = Extension(
398-
"clr",
399-
sources=["src/monoclr/pynetinit.c", "src/monoclr/clrmod.c"],
400-
extra_compile_args=cflags.split(" "),
401-
extra_link_args=libs.split(" "),
402-
)
403-
404-
build_ext.build_ext.build_extension(self, clr_ext)
405-
406363
def _install_packages(self):
407364
"""install packages using nuget"""
408365
use_shell = DEVTOOLS == "Mono" or DEVTOOLS == "dotnet"
@@ -643,6 +600,7 @@ def run(self):
643600
author="The Python for .Net developers",
644601
author_email="pythondotnet@python.org",
645602
setup_requires=setup_requires,
603+
install_requires=["clr_loader"],
646604
long_description=_get_long_description(),
647605
ext_modules=[Extension("clr", sources=list(_get_source_files()))],
648606
data_files=[("{install_platlib}", ["{build_lib}/Python.Runtime.dll"])],

src/clrmodule/ClrModule.cs

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/clrmodule/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/clrmodule/clrmodule.15.csproj

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy