[merge] merging commit from v1.1

This commit is contained in:
Al
2017-08-14 04:04:58 -06:00
parent bb277fb326
commit 448ca6a61a
10 changed files with 374 additions and 294 deletions

View File

@@ -2,9 +2,7 @@ import os
from setuptools import setup, Extension, find_packages
this_dir = os.path.dirname(__file__)
PROJECT_DIR = os.path.join(this_dir, os.pardir)
SRC_DIR = os.path.join(PROJECT_DIR, 'src')
RESOURCES_DIR = 'resources'
def main():
@@ -14,35 +12,29 @@ def main():
packages=find_packages(),
ext_modules=[
Extension('geodata.text._tokenize',
sources=[os.path.join(SRC_DIR, f)
for f in ('scanner.c',
'string_utils.c',
'tokens.c',
'utf8proc/utf8proc.c',
)
] + ['geodata/text/pytokenize.c'],
include_dirs=[PROJECT_DIR],
extra_compile_args=['-O0', '-std=gnu99',
sources=['geodata/text/pytokenize.c'],
libraries=['postal'],
include_dirs=['/usr/local/include'],
library_dirs=['/usr/local/lib'],
extra_compile_args=['-std=c99',
'-Wno-unused-function'],
),
Extension('geodata.text._normalize',
sources=[os.path.join(SRC_DIR, f)
for f in ('normalize.c',
'string_utils.c',
'utf8proc/utf8proc.c',
'tokens.c',
'unicode_scripts.c',
'transliterate.c',
'file_utils.c',
'trie.c',
'trie_search.c',)
] + ['geodata/text/pynormalize.c'],
include_dirs=[PROJECT_DIR],
extra_compile_args=['-std=gnu99', '-DHAVE_CONFIG_H',
'-DLIBPOSTAL_DATA_DIR="{}"'.format(os.getenv('LIBPOSTAL_DATA_DIR', os.path.realpath(os.path.join(PROJECT_DIR, 'data')))),
sources=['geodata/text/pynormalize.c'],
libraries=['postal'],
include_dirs=['/usr/local/include'],
library_dirs=['/usr/local/lib'],
extra_compile_args=['-std=c99',
'-Wno-unused-function'],
),
],
data_files=[
(os.path.join(RESOURCES_DIR, os.path.relpath(d, RESOURCES_DIR)), [os.path.join(d, filename) for filename in filenames])
for d, _, filenames in os.walk(RESOURCES_DIR)
],
package_data={
'geodata': ['**/*.sh']
},
include_package_data=True,
zip_safe=False,
url='http://mapzen.com',