Move to a zpkg-based setup:

- References to headers now involve the package names.

- The zpkg support files have been moved to the top-level directory,
  and the releases/ tree has been removed.  The resource map and
  configuration file have been combined now that zpkg allows that.

- The scripts are now all located in src/scripts/ in a checkout.

- Scripts that were imported in the tests have been split into library
  and script components; the library portions share name of the
  script (in order to reduce changes).  The library portions may not
  be used as scripts directly.

releases/ZODB3/DEPENDENCIES.cfg → DEPENDENCIES.cfg

 ZEO
 ZODB
+ZODB-Scripts
 # Needed because...?
 Persistence
 ZopeUndo

PACKAGE.cfg

+<distribution>
+  doc
+  log.ini
+  test.py
+  COPYRIGHT.txt
+  LICENSE.txt
+  NEWS.txt
+  README.txt
+</distribution>
+
+<collection>
+  doc           -
+  setup.py      -
+  src           -
+  zpkg.conf     -
+  zpkgsetup     -
+</collection>

SETUP.cfg

+# unfortunate turd

releases/ZODB3/PACKAGE.cfg

-<load>
-  doc           svn://svn.zope.org/repos/main/ZODB/tags/*/doc/
-  scripts       svn://svn.zope.org/repos/main/ZODB/tags/*/src/scripts/
-  scripts/runzeo.py    svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZEO/runzeo.py
-  scripts/zeoctl.py    svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZEO/zeoctl.py
-  scripts/zeopasswd.py svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZEO/zeopasswd.py
-  scripts/mkzeoinst.py svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZEO/mkzeoinst.py
-  log.ini       svn://svn.zope.org/repos/main/ZODB/tags/*/log.ini
-  test.py       svn://svn.zope.org/repos/main/ZODB/tags/*/test.py
-  COPYRIGHT.txt svn://svn.zope.org/repos/main/ZODB/tags/*/COPYRIGHT.txt
-  LICENSE.txt   svn://svn.zope.org/repos/main/ZODB/tags/*/LICENSE.txt
-  NEWS.txt      svn://svn.zope.org/repos/main/ZODB/tags/*/NEWS.txt
-  README.txt    svn://svn.zope.org/repos/main/ZODB/tags/*/README.txt
-</load>
-
-<distribution>
-  doc
-  log.ini
-  test.py
-  COPYRIGHT.txt
-  LICENSE.txt
-  NEWS.txt
-  README.txt
-</distribution>
-
-<collection>
-  doc           -
-</collection>

releases/ZODB3/SETUP.cfg

-script  scripts/fsdump.py
-script  scripts/fsoids.py
-script  scripts/fsrefs.py
-script  scripts/fstail.py
-script  scripts/fstest.py
-script  scripts/repozo.py
-script  scripts/zeopack.py
-
-# scripts from ZEO package
-script  scripts/runzeo.py
-script  scripts/zeoctl.py
-script  scripts/zeopasswd.py
-script  scripts/mkzeoinst.py

releases/ZODB3/zodb3.map

-# These packages are used to provide the standalone ZODB distribution.
-
-# This is the ZODB3 release package:
-#
-ZODB3           svn://svn.zope.org/repos/main/ZODB/tags/*/releases/ZODB3
-
-# This group is maintained as part of the ZODB project:
-#
-BTrees          svn://svn.zope.org/repos/main/ZODB/tags/*/src/BTrees
-Persistence     svn://svn.zope.org/repos/main/ZODB/tags/*/src/Persistence
-persistent      svn://svn.zope.org/repos/main/ZODB/tags/*/src/persistent
-transaction     svn://svn.zope.org/repos/main/ZODB/tags/*/src/transaction
-ThreadedAsync   svn://svn.zope.org/repos/main/ZODB/tags/*/src/ThreadedAsync
-ZEO             svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZEO
-ZODB            svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZODB
-ZopeUndo        svn://svn.zope.org/repos/main/ZODB/tags/*/src/ZopeUndo
-zope            svn://svn.zope.org/repos/main/ZODB/tags/*/src/zope
-
-# These are copied in from the Zope3 project; they are needed for ZODB
-# 3.4 and newer:
-#
-zope.interface  svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a4/src/zope/interface
-zope.testing    svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
-
-# The ZConfig and zdaemon projects:
-
-ZConfig         svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3
-zdaemon         svn://svn.zope.org/repos/main/zdaemon/tags/zdaemon-1.1
\ No newline at end of file

src/BTrees/BTreeModuleTemplate.c

@@ -17,7 +17,7 @@
 #include "structmember.h"
 
 #ifdef PERSISTENT
-#include "cPersistence.h"
+#include "persistent/cPersistence.h"
 #else
 #define PER_USE_OR_RETURN(self, NULL)
 #define PER_ALLOW_DEACTIVATION(self)

src/ZEO/runzeo.py

-#!python
 ##############################################################################
 #
 # Copyright (c) 2001, 2002, 2003 Zope Corporation and Contributors.
@@ -352,6 +351,3 @@ def main(args=None):
     options.realize(args)
     s = ZEOServer(options)
     s.main()
-
-if __name__ == "__main__":
-    main()

src/ZEO/zeopasswd.py

-#!python
 ##############################################################################
 #
 # Copyright (c) 2003 Zope Corporation and Contributors.
@@ -124,6 +123,3 @@ def main(args=None, dbclass=None):
             password = getpass.getpass("Enter password: ")
         db.add_user(username, password)
     db.save()
-
-if __name__ == "__main__":
-    main(sys.argv[1:])

src/scripts/SETUP.cfg

+script *.py

src/scripts/runzeo.py

+#!python
+##############################################################################
+#
+# Copyright (c) 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (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 ZEO.runzeo import main
+
+main()

src/scripts/zeopasswd.py

+#!python
+##############################################################################
+#
+# Copyright (c) 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (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.
+#
+##############################################################################
+
+import sys
+
+from ZEO.zeopasswd import main
+
+main(sys.argv[1:])

zpkg.conf

+# zpkg config file
+#
+# To getnerate a ZODB release, use:
+#
+
+build-application     no
+collect-dependencies  yes
+
+<resources>
+  # This is the ZODB3 release package:
+  #
+  ZODB3           .
+
+  # This group is maintained as part of the ZODB project:
+  #
+  BTrees          src/BTrees
+  Persistence     src/Persistence
+  persistent      src/persistent
+  transaction     src/transaction
+  ThreadedAsync   src/ThreadedAsync
+  ZEO             src/ZEO
+  ZODB            src/ZODB
+  ZODB-Scripts    src/scripts
+  ZopeUndo        src/ZopeUndo
+
+  # These are copied in from the Zope3 project; they are needed for ZODB
+  # 3.4 and newer:
+  #
+  zope            src/zope
+  zope.interface  src/zope/interface
+  zope.proxy      src/zope/proxy
+  zope.testing    src/zope/testing
+
+  # These are copied in from the ZConfig and zdaemon projects:
+  #
+  ZConfig         src/ZConfig
+  zdaemon         src/zdaemon
+</resources>