[Zope-Checkins] CVS: Zope/inst - setup.py:1.1.4.13

Fred L. Drake, Jr. fred@zope.com
Mon, 24 Feb 2003 18:17:08 -0500


Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv21608

Modified Files:
      Tag: new-install-branch
	setup.py 
Log Message:
Cleanup the output of distutils by describing the files properly in
more cases.  There's more to be done.


=== Zope/inst/setup.py 1.1.4.12 => 1.1.4.13 ===
--- Zope/inst/setup.py:1.1.4.12	Mon Feb 24 15:41:53 2003
+++ Zope/inst/setup.py	Mon Feb 24 18:17:07 2003
@@ -795,11 +795,13 @@
     name='PythonScripts',
     author=AUTHOR,
 
-    packages=['Products.PythonScripts', 'Products.PythonScripts.Extensions',
-              'Products.PythonScripts.help', 'Products.PythonScripts.tests'],
+    packages=['Products.PythonScripts', 'Products.PythonScripts.tests'],
     data_files=[['Products/PythonScripts', ['Products/PythonScripts/*.txt']],
+                ['Products/PythonScripts/Extensions',
+                    ['Products/PythonScripts/Extensions/*.py']],
                 ['Products/PythonScripts/help',
-                    ['Products/PythonScripts/help/*.stx']],
+                    ['Products/PythonScripts/help/*.py',
+                     'Products/PythonScripts/help/*.stx']],
                 ['Products/PythonScripts/tests/tscripts',
                     ['Products/PythonScripts/tests/tscripts/*']],
                 ['Products/PythonScripts/www',
@@ -811,10 +813,12 @@
     name='Sessions',
     author=AUTHOR,
 
-    packages=['Products.Sessions', 'Products.Sessions.help',
-              'Products.Sessions.tests', 'Products.Sessions.stresstests'],
-    data_files=[['Products/Sessions/help', ['Products/Sessions/help/*.stx']],
+    packages=['Products.Sessions', 'Products.Sessions.tests'],
+    data_files=[['Products/Sessions/help', ['Products/Sessions/help/*.py',
+                                            'Products/Sessions/help/*.stx']],
                 ['Products/Sessions/dtml', ['Products/Sessions/dtml/*']],
+                ['Products/Sessions/stresstests',
+                     ['Products/Sessions/stresstests/*.py']],
                 ['Products/Sessions/www', ['Products/Sessions/www/*']]],
     )
 
@@ -823,9 +827,11 @@
     name='SiteAccess',
     author=AUTHOR,
 
-    packages=['Products.SiteAccess', 'Products.SiteAccess.Extensions'],
+    packages=['Products.SiteAccess'],
     data_files=[['Products/SiteAccess', ['Products/SiteAccess/*.txt']],
                 ['Products/SiteAccess/doc', ['Products/SiteAccess/doc/*']],
+                ['Products/SiteAccess/Extensions',
+                     ['Products/SiteAccess/Extensions/*.py']],
                 ['Products/SiteAccess/help', ['Products/SiteAccess/help/*']],
                 ['Products/SiteAccess/www', ['Products/SiteAccess/www/*']]],
     )
@@ -874,12 +880,12 @@
     name='Transience',
     author=AUTHOR,
 
-    packages=['Products.Transience', 'Products.Transience.help',
-              'Products.Transience.tests'],
+    packages=['Products.Transience', 'Products.Transience.tests'],
     data_files=[['Products/Transience', ['Products/Transience/*.stx']],
                 ['Products/Transience/dtml', ['Products/Transience/dtml/*']],
                 ['Products/Transience/help',
-                    ['Products/Transience/help/*.stx']],
+                    ['Products/Transience/help/*.py',
+                     'Products/Transience/help/*.stx']],
                 ['Products/Transience/www', ['Products/Transience/www/*']]],
     )
 
@@ -888,12 +894,14 @@
     name='ZCatalog',
     author=AUTHOR,
 
-    packages=['Products.ZCatalog', 'Products.ZCatalog.help',
-              'Products.ZCatalog.regressiontests', 'Products.ZCatalog.tests'],
-    data_files=[['Products/ZCatalog', ['Products/ZCatalog/*.gif',
-                                       'Products/ZCatalog/*.txt']],
+    packages=['Products.ZCatalog', 'Products.ZCatalog.tests'],
+    data_files=[['Products/ZCatalog',
+                     ['Products/ZCatalog/*.gif', 'Products/ZCatalog/*.txt']],
+                ['Products/ZCatalog/regressiontests',
+                     ['Products/ZCatalog/regressiontests/*.py']],
                 ['Products/ZCatalog/dtml', ['Products/ZCatalog/dtml/*']],
-                ['Products/ZCatalog/help', ['Products/ZCatalog/help/*.stx']],
+                ['Products/ZCatalog/help', ['Products/ZCatalog/help/*.stx',
+                                            'Products/ZCatalog/help/*.py']],
                 ['Products/ZCatalog/www', ['Products/ZCatalog/www/*']]],
     )
 
@@ -936,12 +944,13 @@
     name='ZSQLMethods',
     author=AUTHOR,
 
-    packages=['Products.ZSQLMethods', 'Products.ZSQLMethods.help'],
+    packages=['Products.ZSQLMethods'],
     data_files=[['Products/ZSQLMethods', ['Products/ZSQLMethods/*.txt',
                                           'Products/ZSQLMethods/*.gif']],
                 ['Products/ZSQLMethods/dtml', ['Products/ZSQLMethods/dtml/*']],
                 ['Products/ZSQLMethods/help',
-                    ['Products/ZSQLMethods/help/*.stx']]],
+                    ['Products/ZSQLMethods/help/*.stx',
+                     'Products/ZSQLMethods/help/*.py']]],
     )
 
 # ZopeTutorial product
@@ -962,20 +971,24 @@
     author=AUTHOR,
 
     packages=['ZServer', 'ZServer.PubCore', 'ZServer.tests', 'ZServer.medusa',
-              'ZServer.medusa.contrib', 'ZServer.medusa.demo',
-              'ZServer.medusa.misc', 'ZServer.medusa.script_handler_demo',
-              'ZServer.medusa.sendfile', 'ZServer.medusa.test',
+              'ZServer.medusa.test',
               'ZServer.medusa.thread'],
     data_files=[['ZServer', ['ZServer/*.txt', 'ZServer/*.xml']],
                 ['ZServer/medusa', ['ZServer/medusa/*.txt',
                                     'ZServer/medusa/*.html']],
+                ['ZServer/medusa/contrib', ['ZServer/medusa/contrib/*.py']],
+                ['ZServer/medusa/demo', ['ZServer/medusa/demo/*.py']],
                 ['ZServer/medusa/dist', ['ZServer/medusa/dist/*']],
                 ['ZServer/medusa/docs', ['ZServer/medusa/docs/*']],
+                ['ZServer/medusa/misc', ['ZServer/medusa/misc/*.py']],
                 ['ZServer/medusa/notes', ['ZServer/medusa/notes/*']],
                 ['ZServer/medusa/script_handler_demo',
-                    ['ZServer/medusa/script_handler_demo/*.mpy']],
+                    ['ZServer/medusa/script_handler_demo/*.mpy',
+                     'ZServer/medusa/script_handler_demo/*.py']],
                 ['ZServer/medusa/sendfile',
-                    ['ZServer/medusa/sendfile/README']],
+                    ['ZServer/medusa/sendfile/README',
+                     'ZServer/medusa/sendfile/*.py',
+                     'ZServer/medusa/sendfile/sendfilemodule.c']],
                 ['ZServer/medusa/test', ['ZServer/medusa/test/*.txt']]],
     )