X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=3c338b3ab7f378e2055362a9688fe97c2ebedede;hb=8222e1fc7c8c66d31923b6155a68acf8b40dc33d;hp=638a66925ea54aafdb534b094ee1bfdcfc9a3780;hpb=59af71fa559ca4a8a36aadfe76efb7c5a47b8e09;p=dcpomatic.git diff --git a/cscript b/cscript index 638a66925..3c338b3ab 100644 --- a/cscript +++ b/cscript @@ -427,8 +427,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.23')) - deps.append(('libsub', 'v1.6.24')) + deps.append(('libdcp', 'v1.8.25')) + deps.append(('libsub', 'v1.6.28')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -768,8 +768,11 @@ 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': - archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets) - target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs)) + archs = '-a ' + ' -a '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets) + cmd = 'bash platform/osx/make_dmg.sh -e %s -r %s -i %s -p %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs) + if 'part' in options: + cmd += ' -b ' + options['part'] + target.command(cmd) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x)