#!/usr/bin/python3
-# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
import inspect
import multiprocessing
import os
+from pathlib import Path
import platform
import re
import shlex
import tempfile
import time
-TEMPORARY_DIRECTORY = '/var/tmp'
-
class Error(Exception):
def __init__(self, value):
self.value = value
Option('osx_environment_prefix'),
Option('osx_sdk_prefix'),
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'),
BoolOption('docker_no_user'),
Option('docker_hub_repository'),
Option('flatpak_state_dir'),
- Option('parallel', multiprocessing.cpu_count()) ]
+ Option('parallel', multiprocessing.cpu_count()),
+ Option('temp', '/var/tmp')]
config_dir = '%s/.config' % os.path.expanduser('~')
if not os.path.exists(config_dir):
def command(c):
log_normal(c)
try:
- r = subprocess.run(shlex.split(c))
+ r = subprocess.run(c, shell=True)
if r.returncode != 0:
- raise Error(f'command {c} failed ({r.returncode})')
+ raise Error('command %s failed (%d)' % (c, r.returncode))
except Exception as e:
- raise Error(f'command {c} failed ({e})')
+ raise Error('command %s failed (%s)' % (c, e))
def command_and_read(c):
log_normal(c)
self.build_dependencies = True
if directory is None:
- self.directory = tempfile.mkdtemp('', 'tmp', TEMPORARY_DIRECTORY)
+ self.directory = tempfile.mkdtemp('', 'tmp', config.get('temp'))
self.rmdir = True
self.set('CCACHE_BASEDIR', os.path.realpath(self.directory))
self.set('CCACHE_NOHASHDIR', '')
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:
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):
self.privileged = True
-def notarize(dmg, bundle_id):
+def notarize_dmg(dmg, bundle_id):
p = subprocess.run(
['xcrun', 'altool', '--notarize-app', '-t', 'osx', '-f', dmg, '--primary-bundle-id', bundle_id, '-u', config.get('apple_id'), '-p', config.get('apple_password'), '--output-format', 'xml'],
capture_output=True
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')
for i in range(0, 30):
- print('Checking up on %s' % request_uuid)
+ print('%s: checking up on %s' % (datetime.datetime.now(), request_uuid))
p = subprocess.run(['xcrun', 'altool', '--notarization-info', request_uuid, '-u', config.get('apple_id'), '-p', config.get('apple_password'), '--output-format', 'xml'], capture_output=True)
status = string_after(p, 'Status')
- print('Got %s' % status)
+ print('%s: got status %s' % (datetime.datetime.now(), status))
if status == 'invalid':
raise Error("Notarization failed")
elif status == 'success':
subprocess.run(['xcrun', 'stapler', 'staple', dmg])
return
+ elif status != "in progress":
+ print("Could not understand xcrun response")
+ print(p)
time.sleep(30)
raise Error("Notarization timed out")
class OSXTarget(Target):
def __init__(self, directory=None):
super(OSXTarget, self).__init__('osx', directory)
- self.sdk = config.get('osx_sdk')
self.sdk_prefix = config.get('osx_sdk_prefix')
self.environment_prefix = config.get('osx_environment_prefix')
self.apple_id = config.get('apple_id')
def command(self, c):
command('%s %s' % (self.variables_string(False), c))
- def build(self, *a, **k):
+ def unlock_keychain(self):
self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file))
- return super().build(*a, **k)
+
+ 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
+ """
+ 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])
+ 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, bits, directory=None):
+ def __init__(self, arch, sdk, deployment, directory=None, can_notarize=True):
super(OSXSingleTarget, self).__init__(directory)
- self.bits = bits
-
- if bits == 32:
- arch = 'i386'
+ 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)
+ if arch == 'x86_64':
+ host_enviro = '%s/x86_64/%s' % (config.get('osx_environment_prefix'), deployment)
else:
- arch = 'x86_64'
+ host_enviro = '%s/x86_64/10.10' % config.get('osx_environment_prefix')
+ target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, deployment)
- flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, self.sdk, arch)
- enviro = '%s/%d' % (config.get('osx_environment_prefix'), bits)
+ self.bin = '%s/bin' % target_enviro
# Environment variables
- self.set('CFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, enviro, flags))
+ 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, enviro, flags))
- self.set('LDFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, enviro, flags))
- self.set('LINKFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, enviro, flags))
- self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/lib/pkgconfig:/usr/lib/pkgconfig' % (self.directory, enviro))
- self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % enviro)
- self.set('MACOSX_DEPLOYMENT_TARGET', config.get('osx_sdk'))
+ 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)
+ self.set('MACOSX_DEPLOYMENT_TARGET', self.deployment)
self.set('CCACHE_BASEDIR', self.directory)
@Target.ccache.setter
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)
- 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(x[0], x[1])
- self._copy_packages(tree, [x[0] for x in p], output_dir)
+ self.unlock_keychain()
+ p = self._cscript_package_and_notarize(tree, options, self.can_notarize and notarize)
+ self._copy_packages(tree, p, output_dir)
class OSXUniversalTarget(OSXTarget):
def __init__(self, directory=None):
super(OSXUniversalTarget, self).__init__(directory)
- self.bits = None
-
- def package(self, project, checkout, output_dir, options, no_notarize):
-
- for b in [32, 64]:
- target = OSXSingleTarget(b, os.path.join(self.directory, '%d' % b))
+ self.sdk = config.get('osx_sdk')
+ 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, 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):
- if len(inspect.getfullargspec(tree.cscript['package']).args) == 3:
- packages = tree.call('package', tree.version, options)
- else:
- log_normal("Deprecated cscript package() method with no options parameter")
- packages = tree.call('package', tree.version)
- for p in packages:
- 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"""
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')
# or centos-version-{32,64}
# or fedora-version-{32,64}
# or mageia-version-{32,64}
-# or osx-{32,64}
+# or osx
# or source
# or flatpak
# or appimage
target = LinuxTarget(p[0], None, int(p[1]), args.work)
elif s == 'raspbian':
target = LinuxTarget(s, None, None, args.work)
- elif s.startswith('osx-'):
- target = OSXSingleTarget(int(s.split('-')[1]), args.work)
elif s == 'osx':
- if args.command == 'build':
- target = OSXSingleTarget(64, args.work)
- else:
- target = OSXUniversalTarget(args.work)
+ 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
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()
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()