diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-01 22:16:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-04 10:48:59 +0100 |
| commit | c39b290f02f49b68a3eb928fe1109cc7f6bf59eb (patch) | |
| tree | a6351ae29a9d070689fcee8f3a736a22193d9141 /cscript | |
| parent | a46d7383cf217c22a93b6cb7b94fb1d23913aff6 (diff) | |
Support for arm64 macOS builds.
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -431,7 +431,10 @@ def configure_options(target, options): opt += ' --static-dcpomatic' if can_build_disk(target): - opt += ' --enable-disk' + opt += ' --enable-disk' + + if target.platform == 'osx' and target.arch == 'arm64': + opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin return opt @@ -685,11 +688,14 @@ def package(target, version, options): return package_debian(target, cpu, version, options) elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': return package_rpm(target, cpu, version, options) - elif target.platform == 'osx' and target.bits is None: - target.command('bash platform/osx/make_dmg.sh %s %s universal no %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) + elif target.platform == 'osx' and hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')): + target.command('bash platform/osx/make_dmg.sh %s %s arm-intel-64 %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) + return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] + elif target.platform == 'osx' and hasattr(target, 'archs') and sorted(target.archs) == sorted(('i386', 'x86_64')): + target.command('bash platform/osx/make_dmg.sh %s %s intel-32-64 %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] - elif target.platform == 'osx' and target.bits == 64: - target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) + elif target.platform == 'osx' and hasattr(target, 'arch') and target.arch == 'arm64': + target.command('bash platform/osx/make_dmg.sh %s %s arm64 %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x) |