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

[Barry Warsaw]

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

Modified Files:
	setup.py 
Log Message:
For the ZODB3 3.2 release bsddb3Storage -> BDBStorage

Also rename Full storage to BDBFullStorage and Minimal to
BDBMinimalStorage.


=== ZODB3/setup.py 1.26 => 1.27 ===
--- ZODB3/setup.py:1.26	Mon Nov 25 14:58:52 2002
+++ ZODB3/setup.py	Wed Dec 18 17:09:59 2002
@@ -110,8 +110,8 @@
                 define_macros = [('EXCLUDE_INTSET_SUPPORT', None)],
                 )
 
-bsddbhelper = Extension(name = 'bsddb3Storage._helper',
-                        sources = ['bsddb3Storage/bsddb3Storage/_helper.c'])
+bsddbhelper = Extension(name = 'BDBStorage._helper',
+                        sources = ['BDBStorage/_helper.c'])
 
 packages = ['BTrees', 'BTrees.tests',
             'ZODB', 'ZODB.tests',
@@ -128,21 +128,8 @@
 
 package_dir = {}
 
-# 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"])
-    package_dir['bsddb3Storage'] = 'bsddb3Storage/bsddb3Storage'
+packages.extend(["BDBStorage", "BDBStorage.tests"])
+package_dir['BDBStorage'] = 'BDBStorage'
 
 # This version of ZODB ships with two incompatible versions of ZEO.
 # The recommended version is ZEO 2.0, which is the focus of current