[Zope-Checkins] SVN: Zope/trunk/s merged console-scripts branch

[Andreas Jung]

Log message for revision 96751:
  merged console-scripts branch
  

Changed:
  U   Zope/trunk/setup.py
  D   Zope/trunk/skel/
  A   Zope/trunk/src/Zope2/utilities/
  _U  Zope/trunk/src/Zope2/utilities/skel/

-=-
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2009-02-19 14:23:44 UTC (rev 96750)
+++ Zope/trunk/setup.py	2009-02-19 14:24:28 UTC (rev 96751)
@@ -48,30 +48,6 @@
       packages=find_packages('src'),
       package_dir={'': 'src'},
 
-      data_files=[
-        ('skel', ['skel/README.txt']),
-        ('skel/bin', ['skel/bin/runzope.bat.in',
-                      'skel/bin/runzope.in',
-                      'skel/bin/zopectl.bat.in',
-                      'skel/bin/zopectl.in',
-                      'skel/bin/zopeservice.py.in',
-                     ]),
-        ('skel/etc', ['skel/etc/site.zcml',
-                      'skel/etc/zope.conf.in',
-                     ]),
-        ('skel/etc/package-includes', []),
-        ('skel/Extensions', ['skel/Extensions/README.txt']),
-        ('skel/import', ['skel/import/README.txt',
-                         'skel/import/ZopeTutorialExamples.zexp',
-                        ]),
-        ('skel/lib/python', ['skel/lib/python/README.txt.in' ]),
-        ('skel/log', ['skel/log/README.txt']),
-        ('skel/Products', ['skel/Products/__init__.py',
-                           'skel/Products/README.txt',
-                          ]),
-        ('skel/var', ['skel/var/README.txt']),
-      ],
-
       ext_modules=[
 
         # AccessControl
@@ -265,4 +241,10 @@
 
       include_package_data=True,
       zip_safe=False,
+      entry_points={
+         'console_scripts' : [
+            'mkzopeinstance=Zope2.utilities.mkzopeinstance:main',
+            'zpasswd=Zope2.utilities.zpasswd:main',
+        ]
+      },
       )


Property changes on: Zope/trunk/src/Zope2/utilities
___________________________________________________________________
Added: svn:externals
   + ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a10/src/ZODB/scripts

Added: svn:mergeinfo
   +