[Repoze-checkins] r719 - playground/trunk/chris

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Thu Feb 21 03:37:02 2008
New Revision: 719

Log:
Undo mistaken checkin.


Modified:
   playground/trunk/chris/zopesetup.py

Modified: playground/trunk/chris/zopesetup.py
==============================================================================
--- playground/trunk/chris/zopesetup.py	(original)
+++ playground/trunk/chris/zopesetup.py	Thu Feb 21 03:37:02 2008
@@ -1,4 +1,4 @@
-__version__ = '2.10.5.0'
+__version__ = '2.10.4.2'
 
 import os
 import shutil
@@ -58,8 +58,7 @@
     def get_packages(self):
         return self._pkgs.keys()
 
-IGNORE_EXTS = ('.pyc', '.pyo', '.c', '.h', '.so', '.o', '.dll', '.lib',
-               '.obj', '.cfg')
+IGNORE_EXTS = ('.pyc', '.pyo', '.c', '.h', '.so', '.o', '.dll', '.lib', '.obj', '.cfg')
 
 def remove_stale_bytecode(arg, dirname, names):
     names = map(os.path.normcase, names)
@@ -102,8 +101,16 @@
         self.cmdclass['build_ext'] = MyExtBuilder
 
 # All extension modules must be listed here.
+ext_modules = [
+
+    # AccessControl
+    Extension(name='AccessControl.cAccessControl',
+              include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['Acquisition'],
+              sources=['AccessControl/cAccessControl.c'],
+              depends=['ExtensionClass/ExtensionClass.h',
+                       'ExtensionClass/pickle/pickle.c',
+                       'Acquisition/Acquisition.h']),
 
-zodb_ext_modules = [
     # BTrees
     Extension(name='BTrees._OOBTree',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
@@ -128,42 +135,6 @@
               define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
               sources=['BTrees/_fsBTree.c']),
 
-    #ZODB
-    Extension(name = 'persistent.cPersistence',
-              include_dirs = ['persistent'],
-              sources= ['persistent/cPersistence.c',
-                        'persistent/ring.c'],
-              depends = ['persistent/cPersistence.h',
-                         'persistent/ring.h',
-                         'persistent/ring.c']
-              ),
-    Extension(name = 'persistent.cPickleCache',
-              include_dirs = ['persistent'],
-              sources= ['persistent/cPickleCache.c',
-                        'persistent/ring.c'],
-              depends = ['persistent/cPersistence.h',
-                         'persistent/ring.h',
-                         'persistent/ring.c']
-              ),
-    Extension(name = 'persistent.TimeStamp',
-              sources= ['persistent/TimeStamp.c']
-              ),
-    Extension(name = 'ZODB.winlock',
-              sources = ['ZODB/winlock.c']
-              ),
-
-]
-
-zope_ext_modules = [
-
-    # AccessControl
-    Extension(name='AccessControl.cAccessControl',
-              include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['Acquisition'],
-              sources=['AccessControl/cAccessControl.c'],
-              depends=['ExtensionClass/ExtensionClass.h',
-                       'ExtensionClass/pickle/pickle.c',
-                       'Acquisition/Acquisition.h']),
-
     # DocumentTemplate
     Extension(name='DocumentTemplate.cDocumentTemplate',
               include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
@@ -230,6 +201,36 @@
     Extension(name='Products.ZCTextIndex.okascore',
               sources=['Products/ZCTextIndex/okascore.c']),
 
+    #ZODB
+    Extension(name = 'persistent.cPersistence',
+              include_dirs = ['persistent'],
+              sources= ['persistent/cPersistence.c',
+                        'persistent/ring.c'],
+              depends = ['persistent/cPersistence.h',
+                         'persistent/ring.h',
+                         'persistent/ring.c']
+              ),
+    Extension(name = 'Persistence._Persistence',
+              include_dirs = ['.', 'persistent', 'ExtensionClass'],
+              sources = ['Persistence/_Persistence.c'],
+              depends = ['persistent/cPersistence.h',
+                         'ExtensionClass/ExtensionClass.h']
+              ),
+    Extension(name = 'persistent.cPickleCache',
+              include_dirs = ['persistent'],
+              sources= ['persistent/cPickleCache.c',
+                        'persistent/ring.c'],
+              depends = ['persistent/cPersistence.h',
+                         'persistent/ring.h',
+                         'persistent/ring.c']
+              ),
+    Extension(name = 'persistent.TimeStamp',
+              sources= ['persistent/TimeStamp.c']
+              ),
+    Extension(name = 'ZODB.winlock',
+              sources = ['ZODB/winlock.c']
+              ),
+
     #zope
     Extension("zope.proxy._zope_proxy_proxy",
               ["zope/proxy/_zope_proxy_proxy.c"],
@@ -268,13 +269,6 @@
                  "zope/proxy/_zope_proxy_proxy.c",
                  ]),
 
-    # ZODB-related
-    Extension(name = 'Persistence._Persistence',
-              include_dirs = ['.', 'persistent', 'ExtensionClass'],
-              sources = ['Persistence/_Persistence.c'],
-              depends = ['persistent/cPersistence.h',
-                         'ExtensionClass/ExtensionClass.h']
-              ),
     ]
 
 setup(name='zopelib',
@@ -285,38 +279,10 @@
       author="Zope Corporation and Contributors",
       author_email="zope at zope.org",
       url="http://www.zope.org",
-      ext_modules = zope_ext_modules,
+      ext_modules = ext_modules,
       license="ZPL 2.0",
-      # exclude ZODB packages
-      packages=find_packages(exclude=[
-                  "BTrees",
-                  "BTrees.*",
-                  "ZConfig",
-                  "ZConfig.*",
-                  "ZODB",
-                  "ZODB.*",
-                  "persistent",
-                  "persistent.*",
-                  "transaction",
-                  "transaction.*",
-                  "zope.interface",
-                  "zope.interface.*",
-                  "zope.proxy",
-                  "zope.proxy.*",
-                  "zope.testing",
-                  "zope.testing.*",
-                  "ThreadedAsync",
-                  "ThreadedAsync.*",
-                  "ZEO",
-                  "ZEO.*",
-                  "ZopeUndo",
-                  "ZopeUndo.*",
-                  "zdaemon",
-                  "zdaemon.*",
-                ]),
+      packages=find_packages(),
       include_package_data=True,
-      dependency_links=["http://dist.repoze.org/"],
-      install_requires=["ZODB3==3.7.2"],
       namespace_packages=['Products'],
       zip_safe=False,
       distclass=MyDistribution,