[Checkins] SVN: Zope2.buildout/trunk/ Adjust paths to C headers and sources

Philipp von Weitershausen philikon at philikon.de
Sun Jun 3 12:21:12 EDT 2007


Log message for revision 76255:
  Adjust paths to C headers and sources
  Need cPersistent.h header from persistent package (ZODB)
  Some long deprecated Zope 3 packages are gone now, therefore can't depend on them
  

Changed:
  _U  Zope2.buildout/trunk/include/
  U   Zope2.buildout/trunk/setup.py

-=-

Property changes on: Zope2.buildout/trunk/include
___________________________________________________________________
Name: svn:externals
   - ExtensionClass  svn://svn.zope.org/repos/main/Zope/trunk/lib/python/ExtensionClass


   + Acquisition	svn://svn.zope.org/repos/main/Zope/trunk/lib/python/Acquisition
ExtensionClass	svn://svn.zope.org/repos/main/Zope/trunk/lib/python/ExtensionClass
persistent	svn://svn.zope.org/repos/main/ZODB/trunk/src/persistent


Modified: Zope2.buildout/trunk/setup.py
===================================================================
--- Zope2.buildout/trunk/setup.py	2007-06-03 16:17:49 UTC (rev 76254)
+++ Zope2.buildout/trunk/setup.py	2007-06-03 16:21:11 UTC (rev 76255)
@@ -16,6 +16,8 @@
 import os
 from setuptools import setup, find_packages, Extension
 
+EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src']
+
 setup(name='Zope2',
       version = '2.11.0a1',
       url='http://zope.org',
@@ -32,65 +34,65 @@
 
     # AccessControl
     Extension(name='AccessControl.cAccessControl',
-              include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['Acquisition'],
-              sources=['AccessControl/cAccessControl.c'],
-              depends=['ExtensionClass/ExtensionClass.h',
-                       'ExtensionClass/pickle/pickle.c',
-                       'Acquisition/Acquisition.h']),
+              include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
+              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=['DocumentTemplate/cDocumentTemplate.c']),
+              sources=['src/DocumentTemplate/cDocumentTemplate.c']),
 
     Extension(name='MethodObject._MethodObject',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-              sources=["MethodObject/_MethodObject.c"],
-              depends=["ExtensionClass/ExtensionClass.h"]),
+              sources=["src/MethodObject/_MethodObject.c"],
+              depends=["include/ExtensionClass/ExtensionClass.h"]),
     Extension(name='MultiMapping._MultiMapping',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-              sources=["MultiMapping/_MultiMapping.c"],
-              depends=["ExtensionClass/ExtensionClass.h"]),
+              sources=["src/MultiMapping/_MultiMapping.c"],
+              depends=["include/ExtensionClass/ExtensionClass.h"]),
     Extension(name='ThreadLock._ThreadLock',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-              sources=["ThreadLock/_ThreadLock.c"],
-              depends=["ExtensionClass/ExtensionClass.h"]),
+              sources=["src/ThreadLock/_ThreadLock.c"],
+              depends=["include/ExtensionClass/ExtensionClass.h"]),
     Extension(name='Missing._Missing',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-              sources=["Missing/_Missing.c"],
-              depends=["ExtensionClass/ExtensionClass.h"]),
+              sources=["src/Missing/_Missing.c"],
+              depends=["include/ExtensionClass/ExtensionClass.h"]),
     Extension(name='Record._Record',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-              sources=["Record/_Record.c"],
-              depends=["ExtensionClass/ExtensionClass.h"]),
+              sources=["src/Record/_Record.c"],
+              depends=["include/ExtensionClass/ExtensionClass.h"]),
     Extension(name='ComputedAttribute._ComputedAttribute',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-              sources=["ComputedAttribute/_ComputedAttribute.c"],
-              depends=["ExtensionClass/ExtensionClass.h"]),
+              sources=["src/ComputedAttribute/_ComputedAttribute.c"],
+              depends=["include/ExtensionClass/ExtensionClass.h"]),
 
     # initgroups
     Extension(name='initgroups._initgroups',
-              sources=['initgroups/_initgroups.c']),
+              sources=['src/initgroups/_initgroups.c']),
 
     # indexes
     Extension(name='Products.PluginIndexes.TextIndex.Splitter.ZopeSplitter.ZopeSplitter',
-              sources=['Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c']),
+              sources=['src/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/src/ZopeSplitter.c']),
     Extension(name='Products.PluginIndexes.TextIndex.Splitter.ISO_8859_1_Splitter.ISO_8859_1_Splitter',
-              sources=['Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c']),
+              sources=['src/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c']),
     Extension(name='Products.PluginIndexes.TextIndex.Splitter.UnicodeSplitter.UnicodeSplitter',
-              sources=['Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c']),
+              sources=['src/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c']),
     Extension(name='Products.ZCTextIndex.stopper',
-              sources=['Products/ZCTextIndex/stopper.c']),
+              sources=['src/Products/ZCTextIndex/stopper.c']),
     Extension(name='Products.ZCTextIndex.okascore',
-              sources=['Products/ZCTextIndex/okascore.c']),
+              sources=['src/Products/ZCTextIndex/okascore.c']),
 
     Extension(name = 'Persistence._Persistence',
-              include_dirs = ['.', 'persistent', 'ExtensionClass'],
-              sources = ['Persistence/_Persistence.c'],
-              depends = ['persistent/cPersistence.h',
-                         'ExtensionClass/ExtensionClass.h']
+              include_dirs = EXTENSIONCLASS_INCLUDEDIRS,
+              sources = ['src/Persistence/_Persistence.c'],
+              depends = ['include/persistent/cPersistence.h',
+                         'include/ExtensionClass/ExtensionClass.h']
               ),
-    ]
+    ],
 
 ##       ext_modules=[Extension("Acquisition._Acquisition",
 ##                              [os.path.join('src', 'Acquisition',
@@ -104,9 +106,6 @@
                         'docutils',
                         'zdaemon',
                         'zope.annotation',
-                        'zope.app.EXTERNALS.txt',
-                        'zope.app.__init__.py',
-                        'zope.app.annotation',
                         'zope.app.apidoc',
                         'zope.app.applicationcontrol',
                         'zope.app.appsetup',
@@ -117,33 +116,22 @@
                         'zope.app.component',
                         'zope.app.container',
                         'zope.app.content',
-                        'zope.app.content_types',
-                        'zope.app.copypastemove',
-                        'zope.app.datetimeutils',
                         'zope.app.debug',
-                        'zope.app.decorator',
                         'zope.app.dependable',
                         'zope.app.dtmlpage',
-                        'zope.app.dublincore',
                         'zope.app.error',
-                        'zope.app.event',
                         'zope.app.exception',
                         'zope.app.file',
-                        'zope.app.filerepresentation',
                         'zope.app.folder',
                         'zope.app.form',
-                        'zope.app.ftests',
                         'zope.app.generations',
                         'zope.app.http',
                         'zope.app.i18n',
                         'zope.app.interface',
                         'zope.app.intid',
-                        'zope.app.introspector',
                         'zope.app.keyreference',
                         'zope.app.layers',
                         'zope.app.locales',
-                        'zope.app.location',
-                        'zope.app.mail',
                         'zope.app.onlinehelp',
                         'zope.app.pagetemplate',
                         'zope.app.preference',
@@ -151,20 +139,14 @@
                         'zope.app.principalannotation',
                         'zope.app.publication',
                         'zope.app.publisher',
-                        'zope.app.rdb',
                         'zope.app.renderer',
                         'zope.app.rotterdam',
                         'zope.app.schema',
                         'zope.app.security',
-                        'zope.app.servicenames',
                         'zope.app.session',
-                        'zope.app.site',
-                        'zope.app.size',
                         'zope.app.skins',
                         'zope.app.sqlscript',
                         'zope.app.testing',
-                        'zope.app.tests',
-                        'zope.app.timezones',
                         'zope.app.traversing',
                         'zope.app.tree',
                         'zope.app.undo',



More information about the Checkins mailing list