[Zodb-checkins] CVS: ZODB3 - setup.py:1.56

[Jeremy Hylton]

Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv9264

Modified Files:
	setup.py 
Log Message:
Merge zodb33-devel-branch setup.py to head.


=== ZODB3/setup.py 1.55 => 1.56 ===
--- ZODB3/setup.py:1.55	Wed Nov 26 16:05:55 2003
+++ ZODB3/setup.py	Mon Dec  1 14:04:38 2003
@@ -21,7 +21,7 @@
 """
 
 classifiers = """\
-Development Status :: 5 - Production/Stable
+Development Status :: 3 - Alpha
 Intended Audience :: Developers
 License :: OSI Approved :: Zope Public License
 Programming Language :: Python
@@ -42,37 +42,12 @@
 from distutils.command.install_lib import install_lib
 from distutils.command.build_py import build_py
 
-# distutils doesn't currently support graceful future evolution,
-# because all commands are configured by keyword args and distutils
-# complains about keywords it doesn't know about.
-
-if not "depends" in Extension.__init__.func_code.co_varnames:
-    # If it doesn't, create a local replacement that removes depends from the
-    # kwargs before calling the regular constructor.
-    _Extension = Extension
-    class Extension(_Extension):
-        def __init__(self, name, sources, **kwargs):
-            if kwargs.has_key("depends"):
-                del kwargs["depends"]
-            _Extension.__init__(self, name, sources, **kwargs)
-
 if sys.version_info < (2, 3):
-    _setup = setup
-    def setup(**kwargs):
-        if kwargs.has_key("classifiers"):
-            del kwargs["classifiers"]
-        _setup(**kwargs)
-
-def ExtClassExt(name):
-    """Return an Extension object for something in ExtensionClass/src."""
-    return Extension(name=name, sources=["ExtensionClass/src/%s.c" % name])
-
-exts = [ExtClassExt(name) for name in
-        ["ExtensionClass", "Acquisition", "ComputedAttribute", "MethodObject",
-         "Missing", "MultiMapping", "Record", "ThreadLock"]]
+    print "ZODB3 3.3 requires Python 2.3 or higher"
+    sys.exit(0)
 
 # Include directories for C extensions
-include = ['ExtensionClass/src', 'ZODB']
+include = ['persistent']
 
 # Set up dependencies for the BTrees package
 base_btrees_depends = [
@@ -85,6 +60,7 @@
     "BTrees/SetTemplate.c",
     "BTrees/TreeSetTemplate.c",
     "BTrees/sorters.c",
+    "persistent/cPersistence.h",
     ]
 
 _flavors = {"O": "object", "I": "int"}
@@ -105,22 +81,29 @@
         kwargs["define_macros"] = [('EXCLUDE_INTSET_SUPPORT', None)]
     return Extension(name, sources, **kwargs)
 
-exts += [BTreeExtension(flavor) for flavor in ["OO", "IO", "OI", "II", "fs"]]
+exts = [BTreeExtension(flavor) for flavor in ["OO", "IO", "OI", "II", "fs"]]
 
-cPersistence = Extension(name = 'ZODB.cPersistence',
+cPersistence = Extension(name = 'persistent.cPersistence',
                          include_dirs = include,
-                         sources= ['ZODB/cPersistence.c']
+                         sources= ['persistent/cPersistence.c',
+                                   'persistent/ring.c'],
+                         depends = ['persistent/cPersistence.h',
+                                    'persistent/ring.h',
+                                    'persistent/ring.c']
                          )
 
-cPickleCache = Extension(name = 'ZODB.cPickleCache',
+cPickleCache = Extension(name = 'persistent.cPickleCache',
                          include_dirs = include,
-                         sources= ['ZODB/cPickleCache.c']
+                         sources= ['persistent/cPickleCache.c',
+                                   'persistent/ring.c'],
+                         depends = ['persistent/cPersistence.h',
+                                    'persistent/ring.h',
+                                    'persistent/ring.c']
                          )
 
-TimeStamp = Extension(name = 'ZODB.TimeStamp',
-                      define_macros = [('USE_EXTENSION_CLASS', 1)],
+TimeStamp = Extension(name = 'persistent.TimeStamp',
                       include_dirs = include,
-                      sources= ['ZODB/TimeStamp.c']
+                      sources= ['persistent/TimeStamp.c']
                       )
 
 coptimizations = Extension(name = 'ZODB.coptimizations',
@@ -135,17 +118,16 @@
 
 exts += [cPersistence, cPickleCache, TimeStamp, coptimizations, winlock]
 
-# Don't build the helper unless using at least Python 2.2
-if sys.version_info >= (2, 2) or "sdist" in sys.argv:
-    bsddbhelper = Extension(name = 'BDBStorage._helper',
-                            sources = ['BDBStorage/_helper.c'])
-    exts += [bsddbhelper]
+bsddbhelper = Extension(name = 'BDBStorage._helper',
+                        sources = ['BDBStorage/_helper.c'])
+exts += [bsddbhelper]
 
 packages = ["BDBStorage", "BDBStorage.tests",
             "BTrees", "BTrees.tests",
             "ZEO", "ZEO.auth", "ZEO.zrpc", "ZEO.tests",
             "ZODB", "ZODB.tests",
-            "Persistence",
+            "Persistence", "Persistence.tests",
+            "persistent", "persistent.tests",
             "ThreadedAsync",
             "zLOG", "zLOG.tests",
             "zdaemon", "zdaemon.tests",
@@ -154,11 +136,6 @@
             "ZConfig.tests.library", "ZConfig.tests.library.widget",
             "ZConfig.tests.library.thing",
             ]
-package_dir = {'BDBStorage': 'BDBStorage'}
-
-# include in a source distribution and
-if sys.version_info < (2, 3) or "sdist" in sys.argv:
-    packages.append("logging")
 
 scripts = ["Tools/fsdump.py",
            "Tools/fsrefs.py",
@@ -225,14 +202,15 @@
 doclines = __doc__.split("\n")
 
 setup(name="ZODB3",
-      version="3.3a0",
+      version="3.3a2",
       maintainer="Zope Corporation",
       maintainer_email="zodb-dev at zope.org",
-      url = "http://www.zope.org/Wikis/ZODB/FrontPage",
+      url = "http://www.zope.org/Wikis/ZODB",
+      download_url = "http://www.zope.org/Products/ZODB3.3",
       packages = packages,
       package_dir = package_dir,
       ext_modules = exts,
-      headers = ['ExtensionClass/src/ExtensionClass.h', 'ZODB/cPersistence.h'],
+      headers = ['persistent/cPersistence.h'],
       license = "http://www.zope.org/Resources/ZPL",
       platforms = ["any"],
       description = doclines[0],