#!/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
Option('git_reference'),
Option('osx_environment_prefix'),
Option('osx_sdk_prefix'),
- Option('osx_intel_sdk'),
- Option('osx_arm_sdk'),
+ Option('osx_sdk'),
+ Option('osx_intel_deployment'),
+ Option('osx_arm_deployment'),
Option('osx_keychain_file'),
Option('osx_keychain_password'),
Option('apple_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):
class OSXSingleTarget(OSXTarget):
- def __init__(self, arch, sdk, directory=None):
+ def __init__(self, arch, sdk, deployment, directory=None):
super(OSXSingleTarget, self).__init__(directory)
self.arch = arch
self.sdk = sdk
+ self.deployment = deployment
flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, sdk, arch)
- host_enviro = '%s/x86_64/10.9' % config.get('osx_environment_prefix')
- target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, sdk)
+ host_enviro = '%s/x86_64' % config.get('osx_environment_prefix')
+ target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), arch)
self.bin = '%s/bin' % target_enviro
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', sdk)
+ self.set('MACOSX_DEPLOYMENT_TARGET', self.deployment)
self.set('CCACHE_BASEDIR', self.directory)
@Target.ccache.setter
class OSXUniversalTarget(OSXTarget):
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):
- for arch, sdk in (('x86_64', config.get('osx_intel_sdk')), ('arm64', config.get('osx_arm_sdk'))):
- target = OSXSingleTarget(arch, sdk, os.path.join(self.directory, arch))
+ 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.ccache = self.ccache
tree = globals.trees.get(project, checkout, target)
tree.build_dependencies(options)