#!/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
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:
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'),
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)
request_uuid = string_after(p, "RequestUUID")
if request_uuid is None:
print("Looking for upload ID")
- message = string_after("message")
+ message = string_after(p, "message")
print("Looking in %s" % message)
if message:
m = re.match('.*The upload ID is ([0-9a-f\-]*)', message)
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)
+ 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
if notarize:
notarize_dmg(x[0], x[1])
else:
- with open(dmg + '.id', 'w') as f:
- print(x[1], out=f)
+ 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"""
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))))
+ copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.commit, p))))
# @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':
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
command('git 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)
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
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)
if args.target is None:
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 = target_factory(args)
+ 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 == 'manual':
target = SourceTarget()
tree = globals.trees.get(args.project, args.checkout, target)
+ tree.checkout_dependencies()
outs = tree.call('make_manual')
for o in outs: