diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-20 23:38:57 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-20 23:38:57 +0200 |
| commit | 749c7b0098feb893c2a11012eb889fda0043666d (patch) | |
| tree | 2c2960533e17cf3fded908424d67d07749d640aa | |
| parent | 6dc179f7d08477ecc7bac1257b47dda048a1b878 (diff) | |
Remove hard-coded environment location in OS X build.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -640,10 +640,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 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') diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 9b1dd0e0e..f944e6eab 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,9 +1,9 @@ #!/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. @@ -12,9 +12,9 @@ version=`git describe --tags --abbrev=0 | sed -e "s/v//"` # 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>" |