FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Unbundle pycxx by juliantaylor · Pull Request #108 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Unbundle pycxx #108

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
juliantaylor wants to merge 2 commits into from
Conversation 11 Commits 2 Checks 0 Files changed
Closed

Unbundle pycxx #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccf5282
move bundled PyCXX sources to external subfolder
juliantaylor May 7, 2011
3ba0216
allow to use system installed PyCXX sources
juliantaylor May 7, 2011
File filter

Filter by extension

Filter by extension .c  (3) .cxx  (9) .h  (1) .hxx  (28) .py  (1) All 5 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
0 CXX/Config.hxx → external/CXX/Config.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Exception.hxx → external/CXX/Exception.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Extensions.hxx → external/CXX/Extensions.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/IndirectPythonInterface.cxx → external/CXX/IndirectPythonInterface.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/IndirectPythonInterface.hxx → external/CXX/IndirectPythonInterface.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Objects.hxx → external/CXX/Objects.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/Config.hxx → external/CXX/Python2/Config.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/CxxDebug.hxx → external/CXX/Python2/CxxDebug.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/Exception.hxx → external/CXX/Python2/Exception.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/ExtensionModule.hxx → external/CXX/Python2/ExtensionModule.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/ExtensionOldType.hxx → external/CXX/Python2/ExtensionOldType.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/ExtensionType.hxx → external/CXX/Python2/ExtensionType.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/ExtensionTypeBase.hxx → external/CXX/Python2/ExtensionTypeBase.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/Extensions.hxx → external/CXX/Python2/Extensions.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/IndirectPythonInterface.cxx → ...l/CXX/Python2/IndirectPythonInterface.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/IndirectPythonInterface.hxx → ...l/CXX/Python2/IndirectPythonInterface.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/Objects.hxx → external/CXX/Python2/Objects.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/PythonType.hxx → external/CXX/Python2/PythonType.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/cxx_extensions.cxx → external/CXX/Python2/cxx_extensions.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/cxxextensions.c → external/CXX/Python2/cxxextensions.c
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python2/cxxsupport.cxx → external/CXX/Python2/cxxsupport.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/Config.hxx → external/CXX/Python3/Config.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/CxxDebug.hxx → external/CXX/Python3/CxxDebug.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/Exception.hxx → external/CXX/Python3/Exception.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/ExtensionModule.hxx → external/CXX/Python3/ExtensionModule.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/ExtensionOldType.hxx → external/CXX/Python3/ExtensionOldType.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/ExtensionType.hxx → external/CXX/Python3/ExtensionType.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/ExtensionTypeBase.hxx → external/CXX/Python3/ExtensionTypeBase.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/Extensions.hxx → external/CXX/Python3/Extensions.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/IndirectPythonInterface.cxx → ...l/CXX/Python3/IndirectPythonInterface.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/IndirectPythonInterface.hxx → ...l/CXX/Python3/IndirectPythonInterface.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/Objects.hxx → external/CXX/Python3/Objects.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/PythonType.hxx → external/CXX/Python3/PythonType.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/cxx_extensions.cxx → external/CXX/Python3/cxx_extensions.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/cxxextensions.c → external/CXX/Python3/cxxextensions.c
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Python3/cxxsupport.cxx → external/CXX/Python3/cxxsupport.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/Version.hxx → external/CXX/Version.hxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/WrapPython.h → external/CXX/WrapPython.h
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/cxx_extensions.cxx → external/CXX/cxx_extensions.cxx
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/cxxextensions.c → external/CXX/cxxextensions.c
Show comments
View file
Open in desktop
File renamed without changes.
0 CXX/cxxsupport.cxx → external/CXX/cxxsupport.cxx
Show comments
View file
Open in desktop
File renamed without changes.
65 changes: 36 additions & 29 deletions setupext.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,21 @@
('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
('PYCXX_ISO_CPP_LIB', '1')]

# list of search paths for the CXX headers and sources
# first folder where the files are found sets
# pycxx_inc_path, pycxx_sources and pycxx_headers
_pycxx_src_paths = ["external/"]
_pycxx_h_paths = ["external/"]
for s, h in zip(_pycxx_src_paths, _pycxx_h_paths):
if os.path.isdir(h) and os.path.isdir(s):
pycxx_sources = glob.glob(os.path.join(s, "CXX", "*.c"))
pycxx_sources.extend(glob.glob(os.path.join(s, "CXX", "*.cxx")))
pycxx_headers = glob.glob(os.path.join(h, "CXX", "*.h"))
pycxx_headers.extend(glob.glob(os.path.join(h, "CXX", "*.hxx")))
if len(pycxx_sources) > 0 and len(pycxx_headers) > 0:
pycxx_inc_path = h
break

setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
# Based on the contents of setup.cfg, determine the build options
if os.path.exists(setup_cfg):
Expand Down Expand Up @@ -1053,11 +1068,10 @@ def build_ft2font(ext_modules, packages):
global BUILT_FT2FONT
if BUILT_FT2FONT: return # only build it if you you haven't already
deps = ['src/ft2font.cpp', 'src/mplutils.cpp']
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

module = Extension('matplotlib.ft2font', deps,
define_macros=defines)
define_macros=defines, include_dirs=[pycxx_inc_path])
add_ft2font_flags(module)
ext_modules.append(module)
BUILT_FT2FONT = True
Expand All @@ -1080,12 +1094,12 @@ def build_gtkagg(ext_modules, packages):
global BUILT_GTKAGG
if BUILT_GTKAGG: return # only build it if you you haven't already
deps = ['src/agg_py_transforms.cpp', 'src/_gtkagg.cpp', 'src/mplutils.cpp']
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

module = Extension('matplotlib.backends._gtkagg',
deps,
define_macros=defines
define_macros=defines,
include_dirs=[pycxx_inc_path]
)

# add agg flags before pygtk because agg only supports freetype1
Expand All @@ -1103,12 +1117,12 @@ def build_tkagg(ext_modules, packages):
global BUILT_TKAGG
if BUILT_TKAGG: return # only build it if you you haven't already
deps = ['src/agg_py_transforms.cpp', 'src/_tkagg.cpp']
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

module = Extension('matplotlib.backends._tkagg',
deps,
define_macros=defines
define_macros=defines,
include_dirs=[pycxx_inc_path]
)

add_tk_flags(module) # do this first
Expand All @@ -1123,16 +1137,14 @@ def build_macosx(ext_modules, packages):
global BUILT_MACOSX
if BUILT_MACOSX: return # only build it if you you haven't already
deps = ['src/_macosx.m',
'CXX/cxx_extensions.cxx',
'CXX/cxxextensions.c',
'CXX/cxxsupport.cxx',
'CXX/IndirectPythonInterface.cxx',
'src/agg_py_transforms.cpp',
'src/path_cleanup.cpp']
deps.extend(pycxx_sources)
module = Extension('matplotlib.backends._macosx',
deps,
extra_link_args = ['-framework','Cocoa'],
define_macros=defines
define_macros=defines,
include_dirs=[pycxx_inc_path]
)
add_numpy_flags(module)
add_agg_flags(module)
Expand All @@ -1144,13 +1156,12 @@ def build_png(ext_modules, packages):
if BUILT_PNG: return # only build it if you you haven't already

deps = ['src/_png.cpp', 'src/mplutils.cpp']
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

module = Extension(
'matplotlib._png',
deps,
include_dirs=numpy_inc_dirs,
include_dirs=numpy_inc_dirs + [pycxx_inc_path],
define_macros=defines
)

Expand All @@ -1175,14 +1186,13 @@ def build_agg(ext_modules, packages):

deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)
temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
deps.append('src/backend_agg.cpp')
module = Extension(
'matplotlib.backends._backend_agg',
deps,
include_dirs=numpy_inc_dirs,
include_dirs=numpy_inc_dirs + [pycxx_inc_path],
define_macros=defines
)

Expand All @@ -1205,8 +1215,7 @@ def build_path(ext_modules, packages):
)

deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

temp_copy('src/_path.cpp', 'src/path.cpp')
deps.extend(['src/agg_py_transforms.cpp',
Expand All @@ -1215,7 +1224,7 @@ def build_path(ext_modules, packages):
module = Extension(
'matplotlib._path',
deps,
include_dirs=numpy_inc_dirs,
include_dirs=numpy_inc_dirs + [pycxx_inc_path],
define_macros=defines
)

Expand All @@ -1238,13 +1247,12 @@ def build_image(ext_modules, packages):
temp_copy('src/_image.cpp', 'src/image.cpp')
deps = ['src/image.cpp', 'src/mplutils.cpp']
deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

module = Extension(
'matplotlib._image',
deps,
include_dirs=numpy_inc_dirs,
include_dirs=numpy_inc_dirs + [pycxx_inc_path],
define_macros=defines
)

Expand Down Expand Up @@ -1334,11 +1342,10 @@ def build_tri(ext_modules, packages):
if BUILT_TRI: return # only build it if you you haven't already

deps = ['lib/matplotlib/tri/_tri.cpp', 'src/mplutils.cpp']
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
deps.extend(pycxx_sources)

module = Extension('matplotlib._tri', deps,
define_macros=defines)
define_macros=defines, include_dirs=[pycxx_inc_path])
add_numpy_flags(module)
add_base_flags(module)
ext_modules.append(module)
Expand Down
Back | FazBrowse Home | New Git URL