diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-29 21:58:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-29 21:58:17 +0100 |
| commit | 179830dcb881b99e7f1a5b9527f7889602ee548e (patch) | |
| tree | 83eb2eac477971cfd1b5b762098ca48574ac7d4c | |
| parent | ba04eca99ebe17f139b2bcf3d9997c57dfeaeeb2 (diff) | |
Attempt to fix total breakage of OS X build.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -641,7 +641,7 @@ 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': - target.command('bash platform/osx/make_dmg.sh %s' % target.directory) + target.command('bash platform/osx/make_dmg.sh %s %s' % (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 5b9f187f1..21db560ba 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,8 +1,8 @@ #!/bin/bash # -# Syntax: make_dmg.sh <builddir> +# Syntax: make_dmg.sh <environment> <builddir> # -# e.g. make_dmg.sh /Users/carl/cdist +# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist # Don't set -e here as egrep (used a few times) returns 1 if no matches # were found. @@ -11,8 +11,8 @@ version=`git describe --tags --abbrev=0 | sed -e "s/v//"` # DMG size in megabytes DMG_SIZE=256 -ENV=/Users/carl/Environments/dcpomatic -ROOT=$1 +ENV=$1 +ROOT=$2 # This is our work area for making up the .dmgs mkdir -p build/platform/osx |