[Zodb-checkins] CVS: StandaloneZODB - setup.py:1.14.2.1

[Barry Warsaw]

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

Modified Files:
      Tag: bsddb3Storage-picklelog-branch
	setup.py 
Log Message:
Added a ZPL header.

Also, always build the bsddb3Storage package (and tests) regardless of
whether bsddb3 is importable.  This should work for sdist builds but
may not work for bdist builds.

Change the package name to "ZODB" and the version to "3.0" in
preparation for the leapfrog release (StandaloneZODB 1.0 -> ZODB 3.0).

maintainer becomes "Zope Corporation"

Build the bsddb3Storage._helper extension module, which is currently
only on the bsddb3Storage-picklelog-branch.


=== StandaloneZODB/setup.py 1.14 => 1.14.2.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+# 
+##############################################################################
+
 from distutils.core import setup
 from distutils.extension import Extension
 
@@ -82,6 +96,9 @@
                 define_macros = [('EXCLUDE_INTSET_SUPPORT', None)],
                 )
 
+bsddbhelper = Extension(name = 'bsddb3Storage._helper',
+                        sources = ['bsddb3Storage/bsddb3Storage/_helper.c'])
+
 packages = ['BTrees', 'BTrees.tests',
             'ZEO', 'ZEO.tests',
             'ZODB', 'ZODB.tests',
@@ -89,27 +106,13 @@
             "ThreadedAsync",
             "zLOG", "zLOG.tests",
             "zdaemon", "zdaemon.tests",
+            "bsddb3Storage", "bsddb3Storage.tests",
             ]
 
-# XXX This doesn't work for source distributions; we need a better way
-# to spell things like this in distutils.  Like this, the
-# bsddb3Storage package isn't included in the source distribution.
-# Either this test only makes sense for inclusion in binary releases,
-# or these packages should always be included and client code should
-# test for bsddb3 before expecting this to work; they'll get an
-# ImportError if it's not there.
-#
-try:
-    import bsddb3
-except ImportError:
-    pass
-else:
-    packages.extend(["bsddb3Storage", "bsddb3Storage.tests"])
-
-setup(name="StandaloneZODB",
-      version="1.0",
+setup(name="ZODB",
+      version="3.0",
       description="Zope Object Database: object database and persistence",
-      maintainer="Zope Corp.",
+      maintainer="Zope Corporation",
       maintainer_email="zodb-dev@zope.org",
       url = "http://www.zope.org/Wikis/ZODB/FrontPage",
 
@@ -119,7 +122,7 @@
                      MethodObject, Missing, MultiMapping, Sync,
                      ThreadLock, Record, cPersistence, cPickleCache,
                      TimeStamp, coptimizations, winlock, oob, oib,
-                     iib, iob, fsb,
+                     iib, iob, fsb, bsddbhelper,
                      ],
       headers = ['ExtensionClass/src/ExtensionClass.h', 'ZODB/cPersistence.h'],