8000 Loader by filmor · Pull Request #1322 · pythonnet/pythonnet · GitHub
[go: up one dir, main page]
Skip to content

Loader #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Loader #1322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee00345
Add Python.Loader to adjust the Python.Runtime DLL on load
filmor Dec 10, 2020
956d77f
Drop old loaders
filmor Dec 12, 2020
b36b974
Add loader project to solution
filmor Dec 12, 2020
42b0cc4
First working version on Mono, Shutdown broken
filmor Dec 13, 2020
2ed1bb2
Adjust solution
filmor Dec 13, 2020
4d85d7d
Add pythonnet.util to setup.py
filmor Dec 13, 2020
d949d15
Only link and leak libpython on POSIX
filmor Dec 13, 2020
a29410e
Fix solution
8000 filmor Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Drop old loaders
  • Loading branch information
@filmor
filmor committed Dec 12, 2020
commit 956d77fcec2f03f14d32024c4aa7975407618630
51 changes: 1 addition & 50 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,54 +204,6 @@ def install_for_development(self):
)
]

if BUILD_NETFX:
dotnet_libs.extend(
[
DotnetLib(
"clrmodule-amd64",
"src/clrmodule/",
runtime="win-x64",
output="pythonnet/netfx/amd64",
rename={"clr.dll": "clr.pyd"},
),
DotnetLib(
"clrmodule-x86",
"src/clrmodule/",
runtime="win-x86",
output="pythonnet/netfx/x86",
rename={"clr.dll": "clr.pyd"},
),
]
)

ext_modules = []

if BUILD_MONO:
try:
mono_libs = check_output(
"pkg-config --libs mono-2", shell=True, encoding="utf8"
)
mono_cflags = check_output(
"pkg-config --cflags mono-2", shell=True, encoding="utf8"
)
cflags = mono_cflags.strip()
libs = mono_libs.strip()

# build the clr python module
clr_ext = Extension(
"pythonnet.mono.clr",
language="c++",
sources=["src/monoclr/clrmod.c"],
extra_compile_args=cflags.split(" "),
extra_link_args=libs.split(" "),
)
ext_modules.append(clr_ext)
except Exception:
print(
"Failed to find mono libraries via pkg-config, skipping the Mono CLR loader"
)


setup(
cmdclass=cmdclass,
name="pythonnet",
Expand All @@ -262,11 +214,10 @@ def install_for_development(self):
author="The Contributors of the Python.NET Project",
author_email="pythonnet@python.org",
packages=["pythonnet"],
install_requires=["pycparser"],
install_requires=["pycparser", "clr_loader"],
long_description=long_description,
# data_files=[("{install_platlib}", ["{build_lib}/pythonnet"])],
py_modules=["clr"],
ext_modules=ext_modules,
dotnet_libs=dotnet_libs,
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down
113 changes: 0 additions & 113 deletions src/clrmodule/ClrModule.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/clrmodule/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/clrmodule/clrmodule.csproj
View file
Open in desktop

This file was deleted.

Loading
0