Log message for revision 111646: Merged c111644 from 2.12 branch Changed: _U Zope/trunk/include/ U Zope/trunk/setup.py
-=- Property changes on: Zope/trunk/include ___________________________________________________________________ Modified: svn:externals - Acquisition svn://svn.zope.org/repos/main/Acquisition/tags/2.13.3/src/Acquisition ExtensionClass svn://svn.zope.org/repos/main/ExtensionClass/tags/2.13.1/src/ExtensionClass persistent svn://svn.zope.org/repos/main/ZODB/tags/3.9.5/src/persistent + Acquisition svn://svn.zope.org/repos/main/Acquisition/tags/2.13.3/src/Acquisition ExtensionClass svn://svn.zope.org/repos/main/ExtensionClass/tags/2.13.1/src/ExtensionClass Modified: Zope/trunk/setup.py =================================================================== --- Zope/trunk/setup.py 2010-04-30 16:44:55 UTC (rev 111645) +++ Zope/trunk/setup.py 2010-04-30 16:46:58 UTC (rev 111646) @@ -15,7 +15,6 @@ import os from setuptools import setup, find_packages, Extension -EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src'] setup(name='Zope2', version='2.13.0dev', @@ -36,17 +35,17 @@ # AccessControl Extension( name='AccessControl.cAccessControl', - include_dirs=EXTENSIONCLASS_INCLUDEDIRS, + include_dirs=['include', 'src'], sources=['src/AccessControl/cAccessControl.c'], depends=['include/ExtensionClass/ExtensionClass.h', - 'include/ExtensionClass/pickle/pickle.c', 'include/Acquisition/Acquisition.h']), # DocumentTemplate Extension( name='DocumentTemplate.cDocumentTemplate', - include_dirs=EXTENSIONCLASS_INCLUDEDIRS, - sources=['src/DocumentTemplate/cDocumentTemplate.c']), + include_dirs=['include', 'src'], + sources=['src/DocumentTemplate/cDocumentTemplate.c'], + depends=['include/ExtensionClass/ExtensionClass.h']), # indexes Extension( @@ -118,12 +117,12 @@ include_package_data=True, zip_safe=False, entry_points={ - 'console_scripts' : [ + 'console_scripts': [ 'mkzeoinstance=Zope2.utilities.mkzeoinstance:main', 'mkzopeinstance=Zope2.utilities.mkzopeinstance:main', 'runzope=Zope2.Startup.run:run', 'zopectl=Zope2.Startup.zopectl:run', 'zpasswd=Zope2.utilities.zpasswd:main', - ] + ], }, ) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins