mirror of
https://github.com/msgpack/msgpack-python.git
synced 2025-10-19 20:03:16 +00:00
Merge extension module
There were `_packer.so` and `_unpacker.so`. But single module is simpler than double module. Merge extension module into single `_msgpack.so`.
This commit is contained in:
parent
91ec9e1daf
commit
f6f9597249
4 changed files with 10 additions and 15 deletions
5
Makefile
5
Makefile
|
@ -4,7 +4,7 @@ all: cython
|
|||
|
||||
.PHONY: cython
|
||||
cython:
|
||||
cython --cplus msgpack/*.pyx
|
||||
cython --cplus msgpack/_msgpack.pyx
|
||||
|
||||
.PHONY: test
|
||||
test:
|
||||
|
@ -18,8 +18,7 @@ serve-doc: all
|
|||
.PHONY: clean
|
||||
clean:
|
||||
rm -rf build
|
||||
rm -f msgpack/_packer.cpp
|
||||
rm -f msgpack/_unpacker.cpp
|
||||
rm -f msgpack/_msgpack.cpp
|
||||
rm -rf msgpack/__pycache__
|
||||
rm -rf test/__pycache__
|
||||
|
||||
|
|
|
@ -22,8 +22,7 @@ if os.environ.get('MSGPACK_PUREPYTHON'):
|
|||
from msgpack.fallback import Packer, unpackb, Unpacker
|
||||
else:
|
||||
try:
|
||||
from msgpack._packer import Packer
|
||||
from msgpack._unpacker import unpackb, Unpacker
|
||||
from msgpack._msgpack import Packer, unpackb, Unpacker
|
||||
except ImportError:
|
||||
from msgpack.fallback import Packer, unpackb, Unpacker
|
||||
|
||||
|
|
4
msgpack/_msgpack.pyx
Normal file
4
msgpack/_msgpack.pyx
Normal file
|
@ -0,0 +1,4 @@
|
|||
# coding: utf-8
|
||||
#cython: embedsignature=True, c_string_encoding=ascii
|
||||
include "_packer.pyx"
|
||||
include "_unpacker.pyx"
|
13
setup.py
13
setup.py
|
@ -68,8 +68,7 @@ if len(version) > 3 and version[3] != 'final':
|
|||
if have_cython:
|
||||
class Sdist(sdist):
|
||||
def __init__(self, *args, **kwargs):
|
||||
for src in glob('msgpack/*.pyx'):
|
||||
cythonize(src)
|
||||
cythonize('msgpack/_msgpack.pyx')
|
||||
sdist.__init__(self, *args, **kwargs)
|
||||
else:
|
||||
Sdist = sdist
|
||||
|
@ -85,14 +84,8 @@ else:
|
|||
|
||||
ext_modules = []
|
||||
if not hasattr(sys, 'pypy_version_info'):
|
||||
ext_modules.append(Extension('msgpack._packer',
|
||||
sources=['msgpack/_packer.cpp'],
|
||||
libraries=libraries,
|
||||
include_dirs=['.'],
|
||||
define_macros=macros,
|
||||
))
|
||||
ext_modules.append(Extension('msgpack._unpacker',
|
||||
sources=['msgpack/_unpacker.cpp'],
|
||||
ext_modules.append(Extension('msgpack._msgpack',
|
||||
sources=['msgpack/_msgpack.cpp'],
|
||||
libraries=libraries,
|
||||
include_dirs=['.'],
|
||||
define_macros=macros,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue