X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cdist;h=c0ff509e6bb6abe521f8d1303d351bb7eb45c511;hb=451350d26e443a3d6a488e49029f848d4ba92ce4;hp=c28825e839323906d706e8adaba2f7d4a12355f5;hpb=b3d6fc83e07fcd5475708362c9247af2e4d22123;p=cdist.git diff --git a/cdist b/cdist index c28825e..c0ff509 100755 --- a/cdist +++ b/cdist @@ -111,7 +111,8 @@ class Config: Option('git_reference'), Option('osx_environment_prefix'), Option('osx_sdk_prefix'), - Option('osx_sdk'), + Option('osx_intel_sdk'), + Option('osx_arm_sdk'), Option('osx_keychain_file'), Option('osx_keychain_password'), Option('apple_id'), @@ -425,7 +426,11 @@ class Target(object): def setup(self): pass - def _build_packages(self, tree, options): + def _cscript_package(self, tree, options): + """ + Call package() in the cscript and return what it returns, except that + anything not in a list will be put into one. + """ if len(inspect.getfullargspec(tree.cscript['package']).args) == 3: packages = tree.call('package', tree.version, options) else: @@ -438,10 +443,10 @@ class Target(object): 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_notarize): + 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) + p = self._cscript_package(tree, options) self._copy_packages(tree, p, output_dir) def build(self, project, checkout, options): @@ -742,6 +747,7 @@ def notarize_dmg(dmg, bundle_id): request_uuid = string_after(p, "RequestUUID") if request_uuid is None: + print("Response: %s" % p) raise Error('No RequestUUID found in response from Apple') for i in range(0, 30): @@ -778,6 +784,18 @@ class OSXTarget(Target): def unlock_keychain(self): self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file)) + def _cscript_package_and_notarize(self, tree, options, notarize): + """ + Call package() in the cscript and notarize the .dmgs that are returned, if notarize == True + """ + p = self._cscript_package(tree, options) + 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 notarize: + notarize_dmg(x[0], x[1]) + return [x[0] for x in p] + class OSXSingleTarget(OSXTarget): def __init__(self, arch, sdk, directory=None): @@ -809,33 +827,23 @@ class OSXSingleTarget(OSXTarget): self.set('CC', '"ccache gcc"') self.set('CXX', '"ccache g++"') - def package(self, project, checkout, output_dir, options, no_notarize): + def package(self, project, checkout, output_dir, options, notarize): tree = self.build(project, checkout, options) tree.add_defaults(options) self.unlock_keychain() - p = self._build_packages(tree, options) - 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_notarize: - notarize_dmg(x[0], x[1]) - self._copy_packages(tree, [x[0] for x in p], output_dir) + p = self._cscript_package_and_notarize(tree, options, notarize) + self._copy_packages(tree, p, output_dir) class OSXUniversalTarget(OSXTarget): - def __init__(self, archs, directory=None): + def __init__(self, directory=None): super(OSXUniversalTarget, self).__init__(directory) - self.archs = archs - - def package(self, project, checkout, output_dir, options, no_notarize): + self.intel_sdk = config.get('osx_intel_sdk') + self.arm_sdk = config.get('osx_arm_sdk') - sdk = config.get('osx_sdk') - for a in self.archs: - if a.find('arm') != -1: - sdk = '11.0' - - for a in self.archs: - target = OSXSingleTarget(a, sdk, os.path.join(self.directory, a)) + def package(self, project, checkout, output_dir, options, notarize): + for arch, sdk in (('x86_64', self.intel_sdk), ('arm64', self.arm_sdk)): + target = OSXSingleTarget(arch, sdk, os.path.join(self.directory, arch)) target.ccache = self.ccache tree = globals.trees.get(project, checkout, target) tree.build_dependencies(options) @@ -844,8 +852,7 @@ class OSXUniversalTarget(OSXTarget): self.unlock_keychain() tree = globals.trees.get(project, checkout, self) with TreeDirectory(tree): - self._build_packages(tree, options) - for p in packages: + 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)))) class SourceTarget(Target): @@ -860,7 +867,7 @@ class SourceTarget(Target): def cleanup(self): rmtree(self.directory) - def package(self, project, checkout, output_dir, options, no_notarize): + 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') @@ -875,7 +882,7 @@ class SourceTarget(Target): # or centos-version-{32,64} # or fedora-version-{32,64} # or mageia-version-{32,64} -# or osx-{intel,arm} +# or osx # or source # or flatpak # or appimage @@ -906,17 +913,8 @@ def target_factory(args): target = LinuxTarget(p[0], None, int(p[1]), args.work) elif s == 'raspbian': target = LinuxTarget(s, None, None, args.work) - elif s == 'osx-intel-32-64': - # Universal Intel 32/64-bit built for config's os_sdk - if args.command == 'build': - target = OSXSingleTarget('x86_64', args.work) - else: - target = OSXUniversalTarget(('i386', 'x86_64'), args.work) - elif s == 'osx-arm-intel-64': - # Universal arm64 and Intel 64-bit built for SDK 11.0 - target = OSXUniversalTarget(('arm64', 'x86_64'), args.work) - elif s == 'osx-arm64': - target = OSXSingleTarget('arm64', '11.0', args.work) + elif s == 'osx': + target = OSXUniversalTarget(args.work) elif s == 'source': target = SourceTarget() elif s == 'flatpak': @@ -1231,7 +1229,7 @@ def main(): 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()