summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
Diffstat (limited to 'cscript')
-rw-r--r--cscript9
1 files changed, 6 insertions, 3 deletions
diff --git a/cscript b/cscript
index d165b0aef..23e5eed6d 100644
--- a/cscript
+++ b/cscript
@@ -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')