projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bd7e125
)
Fix packaging on arm64.
author
Carl Hetherington
<cth@carlh.net>
Sat, 26 Dec 2020 00:58:39 +0000
(
01:58
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 26 Dec 2020 00:58:39 +0000
(
01:58
+0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 0897a76109c181b4149dc13a875039569bce37bc..cd8d814b532ef8cb398bd56bc226364a8fbb8b9d 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-688,10
+688,10
@@
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)
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
target.bits is None
:
+ 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))
return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
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
:
+ 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))
packages = []
for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
target.command('bash platform/osx/make_dmg.sh %s %s thin %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'):