[Zodb-checkins] CVS: StandaloneZODB - TODO:1.1.4.1 setup.py:1.9.6.1

Jeremy Hylton jeremy@zope.com
Tue, 18 Dec 2001 12:04:15 -0500


Update of /cvs-repository/StandaloneZODB
In directory cvs.zope.org:/tmp/cvs-serv28929

Modified Files:
      Tag: Standby-branch
	setup.py 
Added Files:
      Tag: Standby-branch
	TODO 
Log Message:
Merge StandaloneZODB-1_0-branch into Standby-branch


=== Added File StandaloneZODB/TODO ===
Check list for the StandaloneZODB 1.0 release:

- Update Andrew's ZODB programming guide.  It's currently out of date
  in a few places, and needs to be geared toward the SAZ release
  instead of Andrew's release.  For 1.0beta2.

- Implement the Berkeley blob limitation workarounds and see if they
  improve performance of the migration test.  For 1.0beta2.

- Reduce memory footprint for Berkeley pack().  Perhaps use a
  pack-specific temporary Berkeley table instead of a Python
  dictionary. For 1.0beta2.


=== StandaloneZODB/setup.py 1.9 => 1.9.6.1 ===
+from distutils.core import setup
+from distutils.extension import Extension
 
-# Setup file for StandaloneZODB package
-# Based on setup.py written by A.M. Kuchling <amk1@bigfoot.com>
+ExtensionClass = Extension(name = 'ExtensionClass',
+                           sources = ['ExtensionClass/src/ExtensionClass.c'])
 
-import os
-import sys
+Acquisition = Extension(name = 'Acquisition',
+                        sources = ['ExtensionClass/src/Acquisition.c'])
 
-from distutils.core import setup, run_setup
-from distutils.extension import Extension
+ComputedAttribute = Extension(name = 'ComputedAttribute',
+                       sources = ['ExtensionClass/src/ComputedAttribute.c'])
+
+MethodObject = Extension(name = 'MethodObject',
+                         sources = ['ExtensionClass/src/MethodObject.c'])
+
+Missing = Extension(name = 'Missing',
+                    sources = ['ExtensionClass/src/Missing.c'])
+
+MultiMapping = Extension(name = 'MultiMapping',
+                         sources = ['ExtensionClass/src/MultiMapping.c'])
+
+Record = Extension(name = 'Record', sources = ['ExtensionClass/src/Record.c'])
+
+Sync = Extension(name = 'Sync', sources = ['ExtensionClass/src/Sync.c'])
 
-# a few constants
-zope_corp = "Zope Corporation"
-zodb_email = "zodb-dev@zope.org"
-zodb_wiki = "http://www.zope.org/Wikis/ZODB/FrontPage"
-
-# ExtensionClass
-top_dir = os.getcwd()
-os.chdir('ExtensionClass')
-dist = run_setup('setup.py', script_args=sys.argv[1:], stop_after="run")
-os.chdir(top_dir)
+ThreadLock = Extension(name = 'ThreadLock',
+                       sources = ['ExtensionClass/src/ThreadLock.c'])
 
-# ZODB
-ec_include = ['ExtensionClass/src']
+include = ['ExtensionClass/src', 'ZODB']
 
 cPersistence = Extension(name = 'ZODB.cPersistence',
-                         include_dirs = ec_include,
+                         include_dirs = include,
                          sources= ['ZODB/cPersistence.c']
                          )
 
 cPickleCache = Extension(name = 'ZODB.cPickleCache',
-                         include_dirs = ec_include,
+                         include_dirs = include,
                          sources= ['ZODB/cPickleCache.c']
                          )
 
 TimeStamp = Extension(name = 'ZODB.TimeStamp',
                       define_macros = [('USE_EXTENSION_CLASS', 1)],
-                      include_dirs = ec_include,
+                      include_dirs = include,
                       sources= ['ZODB/TimeStamp.c']
                       )
 
 coptimizations = Extension(name = 'ZODB.coptimizations',
-                           include_dirs = ec_include,
+                           include_dirs = include,
                            sources= ['ZODB/coptimizations.c']
                            )
 
 winlock = Extension(name = 'ZODB.winlock',
-                    include_dirs = ec_include,
+                    include_dirs = include,
                     sources = ['ZODB/winlock.c']
                     )
 
-setup(name="ZODB",
-      version="3.1",
-      description = "Z Object Database persistence system",
-      author = zope_corp,
-      author_email = zodb_email,
-      url = zodb_wiki,
-
-      packages=['ZODB', 'ZODB.tests'],
-      
-      ext_modules = [cPersistence, cPickleCache, TimeStamp,
-                     coptimizations, winlock],
-      headers = ["ZODB/cPersistence.h"]
-      )
-
-setup(name = "ZEO", 
-      version = "0.4.1",
-      description = "Zope Enterprise Objects",
-      author = zope_corp,
-      author_email = zodb_email,
-      url = zodb_wiki,
-
-      packages = ['ZEO', 'ZEO.tests'],
-      )
-
-# Berkeley storages
-setup(name="bsddb3Storage",
-      description="ZODB storages based on Berkeley DB",
-      author = zope_corp,
-      author_email = zodb_email,
-      url = zodb_wiki,
-      package_dir = {'bsddb3Storage': 'bsddb3Storage/bsddb3Storage'},
-      packages = ["bsddb3Storage", "bsddb3Storage.tests"],
-      )
-
-# BTrees
-
-btree_include = ec_include + ['ZODB']
-
 oob = Extension(name = "BTrees._OOBTree",
-                include_dirs = btree_include,
+                include_dirs = include,
                 sources = ['BTrees/_OOBTree.c'],
                 )
 
 oib = Extension(name = "BTrees._OIBTree",
-                include_dirs = btree_include,
+                include_dirs = include,
                 sources = ['BTrees/_OIBTree.c'],
                 )
 
 iib = Extension(name = "BTrees._IIBTree",
-                include_dirs = btree_include,
+                include_dirs = include,
                 sources = ['BTrees/_IIBTree.c'],
                 define_macros = [('EXCLUDE_INTSET_SUPPORT', None)],
                 )
 
 iob = Extension(name = "BTrees._IOBTree",
-                include_dirs = btree_include,
+                include_dirs = include,
                 sources = ['BTrees/_IOBTree.c'],
                 define_macros = [('EXCLUDE_INTSET_SUPPORT', None)],
                 )
 
-setup(name="BTrees",
-      version="?",
-      packages=["BTrees", "BTrees.tests"],
-      ext_modules = [oob, oib, iib, iob],
-      author = zope_corp,
-      )
+fsb = Extension(name = "BTrees._fsBTree",
+                include_dirs = include,
+                sources = ['BTrees/_fsBTree.c'],
+                define_macros = [('EXCLUDE_INTSET_SUPPORT', None)],
+                )
+
+setup(name="StandaloneZODB",
+      version="1.0b1",
+      description="Zope Object Database: object database and persistence",
+      maintainer="Zope Corp.",
+      maintainer_email="zodb-dev@zope.org",
+      url = "http://www.zope.org/Wikis/ZODB/FrontPage",
 
-# Lib -- misc. support files
-setup(name = "Other libraries",
-      packages = ["Persistence",
+      package_dir = {'bsddb3Storage': 'bsddb3Storage/bsddb3Storage'},
+      packages = ["bsddb3Storage", "bsddb3Storage.tests",
+                  'BTrees', 'BTrees.tests',
+                  'ZEO', 'ZEO.tests',
+                  'ZODB', 'ZODB.tests',
+                  "Persistence",
                   "ThreadedAsync",
                   "zLOG", "zLOG.tests",
-                  "zdaemon",
-                  ]
+                  "zdaemon",                  
+                  ],
+      ext_modules = [ExtensionClass, Acquisition, ComputedAttribute,
+                     MethodObject, Missing, MultiMapping, Sync,
+                     ThreadLock, Record, cPersistence, cPickleCache,
+                     TimeStamp, coptimizations, winlock, oob, oib,
+                     iib, iob, fsb,
+                     ],
+      headers = ['ExtensionClass/src/ExtensionClass.h', 'ZODB/cPersistence.h'],
+      
       )
-