[Zodb-checkins] SVN: ZODB/branches/3.4/ Merge r37707 from the trunk:

[Philipp von Weitershausen]

Log message for revision 37708:
  Merge r37707 from the trunk:
    Merge the philikon-zeo-scripts branch:
      move things around so that zeo scripts are installed for
      standalone zodb releases but not for zope releases
  

Changed:
  U   ZODB/branches/3.4/releases/ZODB3/PACKAGE.cfg
  U   ZODB/branches/3.4/releases/ZODB3/SETUP.cfg
  U   ZODB/branches/3.4/src/ZEO/SETUP.cfg

-=-
Modified: ZODB/branches/3.4/releases/ZODB3/PACKAGE.cfg
===================================================================
--- ZODB/branches/3.4/releases/ZODB3/PACKAGE.cfg	2005-08-04 16:37:16 UTC (rev 37707)
+++ ZODB/branches/3.4/releases/ZODB3/PACKAGE.cfg	2005-08-04 16:40:15 UTC (rev 37708)
@@ -1,6 +1,10 @@
 <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

Modified: ZODB/branches/3.4/releases/ZODB3/SETUP.cfg
===================================================================
--- ZODB/branches/3.4/releases/ZODB3/SETUP.cfg	2005-08-04 16:37:16 UTC (rev 37707)
+++ ZODB/branches/3.4/releases/ZODB3/SETUP.cfg	2005-08-04 16:40:15 UTC (rev 37708)
@@ -5,3 +5,9 @@
 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

Modified: ZODB/branches/3.4/src/ZEO/SETUP.cfg
===================================================================
--- ZODB/branches/3.4/src/ZEO/SETUP.cfg	2005-08-04 16:37:16 UTC (rev 37707)
+++ ZODB/branches/3.4/src/ZEO/SETUP.cfg	2005-08-04 16:40:15 UTC (rev 37708)
@@ -1,4 +1,5 @@
-script  runzeo.py
-script  zeoctl.py
-script  zeopasswd.py
-script  mkzeoinst.py
+# This file is empty even though this package contains scripts.  The
+# reason for that is that we don't want the scripts to be installed
+# for Zope releases (which ZEO is part of).  For standalone ZODB
+# releases, these scripts are installed through
+# ZODB/releases/ZODB3/PACKAGE.cfg and .../SETUP.cfg.