Revert "Don't build a tree that is being packaged; the package() method must do it...
authorCarl Hetherington <cth@carlh.net>
Sat, 19 Feb 2022 20:06:10 +0000 (21:06 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 19 Feb 2022 20:06:10 +0000 (21:06 +0100)
This reverts commit 1b9fcb5ab32d501a24f603d8a2e4fe8aff282e95.

On reflection this approach just gets too complicated considering
the override of package() for macOS.

cdist

diff --git a/cdist b/cdist
index 9b164e74c8a9fa55dc17fee114e73dcae549cb50..cdc6acf6280cc24c853eb895357245d437113c91 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -447,10 +447,7 @@ class Target(object):
             copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, p))))
 
     def package(self, project, checkout, output_dir, options, notarize):
-        # Build the dependencies; the cscript must call its own build() method if it needs to
-        tree = globals.trees.get(project, checkout, self)
-        if self.build_dependencies:
-            tree.build_dependencies(options)
+        tree = self.build(project, checkout, options)
         tree.add_defaults(options)
         p = self._cscript_package(tree, options)
         self._copy_packages(tree, p, output_dir)