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

[Fred L. Drake, Jr.]

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

Modified Files:
	app.py 
Log Message:
Separate the meaning of the --application and --collection options; it is now
possible to generate an "application" distribution that does not collect
dependencies.


=== Packages/zpkgtools/zpkgtools/app.py 1.63 => 1.64 ===
--- Packages/zpkgtools/zpkgtools/app.py:1.63	Sun May 16 11:28:38 2004
+++ Packages/zpkgtools/zpkgtools/app.py	Thu May 27 10:32:12 2004
@@ -101,7 +101,7 @@
         dep_sources = {} 
         top = self.get_component(self.resource, self.resource_url)
         top.write_package(self.destination)
-        if self.options.build_type in ("application", "collection"):
+        if self.options.collect:
             depsdir = os.path.join(self.destination, "Dependencies")
             first = True
             handled = sets.Set()
@@ -135,7 +135,7 @@
                 component.write_setup_cfg()
                 component.write_manifest()
                 self.add_headers(component)
-        if self.options.build_type == "application":
+        if self.options.application:
             top.write_setup_py(filename="install.py",
                                version=self.options.version)
             self.write_application_support(top)
@@ -517,13 +517,13 @@
 
     # options specific to building a package:
     parser.add_option(
-        "-a", "--application", dest="build_type",
-        action="store_const", const="application",
+        "-a", "--application", dest="application",
+        action="store_true",
         help="build an application distribution")
     parser.add_option(
-        "-c", "--collection", dest="build_type",
-        action="store_const", const="collection",
-        help="build a collection distribution")
+        "-c", "--collection", dest="collect",
+        action="store_true",
+        help="collect dependencies into the distribution")
     parser.add_option(
         "-n", "--name", dest="release_name",
         help="base name of the distribution file", metavar="NAME")