[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - app.py:1.65
setup.py:1.24
Fred L. Drake, Jr.
fred at zope.com
Mon Jun 7 15:52:57 EDT 2004
Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv20326/zpkgtools
Modified Files:
app.py setup.py
Log Message:
change SetupContext: initialization is not performed automatically;
this is intended to make this class more readily testible
=== Packages/zpkgtools/zpkgtools/app.py 1.64 => 1.65 ===
--- Packages/zpkgtools/zpkgtools/app.py:1.64 Thu May 27 10:32:12 2004
+++ Packages/zpkgtools/zpkgtools/app.py Mon Jun 7 15:52:26 2004
@@ -445,6 +445,7 @@
print >>f, "context = zpkgtools.setup.SetupContext("
print >>f, " %r, %r, __file__)" % (self.name, version)
print >>f
+ print >>f, "context.initialize()"
print >>f, "context.setup()"
f.close()
=== Packages/zpkgtools/zpkgtools/setup.py 1.23 => 1.24 ===
--- Packages/zpkgtools/zpkgtools/setup.py:1.23 Mon Jun 7 15:39:23 2004
+++ Packages/zpkgtools/zpkgtools/setup.py Mon Jun 7 15:52:26 2004
@@ -32,6 +32,7 @@
def __init__(self, pkgname, version, setup_file):
self._working_dir = os.path.dirname(os.path.abspath(setup_file))
+ self._pkgname = pkgname
self.version = version
self.packages = []
self.package_data = {}
@@ -41,15 +42,17 @@
self.platforms = None
self.classifiers = None
self.data_files = []
+
+ def initialize(self):
self.load_metadata(
- os.path.join(self._working_dir, pkgname,
+ os.path.join(self._working_dir, self._pkgname,
publication.PUBLICATION_CONF))
- pkgdir = os.path.join(self._working_dir, pkgname)
- self.scan(pkgname, pkgdir, pkgname)
+ pkgdir = os.path.join(self._working_dir, self._pkgname)
+ self.scan(self._pkgname, pkgdir, self._pkgname)
depsdir = os.path.join(self._working_dir, "Dependencies")
if os.path.isdir(depsdir):
depnames = os.listdir(depsdir)
- suffix = "-%s-%s" % (pkgname, version)
+ suffix = "-%s-%s" % (self._pkgname, version)
for name in depnames:
if name != "Includes" and not name.endswith(suffix):
# an unexpected name; we didn't put this here!
More information about the Zope-CVS
mailing list