[Zope-Checkins] SVN: Zope/trunk/s Merged c112287 from 2.12 branch

[Hanno Schlichting]

Log message for revision 112288:
  Merged c112287 from 2.12 branch
  

Changed:
  U   Zope/trunk/setup.py
  D   Zope/trunk/src/Zope2/utilities/mkzeoinstance.py

-=-
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2010-05-13 17:41:01 UTC (rev 112287)
+++ Zope/trunk/setup.py	2010-05-13 17:59:52 UTC (rev 112288)
@@ -94,6 +94,7 @@
       'zope.interface',
       'zope.lifecycleevent',
       'zope.location',
+      'zope.mkzeoinstance',
       'zope.pagetemplate',
       'zope.processlifetime',
       'zope.proxy',
@@ -118,7 +119,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/trunk/src/Zope2/utilities/mkzeoinstance.py
===================================================================
--- Zope/trunk/src/Zope2/utilities/mkzeoinstance.py	2010-05-13 17:41:01 UTC (rev 112287)
+++ Zope/trunk/src/Zope2/utilities/mkzeoinstance.py	2010-05-13 17:59:52 UTC (rev 112288)
@@ -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()