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 universal' % target.directory)
+ target.command('bash platform/osx/make_dmg.sh %s %s universal' % (target.environment_prefix, target.directory))
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 thin' % target.directory)
+ target.command('bash platform/osx/make_dmg.sh %s %s thin' % (target.environment_prefix, target.directory))
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')
#!/bin/bash
#
-# Syntax: make_dmg.sh <builddir> <type>
+# Syntax: make_dmg.sh <environment> <builddir> <type>
# where <type> is universal or thin
#
-# e.g. make_dmg.sh /Users/carl/cdist
+# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal
# Don't set -e here as egrep (used a few times) returns 1 if no matches
# were found.
# DMG size in megabytes
DMG_SIZE=256
-ENV=/Users/carl/Environments/dcpomatic
-ROOT=$1
-TYPE=$2
+ENV=$1
+ROOT=$2
+TYPE=$3
if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then
echo "Syntax: $0 <builddir> <type>"