Commit b55110e4 authored by Hanno Schlichting's avatar Hanno Schlichting

Merged c111644 from 2.12 branch

parent 9df11201
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
import os import os
from setuptools import setup, find_packages, Extension from setuptools import setup, find_packages, Extension
EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src']
setup(name='Zope2', setup(name='Zope2',
version='2.13.0dev', version='2.13.0dev',
...@@ -36,17 +35,17 @@ setup(name='Zope2', ...@@ -36,17 +35,17 @@ setup(name='Zope2',
# AccessControl # AccessControl
Extension( Extension(
name='AccessControl.cAccessControl', name='AccessControl.cAccessControl',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS, include_dirs=['include', 'src'],
sources=['src/AccessControl/cAccessControl.c'], sources=['src/AccessControl/cAccessControl.c'],
depends=['include/ExtensionClass/ExtensionClass.h', depends=['include/ExtensionClass/ExtensionClass.h',
'include/ExtensionClass/pickle/pickle.c',
'include/Acquisition/Acquisition.h']), 'include/Acquisition/Acquisition.h']),
# DocumentTemplate # DocumentTemplate
Extension( Extension(
name='DocumentTemplate.cDocumentTemplate', name='DocumentTemplate.cDocumentTemplate',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS, include_dirs=['include', 'src'],
sources=['src/DocumentTemplate/cDocumentTemplate.c']), sources=['src/DocumentTemplate/cDocumentTemplate.c'],
depends=['include/ExtensionClass/ExtensionClass.h']),
# indexes # indexes
Extension( Extension(
...@@ -118,12 +117,12 @@ setup(name='Zope2', ...@@ -118,12 +117,12 @@ setup(name='Zope2',
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
entry_points={ entry_points={
'console_scripts' : [ 'console_scripts': [
'mkzeoinstance=Zope2.utilities.mkzeoinstance:main', 'mkzeoinstance=Zope2.utilities.mkzeoinstance:main',
'mkzopeinstance=Zope2.utilities.mkzopeinstance:main', 'mkzopeinstance=Zope2.utilities.mkzopeinstance:main',
'runzope=Zope2.Startup.run:run', 'runzope=Zope2.Startup.run:run',
'zopectl=Zope2.Startup.zopectl:run', 'zopectl=Zope2.Startup.zopectl:run',
'zpasswd=Zope2.utilities.zpasswd:main', 'zpasswd=Zope2.utilities.zpasswd:main',
] ],
}, },
) )
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment