[Checkins] SVN: Zope/branches/ctheune-zodb38zope34/ - ZODB's
setup.py madness integrated
Christian Theune
ct at gocept.com
Thu Mar 8 18:47:18 EST 2007
Log message for revision 73084:
- ZODB's setup.py madness integrated
- fixed test for history
Changed:
_U Zope/branches/ctheune-zodb38zope34/lib/python/
U Zope/branches/ctheune-zodb38zope34/lib/python/OFS/tests/testHistory.py
_U Zope/branches/ctheune-zodb38zope34/lib/python/zope/
U Zope/branches/ctheune-zodb38zope34/setup.py
-=-
Property changes on: Zope/branches/ctheune-zodb38zope34/lib/python
___________________________________________________________________
Name: svn:externals
- ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/BTrees
persistent -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/persistent
ThreadedAsync -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ThreadedAsync
transaction -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/transaction
ZEO -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZEO
ZODB -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZODB
ZopeUndo -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZopeUndo
zdaemon -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz -r 69031 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/pytz
zodbcode -r 69031 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zodbcode
mechanize -r 69031 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/mechanize
docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0-zope
ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm
+ ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/BTrees
persistent -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/persistent
ThreadedAsync -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/ThreadedAsync
transaction -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/transaction
ZEO -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/ZEO
ZODB -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/ZODB
ZopeUndo -r 73079 svn://svn.zope.org/repos/main/ZODB/trunk/src/ZopeUndo
zdaemon -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
zodbcode -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zodbcode
mechanize -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize
docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0-zope
ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm
Modified: Zope/branches/ctheune-zodb38zope34/lib/python/OFS/tests/testHistory.py
===================================================================
--- Zope/branches/ctheune-zodb38zope34/lib/python/OFS/tests/testHistory.py 2007-03-08 23:46:27 UTC (rev 73083)
+++ Zope/branches/ctheune-zodb38zope34/lib/python/OFS/tests/testHistory.py 2007-03-08 23:47:18 UTC (rev 73084)
@@ -69,8 +69,8 @@
self.failUnless('tid' in entry)
self.failUnless('time' in entry)
if i:
- # check times are increasing
- self.failUnless(entry['time']<r[i-1]['time'])
+ # check times are increasing or at least equal
+ self.failUnless(entry['time']<=r[i-1]['time'])
self.assertEqual(entry['user_name'],'')
self.assertEqual(entry['version'],'')
Property changes on: Zope/branches/ctheune-zodb38zope34/lib/python/zope
___________________________________________________________________
Name: svn:externals
- annotation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/annotation
cachedescriptors svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/cachedescriptors
component svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/component
configuration svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/configuration
contentprovider svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/contentprovider
contenttype svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/contenttype
copypastemove svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/copypastemove
datetime svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/datetime
decorator svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/decorator
deferredimport svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/deferredimport
deprecation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/deprecation
documenttemplate svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/documenttemplate
dottedname svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/dottedname
dublincore svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/dublincore
event svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/event
exceptions svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/exceptions
filerepresentation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/filerepresentation
formlib svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/formlib
hookable svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/hookable
i18n svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/i18n
i18nmessageid svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/i18nmessageid
index svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/index
interface svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/interface
lifecycleevent svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/lifecycleevent
location svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/location
modulealias svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/modulealias
pagetemplate svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/pagetemplate
proxy svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/proxy
publisher svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/publisher
rdb svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/rdb
schema svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/schema
security svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/security
sendmail svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/sendmail
server svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/server
size svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/size
structuredtext svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/structuredtext
tal svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/tal
tales svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/tales
testbrowser svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/testbrowser
testing -r 67760 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/thread
traversing svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/traversing
viewlet svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/viewlet
wfmc svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/wfmc
+ annotation -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/annotation
cachedescriptors -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component
configuration -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
contentprovider -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/contentprovider
contenttype -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/contenttype
copypastemove -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/copypastemove
datetime -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/datetime
decorator -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/decorator
deferredimport -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deferredimport
deprecation -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation
documenttemplate -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
dottedname -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname
dublincore -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dublincore
event -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
filerepresentation -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/filerepresentation
formlib -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib
hookable -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n
i18nmessageid -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid
index -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index
interface -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface
lifecycleevent -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/lifecycleevent
location -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/location
modulealias -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy
publisher -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
rdb -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/rdb
schema -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security
sendmail -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/sendmail
server -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
size -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/size
structuredtext -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal
tales -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testbrowser -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser
testing -r 73079 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread
traversing -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/traversing
viewlet -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/viewlet
wfmc -r 73079 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/wfmc
Modified: Zope/branches/ctheune-zodb38zope34/setup.py
===================================================================
--- Zope/branches/ctheune-zodb38zope34/setup.py 2007-03-08 23:46:27 UTC (rev 73083)
+++ Zope/branches/ctheune-zodb38zope34/setup.py 2007-03-08 23:47:18 UTC (rev 73084)
@@ -307,30 +307,6 @@
'ExtensionClass/pickle/pickle.c',
'Acquisition/Acquisition.h']),
- # BTrees
- Extension(name='BTrees._OOBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- sources=['BTrees/_OOBTree.c']),
- Extension(name='BTrees._OIBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- sources=['BTrees/_OIBTree.c']),
- Extension(name='BTrees._IIBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_IIBTree.c']),
- Extension(name='BTrees._IOBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_IOBTree.c']),
- Extension(name='BTrees._IFBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_IFBTree.c']),
- Extension(name='BTrees._fsBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_fsBTree.c']),
-
# DocumentTemplate
Extension(name='DocumentTemplate.cDocumentTemplate',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
@@ -371,6 +347,13 @@
sources=["ComputedAttribute/_ComputedAttribute.c"],
depends=["ExtensionClass/ExtensionClass.h"]),
+ # Mixed ExtensionClass/Persistence module
+ Extension(name = 'Persistence._Persistence',
+ include_dirs = ['.', 'persistent', 'ExtensionClass'],
+ sources = ['Persistence/_Persistence.c'],
+ depends = ['persistent/cPersistence.h',
+ 'ExtensionClass/ExtensionClass.h']
+ ),
# initgroups
Extension(name='initgroups._initgroups',
sources=['initgroups/_initgroups.c']),
@@ -387,36 +370,6 @@
Extension(name='Products.ZCTextIndex.okascore',
sources=['Products/ZCTextIndex/okascore.c']),
- #ZODB
- Extension(name = 'persistent.cPersistence',
- include_dirs = ['persistent'],
- sources= ['persistent/cPersistence.c',
- 'persistent/ring.c'],
- depends = ['persistent/cPersistence.h',
- 'persistent/ring.h',
- 'persistent/ring.c']
- ),
- Extension(name = 'Persistence._Persistence',
- include_dirs = ['.', 'persistent', 'ExtensionClass'],
- sources = ['Persistence/_Persistence.c'],
- depends = ['persistent/cPersistence.h',
- 'ExtensionClass/ExtensionClass.h']
- ),
- Extension(name = 'persistent.cPickleCache',
- include_dirs = ['persistent'],
- sources= ['persistent/cPickleCache.c',
- 'persistent/ring.c'],
- depends = ['persistent/cPersistence.h',
- 'persistent/ring.h',
- 'persistent/ring.c']
- ),
- Extension(name = 'persistent.TimeStamp',
- sources= ['persistent/TimeStamp.c']
- ),
- Extension(name = 'ZODB.winlock',
- sources = ['ZODB/winlock.c']
- ),
-
#zope
Extension("zope.proxy._zope_proxy_proxy",
["zope/proxy/_zope_proxy_proxy.c"],
@@ -457,6 +410,82 @@
]
+# ZODB extension Modules
+
+include = ['.']
+
+base_btrees_depends = [
+ "BTrees/BTreeItemsTemplate.c",
+ "BTrees/BTreeModuleTemplate.c",
+ "BTrees/BTreeTemplate.c",
+ "BTrees/BucketTemplate.c",
+ "BTrees/MergeTemplate.c",
+ "BTrees/SetOpTemplate.c",
+ "BTrees/SetTemplate.c",
+ "BTrees/TreeSetTemplate.c",
+ "BTrees/sorters.c",
+ "persistent/cPersistence.h",
+ ]
+
+_flavors = {"O": "object", "I": "int", "F": "float", 'L': 'int'}
+
+KEY_H = "BTrees/%skeymacros.h"
+VALUE_H = "BTrees/%svaluemacros.h"
+
+def BTreeExtension(flavor):
+ key = flavor[0]
+ value = flavor[1]
+ name = "BTrees._%sBTree" % flavor
+ sources = ["BTrees/_%sBTree.c" % flavor]
+ kwargs = {"include_dirs": include}
+ if flavor != "fs":
+ kwargs["depends"] = (base_btrees_depends + [KEY_H % _flavors[key],
+ VALUE_H % _flavors[value]])
+ else:
+ kwargs["depends"] = base_btrees_depends
+ if key != "O":
+ kwargs["define_macros"] = [('EXCLUDE_INTSET_SUPPORT', None)]
+ return Extension(name, sources, **kwargs)
+
+ext_modules += [BTreeExtension(flavor)
+ for flavor in ("OO", "IO", "OI", "II", "IF",
+ "fs", "LO", "OL", "LL", "LF",
+ )]
+
+cPersistence = Extension(name = 'persistent.cPersistence',
+ include_dirs = include,
+ sources= ['persistent/cPersistence.c',
+ 'persistent/ring.c'],
+ depends = ['persistent/cPersistence.h',
+ 'persistent/ring.h',
+ 'persistent/ring.c']
+ )
+
+cPickleCache = Extension(name = 'persistent.cPickleCache',
+ include_dirs = include,
+ sources= ['persistent/cPickleCache.c',
+ 'persistent/ring.c'],
+ depends = ['persistent/cPersistence.h',
+ 'persistent/ring.h',
+ 'persistent/ring.c']
+ )
+
+TimeStamp = Extension(name = 'persistent.TimeStamp',
+ include_dirs = include,
+ sources= ['persistent/TimeStamp.c']
+ )
+
+winlock = Extension(name = 'ZODB.winlock',
+ include_dirs = include,
+ sources = ['ZODB/winlock.c']
+ )
+
+ext_modules += [cPersistence,
+ cPickleCache,
+ TimeStamp,
+ winlock,
+ ]
+
# We're using the module docstring as the distutils descriptions.
doclines = __doc__.split("\n")
More information about the Checkins
mailing list