[Zope3-checkins] CVS: Zope3 - setup.py:1.43.2.1

[Jim Fulton]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv25080

Modified Files:
      Tag: zope3-zodb3-devel-branch
	setup.py 
Log Message:
Checkpointing to the branch after beginning the process of removing
zodb 4 code. 

Lots of things are now broken. :)




=== Zope3/setup.py 1.43 => 1.43.2.1 ===
--- Zope3/setup.py:1.43	Thu Jan  8 17:33:39 2004
+++ Zope3/setup.py	Fri Jan  9 17:23:22 2004
@@ -1,4 +1,4 @@
-##############################################################################
+#############################################################################
 #
 # Copyright (c) 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
@@ -164,36 +164,16 @@
 
 # Set up dependencies for the BTrees package
 base_btrees_depends = [
-    "src/persistence/persistence.h",
-    "src/persistence/persistenceAPI.h",
-    "src/zodb/btrees/BTreeItemsTemplate.c",
-    "src/zodb/btrees/BTreeModuleTemplate.c",
-    "src/zodb/btrees/BTreeTemplate.c",
-    "src/zodb/btrees/BucketTemplate.c",
-    "src/zodb/btrees/MergeTemplate.c",
-    "src/zodb/btrees/SetOpTemplate.c",
-    "src/zodb/btrees/SetTemplate.c",
-    "src/zodb/btrees/TreeSetTemplate.c",
-    "src/zodb/btrees/sorters.c",
+    "src/persistent/cPersistence.h",
     ]
 
 _flavors = {"O": "object", "I": "int"}
 
-KEY_H = "src/zodb/btrees/%skeymacros.h"
-VALUE_H = "src/zodb/btrees/%svaluemacros.h"
+KEY_H = "src/BTrees/%skeymacros.h"
+VALUE_H = "src/BTrees/%svaluemacros.h"
 
 include_dirs = ['src']
 
-def BTreeExtension(flavor):
-    key = flavor[0]
-    value = flavor[1]
-    name = "zodb.btrees._zodb_btrees_%sBTree" % flavor
-    sources = ["src/zodb/btrees/_zodb_btrees_%sBTree.c" % flavor]
-    kwargs = {"include_dirs": include_dirs}
-    if flavor != "fs":
-        kwargs["depends"] = (base_btrees_depends + [KEY_H % _flavors[key],
-                                                    VALUE_H % _flavors[value]])
-    return Extension(name, sources, **kwargs)
 
 def BTreeExtension3(flavor):
     key = flavor[0]
@@ -208,11 +188,6 @@
 
 # All Zope3 extension modules must be listed here.
 ext_modules = [
-    BTreeExtension("OO"),
-    BTreeExtension("IO"),
-    BTreeExtension("OI"),
-    BTreeExtension("II"),
-    BTreeExtension("fs"),
     BTreeExtension3("OO"),
     BTreeExtension3("IO"),
     BTreeExtension3("OI"),
@@ -246,12 +221,6 @@
               include_dirs = ['src/persistent'],
               sources = ['src/ZODB/winlock.c']
               ),
-    Extension("persistence._persistence",
-              ["src/persistence/persistence.c"],
-              depends = ["src/persistence/persistence.h",
-                         "src/persistence/persistenceAPI.h",]),
-    Extension("zodb._timestamp", ["src/zodb/_timestamp.c"]),
-    Extension("zodb.storage._helper", ["src/zodb/storage/_helper.c"]),
 
     Extension("zope.context.wrapper",
               ["src/zope/context/wrapper.c"],
@@ -279,8 +248,7 @@
               ["src/zope/app/container/_zope_app_container_contained.c"],
               include_dirs = include_dirs,
               depends = [
-                 "src/persistence/persistence.h",
-                 "src/persistence/persistenceAPI.h",
+                 "src/persistent/cPersistence.h",
                  "src/zope/proxy/_zope_proxy_proxy.c",
                  ]),
     
@@ -305,8 +273,7 @@
       url = "http://dev.zope.org/Zope3/",
       ext_modules = ext_modules,
       # This doesn't work right at all
-      headers = ["src/persistence/persistence.h",
-                 "src/persistence/persistenceAPI.h",
+      headers = ["src/persistent/cPersistence.h",
                  "src/zope/proxy/proxy.h",
                  "src/zope/context/wrapper.h"],
       scripts = ["z3.py", "utilities/runurl.py"],