projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
688c899
)
Copy .id files back to output for .dmg builds.
author
Carl Hetherington
<cth@carlh.net>
Thu, 20 May 2021 17:44:24 +0000
(19:44 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 20 May 2021 17:44:24 +0000
(19:44 +0200)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index 626f408f2daa890c43044606cfd974ee7002223e..f1322fb3cb1dde713049433abdaf2791874469a2 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-840,6
+840,13
@@
class OSXSingleTarget(OSXTarget):
self.set('MACOSX_DEPLOYMENT_TARGET', self.deployment)
self.set('CCACHE_BASEDIR', self.directory)
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)
@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):
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"""
class SourceTarget(Target):
"""Build a source .tar.bz2"""