[Zodb-checkins] SVN: ZODB/branches/tseaver-persistent_as_egg/ ZODB w/ externally-distributed 'persistent'.

[Tres Seaver]

Log message for revision 127231:
  ZODB w/ externally-distributed 'persistent'.
  
  This is a demo, which needs tweaking once 'persistent' is released to PyPI.

Changed:
  U   ZODB/branches/tseaver-persistent_as_egg/buildout.cfg
  _U  ZODB/branches/tseaver-persistent_as_egg/include/
  A   ZODB/branches/tseaver-persistent_as_egg/persistent-4.0dev.tar.gz
  U   ZODB/branches/tseaver-persistent_as_egg/setup.py
  D   ZODB/branches/tseaver-persistent_as_egg/src/persistent/

-=-
Modified: ZODB/branches/tseaver-persistent_as_egg/buildout.cfg
===================================================================
--- ZODB/branches/tseaver-persistent_as_egg/buildout.cfg	2012-07-02 19:47:39 UTC (rev 127230)
+++ ZODB/branches/tseaver-persistent_as_egg/buildout.cfg	2012-07-02 20:01:27 UTC (rev 127231)
@@ -3,6 +3,8 @@
 parts = test scripts
 
 versions = versions
+# Temporary, until 'persistent' is released to PyPI.
+find-links = .
 
 [versions]
 zc.recipe.testrunner = 1.3.0


Property changes on: ZODB/branches/tseaver-persistent_as_egg/include
___________________________________________________________________
Added: svn:externals
   + ^/persistent/trunk/persistent persistent


Added: ZODB/branches/tseaver-persistent_as_egg/persistent-4.0dev.tar.gz
===================================================================
(Binary files differ)


Property changes on: ZODB/branches/tseaver-persistent_as_egg/persistent-4.0dev.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: ZODB/branches/tseaver-persistent_as_egg/setup.py
===================================================================
--- ZODB/branches/tseaver-persistent_as_egg/setup.py	2012-07-02 19:47:39 UTC (rev 127230)
+++ ZODB/branches/tseaver-persistent_as_egg/setup.py	2012-07-02 20:01:27 UTC (rev 127231)
@@ -59,7 +59,7 @@
 """
 
 # Include directories for C extensions
-include = ['src']
+include = ['include', 'src']
 
 # Set up dependencies for the BTrees package
 base_btrees_depends = [
@@ -72,7 +72,7 @@
     "src/BTrees/SetTemplate.c",
     "src/BTrees/TreeSetTemplate.c",
     "src/BTrees/sorters.c",
-    "src/persistent/cPersistence.h",
+    "include/persistent/cPersistence.h",
     ]
 
 _flavors = {"O": "object", "I": "int", "F": "float", 'L': 'int'}
@@ -100,35 +100,6 @@
                        "fs", "LO", "OL", "LL", "LF",
                        )]
 
-cPersistence = Extension(name = 'persistent.cPersistence',
-                         include_dirs = include,
-                         sources= ['src/persistent/cPersistence.c',
-                                   'src/persistent/ring.c'],
-                         depends = ['src/persistent/cPersistence.h',
-                                    'src/persistent/ring.h',
-                                    'src/persistent/ring.c']
-                         )
-
-cPickleCache = Extension(name = 'persistent.cPickleCache',
-                         include_dirs = include,
-                         sources= ['src/persistent/cPickleCache.c',
-                                   'src/persistent/ring.c'],
-                         depends = ['src/persistent/cPersistence.h',
-                                    'src/persistent/ring.h',
-                                    'src/persistent/ring.c']
-                         )
-
-TimeStamp = Extension(name = 'persistent.TimeStamp',
-                      include_dirs = include,
-                      sources= ['src/persistent/TimeStamp.c']
-                      )
-
-
-exts += [cPersistence,
-         cPickleCache,
-         TimeStamp,
-        ]
-
 def _modname(path, base, name=''):
     if path == base:
         return name
@@ -189,9 +160,6 @@
       packages = find_packages('src'),
       package_dir = {'': 'src'},
       ext_modules = exts,
-      headers = ['src/persistent/cPersistence.h',
-                 'src/persistent/py24compat.h',
-                 'src/persistent/ring.h'],
       license = "ZPL 2.1",
       platforms = ["any"],
       description = doclines[0],
@@ -200,8 +168,13 @@
       test_suite="__main__.alltests", # to support "setup.py test"
       tests_require = ['zope.testing', manuel_version],
       extras_require = dict(test=['zope.testing', manuel_version]),
+      # XXX: We don't really want to install these headers;  we would
+      #      prefer just including them so that folks can build from an sdist.
+      headers = ['include/persistent/cPersistence.h',
+                 'include/persistent/ring.h'],
       install_requires = [
         transaction_version,
+        'persistent',
         'zc.lockfile',
         'ZConfig',
         'zdaemon',