[Zope-Checkins] CVS: Zope/inst - setup.py:1.1.4.6
Fred L. Drake, Jr.
fred@zope.com
Fri, 14 Feb 2003 16:12:14 -0500
Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv5795
Modified Files:
Tag: new-install-branch
setup.py
Log Message:
minor consistency cleanup
=== Zope/inst/setup.py 1.1.4.5 => 1.1.4.6 ===
--- Zope/inst/setup.py:1.1.4.5 Fri Feb 14 16:02:40 2003
+++ Zope/inst/setup.py Fri Feb 14 16:12:14 2003
@@ -628,8 +628,7 @@
packages=['ZEO', 'ZEO.tests', 'ZEO.zrpc'],
data_files=[['ZEO', ['ZEO/*.txt']]],
-
-)
+ )
# ZConfig
setup(
@@ -643,7 +642,7 @@
['ZConfig/tests/input', ['ZConfig/tests/input/*']]
],
scripts=["ZConfig/scripts/zconfig"],
-)
+ )
# Other top-level packages (XXX should these be broken out at all?)
setup(
@@ -678,7 +677,7 @@
['Products/ExternalMethod/help/*']],
['Products/ExternalMethod/www',
['Products/ExternalMethod/www/*']]],
-)
+ )
# MIMETools product
setup(
@@ -688,7 +687,7 @@
packages=['Products.MIMETools'],
data_files=[['Products/MIMETools', ['Products/MIMETools/*.txt']]],
-)
+ )
# MailHost product
setup(
@@ -702,7 +701,7 @@
['Products/MailHost/dtml', ['Products/MailHost/dtml/*']],
['Products/MailHost/help', ['Products/MailHost/help/*.stx']],
['Products/MailHost/www', ['Products/MailHost/www/*']]],
-)
+ )
# OFSP product
setup(
@@ -715,7 +714,7 @@
['Products/OFSP/dtml', ['Products/OFSP/dtml/*']],
['Products/OFSP/help', ['Products/OFSP/help/*.stx']],
['Products/OFSP/images', ['Products/OFSP/images/*']]],
-)
+ )
# PageTemplates product
setup(
@@ -736,7 +735,7 @@
['Products/PageTemplates/tests/output/*']],
['Products/PageTemplates/www',
['Products/PageTemplates/www/*']]],
-)
+ )
# PluginIndexes product
setup(
@@ -809,8 +808,8 @@
Extension(name='Products.PluginIndexes.TextIndex.Splitter.ISO_8859_1_Splitter.ISO_8859_1_Splitter',
sources=['Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c']),
Extension(name='Products.PluginIndexes.TextIndex.Splitter.UnicodeSplitter.UnicodeSplitter',
- sources=['Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c'])]
-)
+ sources=['Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter/src/UnicodeSplitter.c'])],
+ )
# PythonScripts product
setup(
@@ -819,7 +818,6 @@
packages=['Products.PythonScripts', 'Products.PythonScripts.Extensions',
'Products.PythonScripts.help', 'Products.PythonScripts.tests'],
-
data_files=[['Products/PythonScripts', ['Products/PythonScripts/*.txt']],
['Products/PythonScripts/help',
['Products/PythonScripts/help/*.stx']],
@@ -827,7 +825,7 @@
['Products/PythonScripts/tests/tscripts/*']],
['Products/PythonScripts/www',
['Products/PythonScripts/www/*']]],
-)
+ )
# Sessions product
setup(
@@ -836,11 +834,10 @@
packages=['Products.Sessions', 'Products.Sessions.help',
'Products.Sessions.tests', 'Products.Sessions.stresstests'],
-
data_files=[['Products/Sessions/help', ['Products/Sessions/help/*.stx']],
['Products/Sessions/dtml', ['Products/Sessions/dtml/*']],
['Products/Sessions/www', ['Products/Sessions/www/*']]],
-)
+ )
# SiteAccess product
setup(
@@ -848,12 +845,11 @@
author=AUTHOR,
packages=['Products.SiteAccess', 'Products.SiteAccess.Extensions'],
-
data_files=[['Products/SiteAccess', ['Products/SiteAccess/*.txt']],
['Products/SiteAccess/doc', ['Products/SiteAccess/doc/*']],
['Products/SiteAccess/help', ['Products/SiteAccess/help/*']],
['Products/SiteAccess/www', ['Products/SiteAccess/www/*']]],
-)
+ )
# SiteErrorLog product
setup(
@@ -861,10 +857,9 @@
author=AUTHOR,
packages=['Products.SiteErrorLog'],
-
data_files=[['Products/SiteErrorLog/www',
['Products/SiteErrorLog/www/*']]],
-)
+ )
# StandardCacheManagers product
setup(
@@ -872,7 +867,6 @@
author=AUTHOR,
packages=['Products.StandardCacheManagers'],
-
data_files=[['Products/StandardCacheManagers',
['Products/StandardCacheManagers/*.txt',
'Products/StandardCacheManagers/*.gif']],
@@ -880,7 +874,7 @@
['Products/StandardCacheManagers/dtml/*']],
['Products/StandardCacheManagers/help',
['Products/StandardCacheManagers/help/*']]],
-)
+ )
# TemporaryFolder product
setup(
@@ -888,14 +882,13 @@
author=AUTHOR,
packages=['Products.TemporaryFolder', 'Products.TemporaryFolder.tests'],
-
data_files=[['Products/TemporaryFolder/dtml',
['Products/TemporaryFolder/dtml/*']],
['Products/TemporaryFolder/help',
['Products/TemporaryFolder/help/*']],
['Products/TemporaryFolder/www',
['Products/TemporaryFolder/www/*']]],
-)
+ )
# Transience product
setup(
@@ -904,13 +897,12 @@
packages=['Products.Transience', 'Products.Transience.help',
'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/www', ['Products/Transience/www/*']]],
-)
+ )
# ZCatalog product
setup(
@@ -919,13 +911,12 @@
packages=['Products.ZCatalog', 'Products.ZCatalog.help',
'Products.ZCatalog.regressiontests', 'Products.ZCatalog.tests'],
-
data_files=[['Products/ZCatalog', ['Products/ZCatalog/*.gif',
'Products/ZCatalog/*.txt']],
['Products/ZCatalog/dtml', ['Products/ZCatalog/dtml/*']],
['Products/ZCatalog/help', ['Products/ZCatalog/help/*.stx']],
['Products/ZCatalog/www', ['Products/ZCatalog/www/*']]],
-)
+ )
# ZCTextIndex product
setup(
@@ -937,16 +928,14 @@
sources=['Products/ZCTextIndex/stopper.c']),
Extension(name='Products.ZCTextIndex.okascore',
sources=['Products/ZCTextIndex/okascore.c'])],
-
packages=['Products.ZCTextIndex', 'Products.ZCTextIndex.tests'],
-
data_files=[['Products/ZCTextIndex', ['Products/ZCTextIndex/README.txt']],
['Products/ZCTextIndex/dtml', ['Products/ZCTextIndex/dtml/*']],
['Products/ZCTextIndex/help', ['Products/ZCTextIndex/help/*']],
['Products/ZCTextIndex/tests',
['Products/ZCTextIndex/tests/python.txt']],
['Products/ZCTextIndex/www', ['Products/ZCTextIndex/www/*']]],
-)
+ )
# ZGadflyDA product
setup(
@@ -954,7 +943,6 @@
author=AUTHOR,
packages=['Products.ZGadflyDA', 'Products.ZGadflyDA.gadfly'],
-
data_files=[['Products/ZGadflyDA', ['Products/ZGadflyDA/*.txt']],
['Products/ZGadflyDA/dtml', ['Products/ZGadflyDA/dtml/*']],
['Products/ZGadflyDA/icons', ['Products/ZGadflyDA/icons/*']],
@@ -962,7 +950,7 @@
['Products/ZGadflyDA/gadfly/COPYRIGHT',
'Products/ZGadflyDA/gadfly/sql.mar',
'Products/ZGadflyDA/gadfly/*.html']]],
-)
+ )
# ZSQLMethods product
setup(
@@ -970,13 +958,12 @@
author=AUTHOR,
packages=['Products.ZSQLMethods', 'Products.ZSQLMethods.help'],
-
data_files=[['Products/ZSQLMethods', ['Products/ZSQLMethods/*.txt',
'Products/ZSQLMethods/*.gif']],
['Products/ZSQLMethods/dtml', ['Products/ZSQLMethods/dtml/*']],
['Products/ZSQLMethods/help',
['Products/ZSQLMethods/help/*.stx']]],
-)
+ )
# ZopeTutorial product
setup(
@@ -984,12 +971,11 @@
author=AUTHOR,
packages=['Products.ZopeTutorial'],
-
data_files=[['Products/ZopeTutorial', ['Products/ZopeTutorial/*.txt',
'Products/ZopeTutorial/*.stx']],
['Products/ZopeTutorial/dtml',
['Products/ZopeTutorial/dtml/*']]],
-)
+ )
# ZServer
setup(
@@ -1001,7 +987,6 @@
'ZServer.medusa.misc', 'ZServer.medusa.script_handler_demo',
'ZServer.medusa.sendfile', 'ZServer.medusa.test',
'ZServer.medusa.thread'],
-
data_files=[['ZServer', ['ZServer/*.txt', 'ZServer/*.xml']],
['ZServer/medusa', ['ZServer/medusa/*.txt',
'ZServer/medusa/*.html']],
@@ -1025,11 +1010,10 @@
packages=setup_info.get('packages', []),
data_files=setup_info.get('data_files', []),
-
headers=setup_info.get('headers', []),
ext_modules=setup_info.get('ext_modules', []),
distclass=ZopeDistribution,
-)
+ )
distutils.core.setup(
name='Zope',
author=AUTHOR,
@@ -1037,7 +1021,7 @@
py_modules=setup_info.get('py_modules', []),
scripts=setup_info.get('scripts', []),
distclass=ZopeDistribution,
-)
+ )
setup_info = {}
# Does not work on all platforms... not like we ever compiled it before
@@ -1087,11 +1071,10 @@
packages=setup_info.get('packages', []),
data_files=setup_info.get('data_files', []),
-
headers=setup_info.get('headers', []),
ext_modules=setup_info.get('ext_modules', []),
distclass=ZopeDistribution,
-)
+ )
distutils.core.setup(
name='Zope',
author=AUTHOR,
@@ -1099,4 +1082,4 @@
py_modules=setup_info.get('py_modules', []),
scripts=setup_info.get('scripts', []),
distclass=ZopeDistribution,
-)
+ )