import inspect
import multiprocessing
import os
+from pathlib import Path
import platform
import re
import shlex
Option('osx_sdk'),
Option('osx_intel_deployment'),
Option('osx_arm_deployment'),
+ Option('osx_old_deployment'),
Option('osx_keychain_file'),
Option('osx_keychain_password'),
Option('apple_id'),
return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
request_uuid = string_after(p, "RequestUUID")
+ if request_uuid is None:
+ print("Looking for upload ID")
+ message = string_after(p, "message")
+ print("Looking in %s" % message)
+ if message:
+ m = re.match('.*The upload ID is ([0-9a-f\-]*)', message)
+ if m:
+ request_uuid = m.groups()[0]
if request_uuid is None:
print("Response: %s" % p)
raise Error('No RequestUUID found in response from Apple')
def unlock_keychain(self):
self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file))
+ 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")
+
def _cscript_package_and_notarize(self, tree, options, notarize):
"""
Call package() in the cscript and notarize the .dmgs that are returned, if notarize == True
raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
if notarize:
notarize_dmg(x[0], x[1])
+ else:
+ with open(x[0] + '.id', 'w') as f:
+ print(x[1], file=f)
return [x[0] for x in p]
class OSXSingleTarget(OSXTarget):
- def __init__(self, arch, sdk, deployment, directory=None):
+ def __init__(self, arch, sdk, deployment, directory=None, can_notarize=True):
super(OSXSingleTarget, self).__init__(directory)
self.arch = arch
self.sdk = sdk
self.deployment = deployment
+ self.can_notarize = can_notarize
+ self.sub_targets = [self]
flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, sdk, arch)
- host_enviro = '%s/x86_64' % config.get('osx_environment_prefix')
- target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), arch)
+ if arch == 'x86_64':
+ host_enviro = '%s/x86_64/%s' % (config.get('osx_environment_prefix'), deployment)
+ else:
+ host_enviro = '%s/x86_64/10.10' % config.get('osx_environment_prefix')
+ target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, deployment)
self.bin = '%s/bin' % target_enviro
# Environment variables
self.set('CFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, target_enviro, flags))
self.set('CPPFLAGS', '')
- self.set('CXXFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, target_enviro, flags))
- self.set('LDFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, target_enviro, flags))
+ self.set('CXXFLAGS', '"-I%s/include -I%s/include -stdlib=libc++ %s"' % (self.directory, target_enviro, flags))
+ self.set('LDFLAGS', '"-L%s/lib -L%s/lib -stdlib=libc++ %s"' % (self.directory, target_enviro, flags))
self.set('LINKFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, target_enviro, flags))
self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/lib/pkgconfig:/usr/lib/pkgconfig' % (self.directory, target_enviro))
self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % host_enviro)
tree = self.build(project, checkout, options)
tree.add_defaults(options)
self.unlock_keychain()
- p = self._cscript_package_and_notarize(tree, options, notarize)
+ p = self._cscript_package_and_notarize(tree, options, self.can_notarize and notarize)
self._copy_packages(tree, p, output_dir)
def __init__(self, directory=None):
super(OSXUniversalTarget, self).__init__(directory)
self.sdk = config.get('osx_sdk')
-
- def package(self, project, checkout, output_dir, options, notarize):
+ self.sub_targets = []
for arch, deployment in (('x86_64', config.get('osx_intel_deployment')), ('arm64', config.get('osx_arm_deployment'))):
- target = OSXSingleTarget(arch, self.sdk, deployment, os.path.join(self.directory, arch))
+ target = OSXSingleTarget(arch, self.sdk, deployment, os.path.join(self.directory, arch, deployment))
target.ccache = self.ccache
+ self.sub_targets.append(target)
+
+ def package(self, project, checkout, output_dir, options, notarize):
+ for target in self.sub_targets:
tree = globals.trees.get(project, checkout, target)
tree.build_dependencies(options)
tree.build(options)
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"""
target = OSXUniversalTarget(args.work)
elif s == 'osx-intel':
target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_intel_deployment'), args.work)
+ elif s == 'osx-old':
+ target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_old_deployment'), args.work, False)
elif s == 'source':
target = SourceTarget()
elif s == 'flatpak':
parser_checkout = subparsers.add_parser("checkout", help="check out the project")
parser_revision = subparsers.add_parser("revision", help="print the head git revision number")
parser_dependencies = subparsers.add_parser("dependencies", help="print details of the project's dependencies as a .dot file")
+ parser_notarize = subparsers.add_parser("notarize", help="notarize .dmgs in a directory using *.dmg.id files")
+ parser_notarize.add_argument('--dmgs', help='directory containing *.dmg and *.dmg.id')
global args
args = parser.parse_args()
if not os.path.exists(args.work):
os.makedirs(args.work)
- if args.project is None and args.command != 'shell':
+ if args.project is None and not args.command in ['shell', 'notarize']:
raise Error('you must specify -p or --project')
globals.quiet = args.quiet
elif args.command == 'manual':
target = SourceTarget()
tree = globals.trees.get(args.project, args.checkout, target)
+ tree.checkout_dependencies()
outs = tree.call('make_manual')
for o in outs:
print("%s -> %s;" % (d[2].name.replace("-", "-"), d[0].name.replace("-", "_")))
print("}")
+ elif args.command == 'notarize':
+ if args.dmgs is None:
+ raise Error('you must specify ---dmgs')
+
+ for dmg in Path(args.dmgs).glob('*.dmg'):
+ id = None
+ try:
+ with open(str(dmg) + '.id') as f:
+ id = f.readline().strip()
+ except OSError:
+ raise Error('could not find ID file for %s' % dmg)
+ notarize_dmg(dmg, id)
try:
main()
projects / cdist.git / blobdiff