projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3d6fc8
)
Reverse the sense of a bunch of notarize variables.
author
Carl Hetherington
<cth@carlh.net>
Wed, 30 Dec 2020 00:35:10 +0000
(
01:35
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 30 Dec 2020 00:35:10 +0000
(
01:35
+0100)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index c28825e839323906d706e8adaba2f7d4a12355f5..f7094a076f3b2688b18581f44112bb070818ff5a 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-438,7
+438,7
@@
class Target(object):
for p in packages:
copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
for p in packages:
copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
- def package(self, project, checkout, output_dir, options, no
_no
tarize):
+ def package(self, project, checkout, output_dir, options, notarize):
tree = self.build(project, checkout, options)
tree.add_defaults(options)
p = self._build_packages(tree, options)
tree = self.build(project, checkout, options)
tree.add_defaults(options)
p = self._build_packages(tree, options)
@@
-809,7
+809,7
@@
class OSXSingleTarget(OSXTarget):
self.set('CC', '"ccache gcc"')
self.set('CXX', '"ccache g++"')
self.set('CC', '"ccache gcc"')
self.set('CXX', '"ccache g++"')
- def package(self, project, checkout, output_dir, options, no
_no
tarize):
+ def package(self, project, checkout, output_dir, options, notarize):
tree = self.build(project, checkout, options)
tree.add_defaults(options)
self.unlock_keychain()
tree = self.build(project, checkout, options)
tree.add_defaults(options)
self.unlock_keychain()
@@
-817,7
+817,7
@@
class OSXSingleTarget(OSXTarget):
for x in p:
if not isinstance(x, tuple):
raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
for x in p:
if not isinstance(x, tuple):
raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
- if not
no_not
arize:
+ if notarize:
notarize_dmg(x[0], x[1])
self._copy_packages(tree, [x[0] for x in p], output_dir)
notarize_dmg(x[0], x[1])
self._copy_packages(tree, [x[0] for x in p], output_dir)
@@
-827,7
+827,7
@@
class OSXUniversalTarget(OSXTarget):
super(OSXUniversalTarget, self).__init__(directory)
self.archs = archs
super(OSXUniversalTarget, self).__init__(directory)
self.archs = archs
- def package(self, project, checkout, output_dir, options, no
_no
tarize):
+ def package(self, project, checkout, output_dir, options, notarize):
sdk = config.get('osx_sdk')
for a in self.archs:
sdk = config.get('osx_sdk')
for a in self.archs:
@@
-860,7
+860,7
@@
class SourceTarget(Target):
def cleanup(self):
rmtree(self.directory)
def cleanup(self):
rmtree(self.directory)
- def package(self, project, checkout, output_dir, options, no
_no
tarize):
+ def package(self, project, checkout, output_dir, options, notarize):
tree = globals.trees.get(project, checkout, self)
with TreeDirectory(tree):
name = read_wscript_variable(os.getcwd(), 'APPNAME')
tree = globals.trees.get(project, checkout, self)
with TreeDirectory(tree):
name = read_wscript_variable(os.getcwd(), 'APPNAME')
@@
-1231,7
+1231,7
@@
def main():
output_dir = args.output
makedirs(output_dir)
output_dir = args.output
makedirs(output_dir)
- target.package(args.project, args.checkout, output_dir, get_command_line_options(args), args.no_notarize)
+ target.package(args.project, args.checkout, output_dir, get_command_line_options(args),
not
args.no_notarize)
except Error as e:
if target is not None and not args.keep:
target.cleanup()
except Error as e:
if target is not None and not args.keep:
target.cleanup()