[Zope-Checkins] SVN: Zope/branches/2.12/ Removed Zope2's own mkzeoinstance script in favor of the version from the new zope.mkzeoinstance package.

[Hanno Schlichting]

Log message for revision 112287:
  Removed Zope2's own mkzeoinstance script in favor of the version from the new zope.mkzeoinstance package.
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/setup.py
  D   Zope/branches/2.12/src/Zope2/utilities/mkzeoinstance.py
  U   Zope/branches/2.12/versions.cfg

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2010-05-13 17:34:59 UTC (rev 112286)
+++ Zope/branches/2.12/doc/CHANGES.rst	2010-05-13 17:41:01 UTC (rev 112287)
@@ -8,6 +8,12 @@
 2.12.6 (unreleased)
 -------------------
 
+Restructuring
++++++++++++++
+
+- Removed Zope2's own mkzeoinstance script in favor of the version from the
+  new zope.mkzeoinstance package.
+
 Features Added
 ++++++++++++++
 

Modified: Zope/branches/2.12/setup.py
===================================================================
--- Zope/branches/2.12/setup.py	2010-05-13 17:34:59 UTC (rev 112286)
+++ Zope/branches/2.12/setup.py	2010-05-13 17:41:01 UTC (rev 112287)
@@ -91,6 +91,7 @@
       'zope.interface',
       'zope.lifecycleevent',
       'zope.location',
+      'zope.mkzeoinstance',
       'zope.pagetemplate',
       'zope.processlifetime',
       'zope.proxy',
@@ -117,7 +118,7 @@
     zip_safe=False,
     entry_points={
        'console_scripts': [
-          'mkzeoinstance=Zope2.utilities.mkzeoinstance:main',
+          'mkzeoinstance=zope.mkzeoinstance:main',
           'mkzopeinstance=Zope2.utilities.mkzopeinstance:main',
           'runzope=Zope2.Startup.run:run',
           'zopectl=Zope2.Startup.zopectl:run',

Deleted: Zope/branches/2.12/src/Zope2/utilities/mkzeoinstance.py
===================================================================
--- Zope/branches/2.12/src/Zope2/utilities/mkzeoinstance.py	2010-05-13 17:34:59 UTC (rev 112286)
+++ Zope/branches/2.12/src/Zope2/utilities/mkzeoinstance.py	2010-05-13 17:41:01 UTC (rev 112287)
@@ -1,30 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002 Zope Foundation and Contributors.
-#
-# 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 os
-import sys
-
-mydir = os.path.dirname(os.path.abspath(sys.argv[0]))
-zopehome = os.path.dirname(mydir)
-softwarehome = os.path.join(zopehome, "lib", "python")
-
-if softwarehome not in sys.path:
-    sys.path.insert(0, softwarehome)
-
-from ZEO.mkzeoinst import ZEOInstanceBuilder
-
-def main():
-    ZEOInstanceBuilder().run()
-
-if __name__ == "__main__":
-    main()

Modified: Zope/branches/2.12/versions.cfg
===================================================================
--- Zope/branches/2.12/versions.cfg	2010-05-13 17:34:59 UTC (rev 112286)
+++ Zope/branches/2.12/versions.cfg	2010-05-13 17:41:01 UTC (rev 112287)
@@ -120,6 +120,7 @@
 zope.lifecycleevent = 3.6.1
 zope.location = 3.6.0
 zope.minmax = 1.1.2
+zope.mkzeoinstance = 3.9.4
 zope.modulealias = 3.4.0
 zope.pagetemplate = 3.5.1
 zope.password = 3.5.1