summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-05-20 19:44:24 +0200
committerCarl Hetherington <cth@carlh.net>2021-05-20 19:44:24 +0200
commit85f40a45fe7b69075f031fc5a0d1cf5d139f529d (patch)
tree5c51c0458b68c5f8cba9f40566e4047a05daf5e2
parent688c899775e4207848cd72a848ebf181b9bf16b7 (diff)
Copy .id files back to output for .dmg builds.
-rwxr-xr-xcdist11
1 files changed, 9 insertions, 2 deletions
diff --git a/cdist b/cdist
index 626f408..f1322fb 100755
--- a/cdist
+++ b/cdist
@@ -840,6 +840,13 @@ class OSXSingleTarget(OSXTarget):
self.set('MACOSX_DEPLOYMENT_TARGET', self.deployment)
self.set('CCACHE_BASEDIR', self.directory)
+ def _copy_packages(self, tree, packages, output_dir):
+ for p in packages:
+ dest = os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))
+ copyfile(p, dest)
+ if os.path.exists(p + ".id"):
+ copyfile(p + ".id", dest + ".id")
+
@Target.ccache.setter
def ccache(self, v):
Target.ccache.fset(self, v)
@@ -874,8 +881,8 @@ class OSXUniversalTarget(OSXTarget):
self.unlock_keychain()
tree = globals.trees.get(project, checkout, self)
with TreeDirectory(tree):
- for p in self._cscript_package_and_notarize(tree, options, notarize):
- copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
+ p = self._cscript_package_and_notarize(tree, options, notarize)
+ self._copy_packages(tree, p, output_dir)
class SourceTarget(Target):
"""Build a source .tar.bz2"""