diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-30 12:32:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-04 10:48:59 +0100 |
| commit | 96a468738d4619745fdaf252f64cd06ca8491a96 (patch) | |
| tree | d72422d6e43e8597c4def2a2b23b9e75f32a6a2a /cscript | |
| parent | 081ea9b56086ff46339c1918e2df1e33addb8b0b (diff) | |
Fix macOS image construction stuff for the 64-bit only, 10.9-or-higher world.
Now we can build:
- arm64/x86_64 universal builds against 11.0
- x86_64 thin builds against 10.9
Which means no more support for 32-bit macOS (which I think excludes
macs made in 2011 or earlier) or for 10.8 (Mountain Lion) or earlier
(released in 2012 and possibly end-of-lifed in October 2015).
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -688,14 +688,16 @@ 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 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 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)) + elif target.platform == 'osx': + name = '' + if hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')): + name = 'arm-intel' + elif hasattr(target, 'arch'): + if target.arch == 'x86_64': + name = 'intel' + elif target.arch == 'arm64': + name = 'arm' + target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s %s' % (target.environment_prefix, target.directory, name, target.sdk, target.apple_id, target.apple_password)) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x) |