[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - app.py:1.18

[Fred L. Drake, Jr.]

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

Modified Files:
	app.py 
Log Message:
- when including a subpackage in a collection, imply a dependency on
  the parent package
- update the names of the metadata files


=== Packages/zpkgtools/zpkgtools/app.py 1.17 => 1.18 ===
--- Packages/zpkgtools/zpkgtools/app.py:1.17	Sat Apr  3 01:10:00 2004
+++ Packages/zpkgtools/zpkgtools/app.py	Mon Apr  5 11:53:34 2004
@@ -134,6 +134,10 @@
             source = self.loader.load(self.locations[resource])
             self.handled_resources.add(resource)
             deps = self.add_collection_component(name, source)
+            if type == "package" and "." in name:
+                # this is a sub-package; always depend on the parent package
+                i = name.rfind()
+                deps.add("package:" + name[:i])
             remaining |= (deps - self.handled_resources)
         self.generate_collection_setup(packages, collections)
 
@@ -155,7 +159,7 @@
         destination = os.path.join(self.destination, name)
         self.ip.add_manifest(destination)
         spec = include.Specification(source)
-        include_path = os.path.join(source, "INCLUDE.txt")
+        include_path = os.path.join(source, "INCLUDE.cfg")
         if os.path.isfile(include_path):
             f = open(include_path)
             try:
@@ -169,14 +173,14 @@
             sys.exit(1)
         self.create_manifest(destination)
         
-        deps_file = os.path.join(self.source, "DEPENDENCIES.txt")
+        deps_file = os.path.join(self.source, "DEPENDENCIES.cfg")
         if os.path.isfile(deps_file):
             return dependencies.load(open(deps_file))
         else:
             return sets.Set()
 
     def load_metadata(self):
-        metadata_file = os.path.join(self.source, "PUBLICATION.txt")
+        metadata_file = os.path.join(self.source, "PUBLICATION.cfg")
         if not os.path.isfile(metadata_file):
             print >>sys.stderr, \
                   "source-dir does not contain required publication data file"
@@ -218,7 +222,7 @@
           - `destination`: Directory the setup.cfg file should be
             written to.
           - `pkginfo`: Package information loaded from a package's
-            package.conf file.
+            INSTALL.cfg file.
 
         The generated setup.cfg will contain some settings applied for
         all packages, and the list of documentation files from the