Commit c20fabdb authored by Fred Drake's avatar Fred Drake

Lots of minor changes to remove cosmetic differences between this file

and the version being used in the new-install-branch.
parent 8b653804
......@@ -8,7 +8,7 @@
# 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
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
......@@ -40,11 +40,13 @@ Distutils setup for Zope
for Zope to work in this configuration.
"""
import glob
import os
import sys
from distutils.core import setup as distutils_setup
from distutils.extension import Extension
import distutils.core
from distutils.core import Extension
# This function collects setup information for one massive distutils
# run to be done at the end of the script. If you're making a setup.py
......@@ -54,7 +56,6 @@ from distutils.extension import Extension
setup_info = {}
def setup(name=None, author=None, cmdclass=None, **kwargs):
setup_info = sys.modules[__name__].setup_info
for keyword in kwargs.keys():
if not setup_info.has_key(keyword):
setup_info[keyword] = []
......@@ -63,12 +64,9 @@ def setup(name=None, author=None, cmdclass=None, **kwargs):
# Override install_data to install into module directories, and to support
# globbing on data_files.
from types import StringType
from distutils.command.install import install
from distutils.command.install_data import install_data
from distutils.errors import DistutilsFileError, DistutilsOptionError
from distutils.util import convert_path
from glob import glob
class install_data(install_data):
def finalize_options(self):
......@@ -81,13 +79,13 @@ class install_data(install_data):
def run(self):
self.mkpath(self.install_dir)
for f in self.data_files:
if type(f) == StringType:
if isinstance(f, str):
# it's a simple file, so copy it
f = convert_path(f)
gl = glob(f)
gl = glob.glob(f)
if len(gl) == 0:
raise DistutilsFileError, \
"can't copy '%s': glob failed" % f
raise distutils.core.DistutilsFileError, \
"can't copy '%s': no matching files" % f
for g in gl:
if os.path.isfile(g):
if self.warn_dir:
......@@ -107,10 +105,10 @@ class install_data(install_data):
self.mkpath(dir)
for data in f[1]:
data = convert_path(data)
gl = glob(data)
gl = glob.glob(data)
if len(gl) == 0:
raise DistutilsFileError, \
"can't copy '%s': glob failed" % data
raise distutils.core.DistutilsFileError, \
"can't copy '%s': no matching files" % data
for g in gl:
if os.path.isfile(g):
(out, _) = self.copy_file(g, dir)
......@@ -125,7 +123,7 @@ class install(install):
self.install_headers is None or
self.install_scripts is None or
self.install_data is None):
raise DistutilsOptionError, \
raise distutils.core.DistutilsOptionError, \
"install-base or install-platbase supplied, but " + \
"installation scheme is incomplete"
return
......@@ -136,9 +134,10 @@ class install(install):
else:
if self.prefix is None:
if self.exec_prefix is not None:
raise DistutilsOptionError, \
raise distutils.core.DistutilsOptionError, \
"must not supply exec-prefix without prefix"
raise DistutilsOptionError, "must supply installation path"
raise distutils.core.DistutilsOptionError, \
"must supply installation path"
else:
if self.exec_prefix is None:
self.exec_prefix = self.prefix
......@@ -157,6 +156,7 @@ EXTENSIONCLASS_INCLUDEDIRS = [EXTENSIONCLASS_SRCDIR]
# Most modules are in lib/python in the source distribution
os.chdir(PACKAGES_ROOT)
# AccessControl
setup(
name='AccessControl',
......@@ -169,19 +169,16 @@ setup(
'AccessControl.tests.private_module.submodule',
'AccessControl.tests.public_module',
'AccessControl.tests.public_module.submodule'],
data_files=[['AccessControl', ['AccessControl/*.txt']],
['AccessControl/dtml', ['AccessControl/dtml/*']],
['AccessControl/securitySuite',
['AccessControl/securitySuite/README']],
['AccessControl/www', ['AccessControl/www/*']]],
cmdclass={'install_data': install_data},
ext_modules=[
Extension(name='AccessControl.cAccessControl',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
sources=['AccessControl/cAccessControl.c'])]
)
)
# App
setup(
......@@ -189,11 +186,9 @@ setup(
author=AUTHOR,
packages=['App'],
data_files=[['App/dtml', ['App/dtml/*']],
['App/www', ['App/www/*']]],
cmdclass={'install_data': install_data}
)
)
# BTrees
setup(
......@@ -201,7 +196,6 @@ setup(
author=AUTHOR,
packages=['BTrees', 'BTrees.tests'],
ext_modules=[
Extension(name='BTrees._OOBTree',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS + ['ZODB'],
......@@ -221,10 +215,8 @@ setup(
include_dirs=EXTENSIONCLASS_INCLUDEDIRS + ['ZODB'],
define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
sources=['BTrees/_fsBTree.c'])],
data_files=[['BTrees', ['BTrees/Maintainer.txt']]],
cmdclass={'install_data': install_data}
)
)
# BTrees compatibility package
setup(
......@@ -248,7 +240,7 @@ setup(
Extension(name='intSet',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS + ['ZODB'],
sources=['../Components/BTree/intSet.c'])]
)
)
# DateTime
setup(
......@@ -256,11 +248,9 @@ setup(
author=AUTHOR,
packages=['DateTime', 'DateTime.tests'],
data_files=[['DateTime', ['DateTime/DateTime.html']],
['DateTime/tests', ['DateTime/tests/julian_testdata.txt.gz']]],
cmdclass={'install_data': install_data}
)
)
# DocumentTemplate
setup(
......@@ -269,17 +259,14 @@ setup(
packages=['DocumentTemplate', 'DocumentTemplate.sequence',
'DocumentTemplate.sequence.tests', 'DocumentTemplate.tests'],
data_files=[['DocumentTemplate', ['DocumentTemplate/Let.stx']],
['DocumentTemplate/tests',
['DocumentTemplate/tests/dealers.*']]],
cmdclass={'install_data': install_data},
ext_modules=[
Extension(name='DocumentTemplate.cDocumentTemplate',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
sources=['DocumentTemplate/cDocumentTemplate.c'])]
)
)
# ExtensionClass
setup(
......@@ -311,7 +298,7 @@ setup(
Extension(name='ComputedAttribute',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
sources=['../Components/ExtensionClass/src/ComputedAttribute.c'])]
)
)
# HelpSys
setup(
......@@ -319,11 +306,9 @@ setup(
author=AUTHOR,
packages=['HelpSys'],
data_files=[['HelpSys/dtml', ['HelpSys/dtml/*']],
['HelpSys/images', ['HelpSys/images/*']]],
cmdclass={'install_data': install_data}
)
)
# Interface
setup(
......@@ -332,9 +317,7 @@ setup(
packages=['Interface', 'Interface.tests',
'Interface.Common', 'Interface.Common.tests'],
cmdclass={'install_data': install_data}
)
)
# logging
setup(
......@@ -349,12 +332,10 @@ setup(
author=AUTHOR,
packages=['OFS', 'OFS.tests'],
data_files=[['OFS/dtml', ['OFS/dtml/*']],
['OFS/standard', ['OFS/standard/*']],
['OFS/www', ['OFS/www/*']]],
cmdclass={'install_data': install_data}
)
)
# RestrictedPython
setup(
......@@ -363,11 +344,9 @@ setup(
packages=['RestrictedPython', 'RestrictedPython.compiler_2_1',
'RestrictedPython.tests'],
data_files=[['RestrictedPython/compiler_2_1',
['RestrictedPython/compiler_2_1/ast.txt']]],
cmdclass={'install_data': install_data}
)
)
# SearchIndex
setup(
......@@ -375,14 +354,11 @@ setup(
author=AUTHOR,
packages=['SearchIndex', 'SearchIndex.tests'],
data_files=[['SearchIndex', ['SearchIndex/*.txt']]],
cmdclass={'install_data': install_data},
ext_modules=[
Extension(name='SearchIndex.Splitter',
sources=['SearchIndex/Splitter.c'])]
)
)
# Shared.DC bases
setup(
......@@ -390,7 +366,7 @@ setup(
author=AUTHOR,
packages=['Shared', 'Shared.DC']
)
)
# Scripts
setup(
......@@ -398,10 +374,8 @@ setup(
author=AUTHOR,
packages=['Shared.DC.Scripts'],
data_files=[['Shared/DC/Scripts/dtml', ['Shared/DC/Scripts/dtml/*']]],
cmdclass={'install_data': install_data}
)
)
# StructuredText
setup(
......@@ -410,13 +384,11 @@ setup(
packages=['StructuredText', 'StructuredText.regressions',
'StructuredText.tests'],
data_files=[['StructuredText', ['StructuredText/*.txt']],
['StructuredText/regressions',
['StructuredText/regressions/*.ref',
'StructuredText/regressions/*.stx']]],
cmdclass={'install_data': install_data}
)
)
# Signals
setup(
......@@ -424,7 +396,7 @@ setup(
author=AUTHOR,
packages=['Signals'],
)
)
# ZRDB
setup(
......@@ -432,11 +404,9 @@ setup(
author=AUTHOR,
packages=['Shared.DC.ZRDB'],
data_files=[['Shared/DC/ZRDB/dtml', ['Shared/DC/ZRDB/dtml/*']],
['Shared/DC/ZRDB/www', ['Shared/DC/ZRDB/www/*']]],
cmdclass={'install_data': install_data}
)
)
# dcpyexpat
PYEXPAT_DIR=os.path.join(PACKAGES_ROOT, 'Shared', 'DC', 'xml', 'pyexpat')
......@@ -448,10 +418,7 @@ setup(
author=AUTHOR,
packages=['Shared.DC.xml', 'Shared.DC.xml.pyexpat'],
data_files=[['Shared/DC/xml/pyexpat', ['Shared/DC/xml/pyexpat/README']]],
cmdclass={'install_data': install_data},
ext_modules=[
Extension(name='Shared.DC.xml.pyexpat.dcpyexpat',
include_dirs=DCPYEXPAT_INCLUDEDIRS,
......@@ -461,7 +428,7 @@ setup(
PYEXPAT_DIR + '/expat/xmltok/xmlrole.c',
PYEXPAT_DIR + '/expat/xmltok/xmltok.c',
PYEXPAT_DIR + '/dcpyexpat.c'])]
)
)
# TAL
setup(
......@@ -469,13 +436,11 @@ setup(
author=AUTHOR,
packages=['TAL', 'TAL.tests'],
data_files=[['TAL', ['TAL/*.txt']],
['TAL/benchmark', ['TAL/benchmark/*']],
['TAL/tests/input', ['TAL/tests/input/*']],
['TAL/tests/output', ['TAL/tests/output/*']]],
cmdclass={'install_data': install_data}
)
)
# Testing
setup(
......@@ -483,19 +448,17 @@ setup(
author=AUTHOR,
packages=['Testing'],
data_files=[['Testing', ['Testing/README.txt']],
['Testing/var', ['Testing/var/README.txt']]],
cmdclass={'install_data': install_data}
)
)
# ThreadedAsync
setup(
name='ThreadedAsync',
author=AUTHOR,
packages=['ThreadedAsync']
)
packages=['ThreadedAsync'],
)
# TreeDisplay
setup(
......@@ -503,10 +466,8 @@ setup(
author=AUTHOR,
packages=['TreeDisplay'],
data_files=[['TreeDisplay/www', ['TreeDisplay/www/*']]],
cmdclass={'install_data': install_data}
)
)
# ZClasses
setup(
......@@ -514,11 +475,9 @@ setup(
author=AUTHOR,
packages=['ZClasses'],
data_files=[['ZClasses', ['ZClasses/*.gif']],
['ZClasses/dtml', ['ZClasses/dtml/*']]],
cmdclass={'install_data': install_data}
)
)
# ZLogger
setup(
......@@ -526,7 +485,7 @@ setup(
author=AUTHOR,
packages=['ZLogger']
)
)
# ZODB
setup(
......@@ -534,7 +493,6 @@ setup(
author=AUTHOR,
packages=['Persistence', 'ZODB', 'ZODB.tests'],
ext_modules=[
Extension(name='ZODB.cPersistence',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
......@@ -552,7 +510,7 @@ setup(
Extension(name='ZODB.winlock',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
sources=['ZODB/winlock.c'])],
)
)
# ZPublisher
setup(
......@@ -560,8 +518,7 @@ setup(
author=AUTHOR,
packages=['ZPublisher', 'ZPublisher.tests'],
cmdclass={'install_data': install_data}
)
)
# ZTUtils
setup(
......@@ -569,10 +526,8 @@ setup(
author=AUTHOR,
packages=['ZTUtils', 'ZTUtils.tests'],
data_files=[['ZTUtils', ['ZTUtils/*.txt']]],
cmdclass={'install_data': install_data}
)
)
# Zope
setup(
......@@ -580,7 +535,7 @@ setup(
author=AUTHOR,
packages=['Zope', 'Zope.App']
)
)
# webdav
setup(
......@@ -588,35 +543,33 @@ setup(
author=AUTHOR,
packages=['webdav'],
data_files=[['webdav/dtml', ['webdav/dtml/*']],
['webdav/www', ['webdav/www/*']]],
cmdclass={'install_data': install_data}
)
)
# zExceptions
setup(
name='zExceptions',
author=AUTHOR,
packages=['zExceptions', 'zExceptions.tests']
)
packages=['zExceptions', 'zExceptions.tests'],
)
# zLOG
setup(
name='zLOG',
author=AUTHOR,
packages=['zLOG', 'zLOG.tests']
)
packages=['zLOG', 'zLOG.tests'],
)
# zdaemon
setup(
name='zdaemon',
author=AUTHOR,
packages=['zdaemon', 'zdaemon.tests']
)
packages=['zdaemon', 'zdaemon.tests'],
)
# initgroups
......@@ -627,7 +580,7 @@ setup(
ext_modules=[
Extension(name='initgroups',
sources=['../Components/initgroups/initgroups.c'])]
)
)
# ZopeUndo
setup(
......@@ -635,8 +588,7 @@ setup(
author=AUTHOR,
packages=['ZopeUndo', 'ZopeUndo.tests'],
)
)
# ZEO
setup(
......@@ -645,9 +597,7 @@ setup(
packages=['ZEO', 'ZEO.tests', 'ZEO.zrpc'],
data_files=[['ZEO', ['ZEO/*.txt']]],
cmdclass={'install_data': install_data},
)
)
# Other top-level packages (XXX should these be broken out at all?)
setup(
......@@ -656,7 +606,7 @@ setup(
py_modules=['Globals', 'ImageFile', 'LOG', 'ts_regex', 'xmlrpclib',
'Lifetime']
)
)
# Products base directory
setup(
......@@ -664,7 +614,7 @@ setup(
author=AUTHOR,
packages=['Products']
)
)
# ExternalMethod product
setup(
......@@ -673,7 +623,6 @@ setup(
packages=['Products.ExternalMethod', 'Products.ExternalMethod.tests',
'Products.ExternalMethod.tests.Extensions'],
data_files=[['Products/ExternalMethod',
['Products/ExternalMethod/*.gif',
'Products/ExternalMethod/*.txt']],
......@@ -683,8 +632,7 @@ setup(
['Products/ExternalMethod/help/*']],
['Products/ExternalMethod/www',
['Products/ExternalMethod/www/*']]],
cmdclass={'install_data': install_data}
)
)
# MIMETools product
setup(
......@@ -692,10 +640,8 @@ setup(
author=AUTHOR,
packages=['Products.MIMETools'],
data_files=[['Products/MIMETools', ['Products/MIMETools/*.txt']]],
cmdclass={'install_data': install_data}
)
)
# MailHost product
setup(
......@@ -704,13 +650,11 @@ setup(
packages=['Products.MailHost', 'Products.MailHost.help',
'Products.MailHost.tests'],
data_files=[['Products/MailHost', ['Products/MailHost/*.txt']],
['Products/MailHost/dtml', ['Products/MailHost/dtml/*']],
['Products/MailHost/help', ['Products/MailHost/help/*.stx']],
['Products/MailHost/www', ['Products/MailHost/www/*']]],
cmdclass={'install_data': install_data}
)
)
# OFSP product
setup(
......@@ -718,13 +662,11 @@ setup(
author=AUTHOR,
packages=['Products.OFSP', 'Products.OFSP.help'],
data_files=[['Products/OFSP', ['Products/OFSP/*.txt']],
['Products/OFSP/dtml', ['Products/OFSP/dtml/*']],
['Products/OFSP/help', ['Products/OFSP/help/*.stx']],
['Products/OFSP/images', ['Products/OFSP/images/*']]],
cmdclass={'install_data': install_data}
)
)
# PageTemplates product
setup(
......@@ -733,7 +675,6 @@ setup(
packages=['Products.PageTemplates', 'Products.PageTemplates.help',
'Products.PageTemplates.tests'],
data_files=[['Products/PageTemplates', ['Products/PageTemplates/*.txt']],
['Products/PageTemplates/examples',
['Products/PageTemplates/examples/*']],
......@@ -745,8 +686,7 @@ setup(
['Products/PageTemplates/tests/output/*']],
['Products/PageTemplates/www',
['Products/PageTemplates/www/*']]],
cmdclass={'install_data': install_data}
)
)
# PluginIndexes product
setup(
......@@ -812,7 +752,6 @@ setup(
['Products/PluginIndexes/help/*']],
['Products/PluginIndexes/www',
['Products/PluginIndexes/www/*']]],
cmdclass={'install_data': install_data},
ext_modules=[
Extension(name='Products.PluginIndexes.TextIndex.Splitter.ZopeSplitter.ZopeSplitter',
......@@ -821,7 +760,7 @@ setup(
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'])]
)
)
# PythonScripts product
setup(
......@@ -838,8 +777,7 @@ setup(
['Products/PythonScripts/tests/tscripts/*']],
['Products/PythonScripts/www',
['Products/PythonScripts/www/*']]],
cmdclass={'install_data': install_data}
)
)
# Sessions product
setup(
......@@ -848,12 +786,10 @@ setup(
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/*']]],
cmdclass={'install_data': install_data}
)
)
# SiteAccess product
setup(
......@@ -861,13 +797,11 @@ setup(
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/*']]],
cmdclass={'install_data': install_data}
)
)
# SiteErrorLog product
setup(
......@@ -875,11 +809,9 @@ setup(
author=AUTHOR,
packages=['Products.SiteErrorLog'],
data_files=[['Products/SiteErrorLog/www',
['Products/SiteErrorLog/www/*']]],
cmdclass={'install_data': install_data}
)
)
# StandardCacheManagers product
setup(
......@@ -887,7 +819,6 @@ setup(
author=AUTHOR,
packages=['Products.StandardCacheManagers'],
data_files=[['Products/StandardCacheManagers',
['Products/StandardCacheManagers/*.txt',
'Products/StandardCacheManagers/*.gif']],
......@@ -895,8 +826,7 @@ setup(
['Products/StandardCacheManagers/dtml/*']],
['Products/StandardCacheManagers/help',
['Products/StandardCacheManagers/help/*']]],
cmdclass={'install_data': install_data}
)
)
# TemporaryFolder product
setup(
......@@ -904,15 +834,13 @@ setup(
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/*']]],
cmdclass={'install_data': install_data}
)
)
# Transience product
setup(
......@@ -921,14 +849,12 @@ setup(
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/*']]],
cmdclass={'install_data': install_data}
)
)
# ZCatalog product
setup(
......@@ -937,14 +863,12 @@ setup(
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/*']]],
cmdclass={'install_data': install_data}
)
)
# ZCTextIndex product
setup(
......@@ -956,17 +880,14 @@ setup(
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/*']]],
cmdclass={'install_data': install_data}
)
)
# ZGadflyDA product
setup(
......@@ -974,7 +895,6 @@ setup(
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/*']],
......@@ -982,8 +902,7 @@ setup(
['Products/ZGadflyDA/gadfly/COPYRIGHT',
'Products/ZGadflyDA/gadfly/sql.mar',
'Products/ZGadflyDA/gadfly/*.html']]],
cmdclass={'install_data': install_data}
)
)
# ZSQLMethods product
setup(
......@@ -991,14 +910,12 @@ setup(
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']]],
cmdclass={'install_data': install_data}
)
)
# ZopeTutorial product
setup(
......@@ -1006,37 +923,34 @@ setup(
author=AUTHOR,
packages=['Products.ZopeTutorial'],
data_files=[['Products/ZopeTutorial', ['Products/ZopeTutorial/*.txt',
'Products/ZopeTutorial/*.stx']],
['Products/ZopeTutorial/dtml',
['Products/ZopeTutorial/dtml/*']]],
cmdclass={'install_data': install_data}
)
)
# Call distutils setup with all lib/python packages and modules, and
# flush setup_info. Wondering why we run py_modules separately? So am I.
# Distutils won't let us specify packages and py_modules in the same call.
distutils_setup(
distutils.core.setup(
name='Zope',
author=AUTHOR,
packages=setup_info.get('packages', []),
data_files=setup_info.get('data_files', []),
headers=setup_info.get('headers', []),
ext_modules=setup_info.get('ext_modules', []),
cmdclass={'install': install, 'install_data': install_data}
)
distutils_setup(
)
distutils.core.setup(
name='Zope',
author=AUTHOR,
py_modules=setup_info.get('py_modules', []),
cmdclass={'install': install, 'install_data': install_data}
)
)
setup_info = {}
# The rest of these modules live in the root of the source tree
......@@ -1052,7 +966,6 @@ setup(
'ZServer.medusa.misc', 'ZServer.medusa.script_handler_demo',
'ZServer.medusa.sendfile', 'ZServer.medusa.test',
'ZServer.medusa.thread'],
data_files=[['ZServer', ['ZServer/*.txt']],
['ZServer/medusa', ['ZServer/medusa/*.txt',
'ZServer/medusa/*.html']],
......@@ -1064,16 +977,7 @@ setup(
['ZServer/medusa/sendfile',
['ZServer/medusa/sendfile/README']],
['ZServer/medusa/test', ['ZServer/medusa/test/*.txt']]],
cmdclass={'install_data': install_data},
# Does not work on all platforms... not like we ever compiled it before
# anyway
#
# ext_modules=[
# Extension(name='ZServer.medusa.sendfile.sendfilemodule',
# sources=['ZServer/medusa/sendfile/sendfilemodule.c'])]
)
)
# z2.py
setup(
......@@ -1081,7 +985,7 @@ setup(
author=AUTHOR,
py_modules=['z2']
)
)
# zpasswd
setup(
......@@ -1089,7 +993,7 @@ setup(
author=AUTHOR,
py_modules=['zpasswd']
)
)
# Default imports
setup(
......@@ -1097,27 +1001,25 @@ setup(
author=AUTHOR,
data_files=[['import', ['import/*.zexp']]],
cmdclass={'install_data': install_data}
)
)
# And now, the root-level stuff
distutils_setup(
distutils.core.setup(
name='Zope',
author=AUTHOR,
packages=setup_info.get('packages', []),
data_files=setup_info.get('data_files', []),
headers=setup_info.get('headers', []),
ext_modules=setup_info.get('ext_modules', []),
cmdclass={'install': install, 'install_data': install_data}
)
distutils_setup(
)
distutils.core.setup(
name='Zope',
author=AUTHOR,
py_modules=setup_info.get('py_modules', []),
cmdclass={'install': install, 'install_data': install_data}
)
)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment