[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - setup.py:1.6

Fred L. Drake, Jr. fred at zope.com
Wed Mar 17 13:27:12 EST 2004


Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv25330

Modified Files:
	setup.py 
Log Message:
- extension modules should be passed to distutils using the
  "ext_modules" keyword argument, not "extensions"
- generate a setup.cfg if there isn't one and there's documentation to
  be listed; this should probably be done a little differently


=== Packages/zpkgtools/zpkgtools/setup.py 1.5 => 1.6 ===
--- Packages/zpkgtools/zpkgtools/setup.py:1.5	Wed Mar 17 11:18:03 2004
+++ Packages/zpkgtools/zpkgtools/setup.py	Wed Mar 17 13:27:11 2004
@@ -30,7 +30,7 @@
         self.packages = []
         self.package_data = {}
         self.package_dir = {}
-        self.extensions = []
+        self.ext_modules = []
         self.scripts = []
         self.platforms = None
         self.classifiers = None
@@ -57,7 +57,7 @@
         directory = os.path.join(self._working_dir, pkgname)
         pkginfo = package.loadPackageInfo(pkgname, directory, reldir)
         self.scripts.extend(pkginfo.script)
-        self.extensions.extend(pkginfo.extensions)
+        self.ext_modules.extend(pkginfo.extensions)
         #
         # Generate setup.cfg the first time we run:
         #
@@ -65,11 +65,13 @@
         if os.path.exists(setup_cfg):
             return
         if pkginfo.documentation:
+            prefix = "doc_files = "
+            s = "\n" + (" " * len(prefix))
             f = open(setup_cfg, "w")
             f.write("[bdist_rpm]\n")
-            f.write("doc_files =")
-            for fn in pkginfo.documentation:
-                f.write(" %s\n" % fn)
+            f.write(prefix)
+            f.write(s.join(pkginfo.documentation))
+            f.write("\n")
             f.close()
 
     def scan_package(self, name, directory):




More information about the Zope-CVS mailing list