Attempt to fix total breakage of OS X build.

diff --git a/cscript b/cscript
index 44e79f89a8a0a42140f96e81e99084fce07425dc..3781725e4f09a8428d058171d5b6e363062b3bc3 100644 (file)
--- a/cscript
+++ b/cscript
@@ -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 5b9f187f1a9cb9eb5568999602e801d500391607..21db560ba2fcef5d82c01b9f9386c5bf45b57417 100644 (file)
--- 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