[Zope-Checkins] CVS: Zope - setup.py:1.31.2.16

[Brian Lloyd]

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

Modified Files:
      Tag: Zope-2_7-branch
	setup.py 
Log Message:
fix bug 1207


=== Zope/setup.py 1.31.2.15 => 1.31.2.16 ===
--- Zope/setup.py:1.31.2.15	Wed Jan 21 10:07:53 2004
+++ Zope/setup.py	Fri Jan 30 14:02:00 2004
@@ -171,8 +171,8 @@
 AUTHOR = 'Zope Corporation and Contributors'
 EXTENSIONCLASS_ROOT = os.path.join(BASE_DIR, 'lib', 'Components',
                                    'ExtensionClass')
-EXTENSIONCLASS_SRCDIR = os.path.join(EXTENSIONCLASS_ROOT, 'src')
-EXTENSIONCLASS_INCLUDEDIRS = [EXTENSIONCLASS_SRCDIR]
+EXTENSIONCLASS_INCLUDEDIRS = [os.path.join(EXTENSIONCLASS_ROOT, 'src')]
+EXTENSIONCLASS_SRCDIR = '../Components/ExtensionClass/src'
 
 # Most modules are in lib/python in the source distribution
 PACKAGES_ROOT = os.path.join(BASE_DIR, 'lib', 'python')
@@ -329,28 +329,28 @@
     ext_modules=[
         Extension(name='ExtensionClass',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/ExtensionClass.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/ExtensionClass.c']),
         Extension(name='Acquisition',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/Acquisition.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/Acquisition.c']),
         Extension(name='MethodObject',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/MethodObject.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/MethodObject.c']),
         Extension(name='MultiMapping',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/MultiMapping.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/MultiMapping.c']),
         Extension(name='ThreadLock',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/ThreadLock.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/ThreadLock.c']),
         Extension(name='Missing',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/Missing.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/Missing.c']),
         Extension(name='Record',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/Record.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/Record.c']),
         Extension(name='ComputedAttribute',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=[EXTENSIONCLASS_SRCDIR + "/ComputedAttribute.c"]),
+                  sources=[EXTENSIONCLASS_SRCDIR + '/ComputedAttribute.c']),
         ]
     )
 
@@ -477,6 +477,7 @@
 PYEXPAT_DIR=os.path.join(PACKAGES_ROOT, 'Shared', 'DC', 'xml', 'pyexpat')
 DCPYEXPAT_INCLUDEDIRS=[os.path.join(PYEXPAT_DIR, 'expat', 'xmlparse'),
                        os.path.join(PYEXPAT_DIR, 'expat', 'xmltok')]
+DCPYEXPAT_DIR='Shared/DC/xml/pyexpat'
 
 setup(
     name='dcpyexpat',
@@ -488,11 +489,11 @@
         Extension(name='Shared.DC.xml.pyexpat.dcpyexpat',
                   include_dirs=DCPYEXPAT_INCLUDEDIRS,
                   define_macros=[('XML_NS', None)],
-                  sources=[PYEXPAT_DIR + '/expat/xmlparse/xmlparse.c',
-                           PYEXPAT_DIR + '/expat/xmlparse/hashtable.c',
-                           PYEXPAT_DIR + '/expat/xmltok/xmlrole.c',
-                           PYEXPAT_DIR + '/expat/xmltok/xmltok.c',
-                           PYEXPAT_DIR + '/dcpyexpat.c'])]
+                  sources=[DCPYEXPAT_DIR + '/expat/xmlparse/xmlparse.c',
+                           DCPYEXPAT_DIR + '/expat/xmlparse/hashtable.c',
+                           DCPYEXPAT_DIR + '/expat/xmltok/xmlrole.c',
+                           DCPYEXPAT_DIR + '/expat/xmltok/xmltok.c',
+                           DCPYEXPAT_DIR + '/dcpyexpat.c'])]
     )
 
 # TAL
@@ -559,7 +560,7 @@
     author=AUTHOR,
 
     packages=['Persistence', 'ZODB', 'ZODB.tests'],
-    data_files=[['ZODB', ['ZODB/component.xml']]],
+    data_files=[['ZODB', ['ZODB/*.xml']]],
     ext_modules=[
         Extension(name='ZODB.cPersistence',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
@@ -640,8 +641,7 @@
 
     packages=['zdaemon', 'zdaemon.tests'],
     data_files=[['zdaemon', ['zdaemon/sample.conf',
-                             'zdaemon/component.xml',
-                             'zdaemon/schema.xml']],
+                             'zdaemon/*.xml']],
                 ['zdaemon/tests', ['zdaemon/tests/donothing.sh']]]
     )
 
@@ -686,6 +686,7 @@
         ['../../doc/zconfig',
          ['ZConfig/doc/zconfig.pdf', 'ZConfig/doc/schema.dtd']],
         ['ZConfig/tests/input', ['ZConfig/tests/input/*']],
+        ['ZConfig/tests/library', ['ZConfig/tests/library/*']],
         ['ZConfig/tests/library/thing', ['ZConfig/tests/library/thing/*']],
         ['ZConfig/tests/library/thing/extras',
          ['ZConfig/tests/library/thing/extras/*']],