Skip to content

Use gcc on Linux, VS on Windows and CLang in other cases for geninterop #510

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 15 commits into from
Closed

Use gcc on Linux, VS on Windows and CLang in other cases for geninterop #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4c9ff8b
Update typemanager.cs
testrunner123 Jun 7, 2017
8d53035
Create AUTHORS.md
testrunner123 Jun 14, 2017
426f2d3
Create CHANGELOG.md
testrunner123 Jun 14, 2017
850cf13
Create test_subclass.py
testrunner123 Jun 14, 2017
30c7605
Create CHANGELOG.md
filmor Jun 14, 2017
90e0a6d
Merge branch 'master' into patch-1
filmor Jun 14, 2017
58a2546
Create basetsd.h
testrunner123 Jul 11, 2017
849bfe2
Update geninterop.py
testrunner123 Jul 11, 2017
2e87ba7
Update CHANGELOG.md
testrunner123 Jul 11, 2017
ba7485a
Merge branch 'master' into patch-1
filmor Jul 11, 2017
f7c08ca
Add traceback object to error information
testrunner123 Sep 18, 2017
a017255
restore
testrunner123 Sep 18, 2017
aaf8599
Merge branch 'master' into patch-1
filmor Sep 21, 2017
dfa6c11
Merge branch 'master' into patch-1
den-run-ai Nov 13, 2017
6b8504d
Merge branch 'master' into patch-1
filmor May 26, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
- Added keyword arguments based on C# syntax for calling CPython methods (#461)

### Changed
- geninterop.py uses MSVC on Windows, gcc on Linux and CLang in other cases

### Fixed

Expand Down
2 changes: 2 additions & 0 deletions tools/geninterop/fake_libc_include/basetsd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// for windows
#define __declspec(x)
32 changes: 23 additions & 9 deletions tools/geninterop/geninterop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,22 @@ def preprocess_python_headers():
include_dirs = [fake_libc_include]

include_py = sysconfig.get_config_var("INCLUDEPY")
if (not (include_py == None)) and sys.platform.startswith('win32'):
include_dirs.append("-I")
include_dirs.append(include_py)

defines = [
"-D", "__attribute__(x)=",
"-D", "__inline__=inline",
"-D", "__asm__=;#pragma asm",
"-D", "__int64=long long"
]

if sys.platform.startswith('win32'):
defines = [
"-D", "__cdecl=",
"-D", "__int64=long long"
]
else:
defines = [
"-D", "__attribute__(x)=",
"-D", "__inline__=inline",
"-D", "__asm__=;#pragma asm",
"-D", "__int64=long long"
]

if hasattr(sys, "abiflags"):
if "d" in sys.abiflags:
Expand All @@ -185,8 +193,14 @@ def preprocess_python_headers():
defines.extend(("-D", "PYTHON_WITH_WIDE_UNICODE"))

python_h = os.path.join(include_py, "Python.h")
cmd = ["clang", "-I"] + include_dirs + defines + ["-E", python_h]

if sys.platform.startswith('linux'):
compiler = "gcc"
elif sys.platform.startswith('win32'):
compiler = "cl.exe"
else:
compiler = "clang"
cmd = [compiler, "-I"] + include_dirs + defines + ["-E", python_h]

# normalize as the parser doesn't like windows line endings.
lines = []
for line in _check_output(cmd).splitlines():
Expand Down