diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-02-20 16:25:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-20 22:39:17 +0100 |
| commit | 0adbc0c5ff395b75e7696341896f0e223d115df5 (patch) | |
| tree | e1924204fb98709df0bf2c9ea70f29cee2be53f7 /cscript | |
| parent | 30e2e5feda0319f9c3209bb0871cbd4e3357151e (diff) | |
Allow macOS builds against 10.6 (universal) or 10.9 (thin).
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net> +# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net> # # This file is part of DCP-o-matic. # @@ -640,8 +640,11 @@ 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': - target.command('bash platform/osx/make_dmg.sh %s %s' % (target.environment_prefix, target.directory)) + elif target.platform == 'osx' and target.bits is None: + target.command('bash platform/osx/make_dmg.sh %s %s universal %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)) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] elif target.platform == 'docker': shutil.copyfile(target.deb, 'build/platform/docker') |