From 79c182e2b427de682396640a24eba2deed4ea281 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 26 Dec 2020 21:58:07 +0100 Subject: [PATCH] more cscript hacks. --- cscript | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cscript b/cscript index cd8d814b5..7253cf142 100644 --- a/cscript +++ b/cscript @@ -688,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 hasattr(target, 'archs'): - 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, 'arch'): - 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, '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)) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x) -- 2.30.2