[Zope-CVS] CVS: Packages/zpkgtools/bin - zpkg:1.18

[Fred L. Drake, Jr.]

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

Modified Files:
	zpkg 
Log Message:
initial cut at generating a MANIFEST; pretty rough


=== Packages/zpkgtools/bin/zpkg 1.17 => 1.18 ===
--- Packages/zpkgtools/bin/zpkg:1.17	Tue Mar 30 18:49:54 2004
+++ Packages/zpkgtools/bin/zpkg	Tue Mar 30 22:44:27 2004
@@ -85,6 +85,9 @@
 
         self.ip = include.InclusionProcessor(
             self.source, os.path.join(self.destination, pkgname))
+        # XXX Ouch!  Need a better way to deal with this.  The
+        # InclusionProcessor API doesn't smell right.
+        self.ip.manifest_prefix = os.path.join(self.destination, "")
         try:
             self.ip.createDistributionTree()
         except cvsloader.CvsLoadingError, e:
@@ -112,6 +115,15 @@
         except cvsloader.CvsLoadingError, e:
             print >>sys.stderr, e
             sys.exit(1)
+        deps_file = os.path.join(self.source, "DEPENDENCIES.txt")
+        if os.path.isfile(deps_file):
+            for dep in dependencies.load(open(deps_file)):
+                if dep in self.locations:
+                    # we can get this
+                    pass
+                else:
+                    # external dependency
+                    pass
 
     def loadMetadata(self):
         metadata_file = os.path.join(self.source, "PUBLICATION.txt")
@@ -150,10 +162,8 @@
         if not os.path.exists(zpkgtools_dest):
             self.ip.copyTree(zpkgtools.__path__[0], zpkgtools_dest)
             tests_dir = os.path.join(zpkgtools_dest, "tests")
-            # but we don't need the tests if this was only added to
-            # support the setup.py script:
-            if os.path.isdir(tests_dir):
-                shutil.rmtree(tests_dir)
+            # XXX We could toss the tests, but that would screw up the
+            # manifest, so we'll leave them in for now.
         # now we need to find setuptools:
         setuptools_dest = os.path.join(self.destination, "setuptools")
         if os.path.exists(setuptools_dest):
@@ -175,10 +185,17 @@
             source = os.path.abspath(setuptools.__path__[0])
         self.ip.copyTree(source, setuptools_dest)
         tests_dir = os.path.join(setuptools_dest, "tests")
-        # but we don't need the tests if this was only added to
-        # support the setup.py script:
-        if os.path.isdir(tests_dir):
-            shutil.rmtree(tests_dir)
+        # XXX We could toss the tests, but that would screw up the
+        # manifest, so we'll leave them in for now.
+
+    def createManifest(self):
+        if self.ip is None:
+            return
+        manifest_path = os.path.join(self.destination, "MANIFEST")
+        f = file(manifest_path, "w")
+        for name in self.ip.manifest:
+            print >>f, name
+        f.close()
 
     def createTarball(self):
         pwd = os.getcwd()
@@ -210,6 +227,7 @@
             except cvsloader.CvsLoadingError, e:
                 print >>sys.stderr, e
                 sys.exit(e.exitcode)
+            self.createManifest()
             self.createTarball()
             self.cleanup()
         except: