#!/usr/bin/python3
-# Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2022 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
from pathlib import Path
import platform
import re
+import signal
import shlex
import shutil
import subprocess
def __init__(self):
self.trees = []
- def get(self, name, specifier, target, required_by=None):
+ def get(self, name, commit_ish, target, required_by=None):
for t in self.trees:
- if t.name == name and t.specifier == specifier and t.target == target:
+ if t.name == name and t.commit_ish == commit_ish and t.target == target:
return t
- elif t.name == name and t.specifier != specifier:
- a = specifier if specifier is not None else "[Any]"
+ elif t.name == name and t.commit_ish != commit_ish:
+ a = commit_ish if commit_ish is not None else "[Any]"
if required_by is not None:
a += ' by %s' % required_by
- b = t.specifier if t.specifier is not None else "[Any]"
+ b = t.commit_ish if t.commit_ish is not None else "[Any]"
if t.required_by is not None:
b += ' by %s' % t.required_by
raise Error('conflicting versions of %s required (%s versus %s)' % (name, a, b))
- nt = Tree(name, specifier, target, required_by)
+ nt = Tree(name, commit_ish, target, required_by)
self.trees.append(nt)
return nt
- def add_built(self, name, specifier, target):
- self.trees.append(Tree(name, specifier, target, None, built=True))
+ def add_built(self, name, commit_ish, target):
+ self.trees.append(Tree(name, commit_ish, target, None, built=True))
class Globals:
# Configuration
#
-class Option(object):
+class Option:
def __init__(self, key, default=None):
self.key = key
self.value = default
if key == self.key:
self.value = value
-class BoolOption(object):
+class BoolOption:
def __init__(self, key):
self.key = key
self.value = False
def offer(self, key, value):
if key == self.key:
- self.value = (value == 'yes' or value == '1' or value == 'true')
+ self.value = value in ['yes', '1', 'true']
class Config:
def __init__(self):
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'),
Option('apple_password'),
+ Option('apple_team_id'),
BoolOption('docker_sudo'),
BoolOption('docker_no_user'),
Option('docker_hub_repository'),
Option('flatpak_state_dir'),
Option('parallel', multiprocessing.cpu_count()),
- Option('temp', '/var/tmp')]
+ Option('temp', '/var/tmp'),
+ Option('osx_notarytool', ['xcrun', 'notarytool'])]
config_dir = '%s/.config' % os.path.expanduser('~')
if not os.path.exists(config_dir):
print('Template config file written to %s; please edit and try again.' % config_file, file=sys.stderr)
sys.exit(1)
- try:
- f = open('%s/.config/cdist' % os.path.expanduser('~'), 'r')
- while True:
- l = f.readline()
- if l == '':
- break
-
- if len(l) > 0 and l[0] == '#':
- continue
-
- s = l.strip().split()
- if len(s) == 2:
- for k in self.options:
- k.offer(s[0], s[1])
- except:
- raise
+ f = open('%s/.config/cdist' % os.path.expanduser('~'), 'r')
+ while True:
+ l = f.readline()
+ if l == '':
+ break
+
+ if len(l) > 0 and l[0] == '#':
+ continue
+
+ s = l.strip().split()
+ if len(s) == 2:
+ for k in self.options:
+ k.offer(s[0], s[1])
+
+ if not isinstance(self.get('osx_notarytool'), list):
+ self.set('osx_notarytool', [self.get('osx_notarytool')])
+
def has(self, k):
for o in self.options:
# Targets
#
-class Target(object):
+class Target:
"""
Class representing the target that we are building for. This is exposed to cscripts,
though not all of it is guaranteed 'API'. cscripts may expect:
def _copy_packages(self, tree, packages, output_dir):
for p in packages:
- copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
+ copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, p))))
def package(self, project, checkout, output_dir, options, notarize):
- tree = self.build(project, checkout, options)
+ tree = self.build(project, checkout, options, for_package=True)
tree.add_defaults(options)
p = self._cscript_package(tree, options)
self._copy_packages(tree, p, output_dir)
- def build(self, project, checkout, options):
+ def build(self, project, checkout, options, for_package=False):
tree = globals.trees.get(project, checkout, self)
if self.build_dependencies:
tree.build_dependencies(options)
- tree.build(options)
+ tree.build(options, for_package=for_package)
return tree
def test(self, project, checkout, target, test, options):
if self.privileged:
opts += '--privileged=true '
if self.ccache:
- opts += "-e CCACHE_DIR=/ccache/%s-%d --mount source=ccache,target=/ccache" % (self.image, os.getuid())
+ opts += "-e CCACHE_DIR=/ccache/%s-%d --mount source=ccache,target=/ccache " % (self.image, os.getuid())
+ opts += "--rm "
tag = self.image
if config.has('docker_hub_repository'):
tag = '%s:%s' % (config.get('docker_hub_repository'), tag)
+ def signal_handler(signum, frame):
+ raise Error('Killed')
+ signal.signal(signal.SIGTERM, signal_handler)
+
self.container = command_and_read('%s run %s %s -itd %s /bin/bash' % (config.docker(), self._user_tag(), opts, tag))[0].strip()
def command(self, cmd):
self.privileged = True
-def notarize_dmg(dmg, bundle_id):
+def notarize_dmg(dmg):
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
- )
-
- def string_after(process, key):
- lines = p.stdout.decode('utf-8').splitlines()
- for i in range(0, len(lines)):
- if lines[i].find(key) != -1:
- return lines[i+1].strip().replace('<string>', '').replace('</string>', '')
-
- 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):
- 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('%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")
+ config.get('osx_notarytool') + [
+ 'submit',
+ '--apple-id',
+ config.get('apple_id'),
+ '--password',
+ config.get('apple_password'),
+ '--team-id',
+ config.get('apple_team_id'),
+ '--wait',
+ dmg
+ ], capture_output=True)
+
+ last_line = [x.strip() for x in p.stdout.decode('utf-8').splitlines() if x.strip()][-1]
+ if last_line != 'status: Accepted':
+ print("Could not understand notarytool response")
+ print(p)
+ print(f"Last line: {last_line}")
+ raise Error('Notarization failed')
+
+ subprocess.run(['xcrun', 'stapler', 'staple', dmg])
class OSXTarget(Target):
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.commit, p)))
+ copyfile(p, dest)
+
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)')
+ output = []
+ for x in self._cscript_package(tree, options):
+ # Some older cscripts give us the DMG filename and the bundle ID, even though
+ # (since using notarytool instead of altool for notarization) the bundle ID
+ # is no longer necessary. Cope with either type of cscript.
+ dmg = x[0] if isinstance(x, tuple) else x
if notarize:
- notarize_dmg(x[0], x[1])
- else:
- with f as f.open(dmg + '.id', 'w'):
- print(out=f, x[1])
- return [x[0] for x in p]
+ notarize_dmg(dmg)
+ output.append(dmg)
+ return output
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)
self.set('CXX', '"ccache g++"')
def package(self, project, checkout, output_dir, options, notarize):
- tree = self.build(project, checkout, options)
+ tree = self.build(project, checkout, options, for_package=True)
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)
+ tree.build(options, for_package=True)
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"""
+ """Build a source .tar.bz2 and .zst"""
def __init__(self):
super(SourceTarget, self).__init__('source')
with TreeDirectory(tree):
name = read_wscript_variable(os.getcwd(), 'APPNAME')
command('./waf dist')
- p = os.path.abspath('%s-%s.tar.bz2' % (name, tree.version))
- copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
+ bz2 = os.path.abspath('%s-%s.tar.bz2' % (name, tree.version))
+ copyfile(bz2, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, bz2))))
+ command('tar xjf %s' % bz2)
+ command('tar --zstd -cf %s-%s.tar.zst %s-%s' % (name, tree.version, name, tree.version))
+ zstd = os.path.abspath('%s-%s.tar.zst' % (name, tree.version))
+ copyfile(zstd, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, zstd))))
# @param s Target string:
# windows-{32,64}
# or source
# or flatpak
# or appimage
-# @param debug True to build with debugging symbols (where possible)
def target_factory(args):
s = args.target
target = None
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':
# Tree
#
-class Tree(object):
+class Tree:
"""Description of a tree, which is a checkout of a project,
possibly built. This class is never exposed to cscripts.
Attributes:
name -- name of git repository (without the .git)
- specifier -- git tag or revision to use
+ commit_ish -- git tag or revision to use
target -- target object that we are using
version -- version from the wscript (if one is present)
- git_commit -- git revision that is actually being used
+ commit -- git revision that is actually being used
built -- true if the tree has been built yet in this run
required_by -- name of the tree that requires this one
"""
- def __init__(self, name, specifier, target, required_by, built=False):
+ def __init__(self, name, commit_ish, target, required_by, built=False):
self.name = name
- self.specifier = specifier
+ self.commit_ish = commit_ish
self.target = target
self.version = None
- self.git_commit = None
+ self.commit = None
self.built = built
self.required_by = required_by
ref = '--reference-if-able %s/%s.git' % (config.get('git_reference'), self.name)
else:
ref = ''
- command('git clone %s %s %s/%s.git %s/src/%s' % (flags, ref, config.get('git_prefix'), self.name, target.directory, self.name))
+ command('git -c protocol.file.allow=always clone %s %s %s/%s.git %s/src/%s' % (flags, ref, config.get('git_prefix'), self.name, target.directory, self.name))
os.chdir('%s/src/%s' % (target.directory, self.name))
- spec = self.specifier
- if spec is None:
- spec = 'master'
-
- command('git checkout %s %s %s' % (flags, spec, redirect))
- self.git_commit = command_and_read('git rev-parse --short=7 HEAD')[0].strip()
+ if self.commit_ish is not None:
+ command('git checkout %s %s %s' % (flags, self.commit_ish, redirect))
+ self.commit = command_and_read('git rev-parse --short=7 HEAD')[0].strip()
self.cscript = {}
exec(open('%s/cscript' % proj).read(), self.cscript)
if os.path.exists(ref_path):
ref = '--reference %s' % ref_path
path = path.split(' ')[1]
- command('git submodule --quiet update %s %s' % (ref, path))
+ command('git -c protocol.file.allow=always submodule --quiet update %s %s' % (ref, path))
if os.path.exists('%s/wscript' % proj):
v = read_wscript_variable(proj, "VERSION");
self.version = Version(v)
except:
try:
- tag = command_and_read('git -C %s describe --tags' % proj)[0][1:]
+ tag = command_and_read('git -C %s describe --match v* --tags' % proj)[0][1:]
self.version = Version.from_git_tag(tag)
except:
# We'll leave version as None if we can't read it; maybe this is a bad idea
for i in self.dependencies(options):
i[0].build(i[1])
- def build(self, options):
+ def build(self, options, for_package=False):
if self.built:
return
- log_verbose("Building %s %s %s with %s" % (self.name, self.specifier, self.version, options))
+ log_verbose("Building %s %s %s with %s" % (self.name, self.commit_ish, self.version, options))
variables = copy.copy(self.target.variables)
self.add_defaults(options)
if not globals.dry_run:
- if len(inspect.getfullargspec(self.cscript['build']).args) == 2:
+ num_args = len(inspect.getfullargspec(self.cscript['build']).args)
+ if num_args == 3:
+ self.call('build', options, for_package)
+ elif num_args == 2:
self.call('build', options)
else:
self.call('build')
#
def main():
-
- commands = {
- "build": "build project",
- "package": "build and package the project",
- "release": "release a project using its next version number (adding a tag)",
- "pot": "build the project's .pot files",
- "manual": "build the project's manual",
- "doxygen": "build the project's Doxygen documentation",
- "latest": "print out the latest version",
- "test": "build the project and run its unit tests",
- "shell": "start a shell in the project''s work directory",
- "checkout": "check out the project",
- "revision": "print the head git revision number",
- "dependencies" : "print details of the project's dependencies as a .dot file"
- }
-
- one_of = ""
- summary = ""
- for k, v in commands.items():
- one_of += "\t%s%s\n" % (k.ljust(20), v)
- summary += k + " "
-
parser = argparse.ArgumentParser()
parser.add_argument('-p', '--project', help='project name')
parser.add_argument('-c', '--checkout', help='string to pass to git for checkout')
parser_test = subparsers.add_parser("test", help="build the project and run its unit tests")
parser_test.add_argument('--no-implicit-build', help='do not build first', action='store_true')
parser_test.add_argument('--test', help="name of test to run, defaults to all")
- parser_shell = subparsers.add_parser("shell", help="build the project then start a shell")
+ parser_shell = subparsers.add_parser("shell", help="start a shell in the project's work directory")
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')
+ parser_notarize = subparsers.add_parser("notarize", help="notarize .dmgs in a directory")
+ parser_notarize.add_argument('--dmgs', help='directory containing *.dmg')
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
raise Error('you must specify -t or --target')
target = target_factory(args)
- target.build(args.project, args.checkout, get_command_line_options(args))
- if not args.keep:
- target.cleanup()
+ try:
+ target.build(args.project, args.checkout, get_command_line_options(args))
+ finally:
+ if not args.keep:
+ target.cleanup()
elif args.command == 'package':
if args.target is None:
makedirs(output_dir)
target.package(args.project, args.checkout, output_dir, get_command_line_options(args), not args.no_notarize)
- except Error as e:
+ finally:
if target is not None and not args.keep:
target.cleanup()
- raise
-
- if target is not None and not args.keep:
- target.cleanup()
elif args.command == 'release':
if args.minor is False and args.micro is False:
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:
elif args.command == 'notarize':
if args.dmgs is None:
raise Error('you must specify ---dmgs')
- if args.no_notarize:
- raise Error('it makes no sense to pass --no-notarize with the notarize command')
-
- for dmg in Path(args.dmgs).iter():
- id = None
- try:
- with open(dmg + '.id') as f:
- id = f.getline().strip()
- catch OSError:
- raise Error('could not find ID file for %s' % dmg)
- notarize_dmg(dmg, id)
+
+ for dmg in Path(args.dmgs).glob('*.dmg'):
+ notarize_dmg(dmg)
try:
main()
projects / cdist.git / blobdiff