summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-04-07 14:09:46 +0200
committerCarl Hetherington <cth@carlh.net>2020-04-07 19:53:02 +0200
commit44f044061a4a4dfc8f2ad50a118710815b596d1e (patch)
treee2ea1304a5412fe1c062c240c1ed2ac7e16f0e2c /cscript
parentddccef68ae80bac6b4aa8583dd8e0a7c943b535c (diff)
Fix non-disk packaging on macOS.
Diffstat (limited to 'cscript')
-rw-r--r--cscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/cscript b/cscript
index c01c99457..aeddb1cdd 100644
--- a/cscript
+++ b/cscript
@@ -674,10 +674,10 @@ def package(target, 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 %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+ 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))
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))
+ target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s %s' % (target.environment_prefix, target.directory, "yes" if options['disk'] else "no", 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')