summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-29 11:14:14 +0000
committerCarl Hetherington <cth@carlh.net>2013-10-29 11:14:14 +0000
commit8d31298c71df875d88e9f22061645d54309875eb (patch)
tree7d651d73709aa1505a6e32675bb95d1d12eeb234
parentfc5f541024dbc8269714dfb28384b41e1d97cb61 (diff)
Try to allow OSX builds with any prefix.
-rw-r--r--cscript2
-rw-r--r--platform/osx/make_dmg.sh6
2 files changed, 6 insertions, 2 deletions
diff --git a/cscript b/cscript
index 199066581..b6088e0cb 100644
--- a/cscript
+++ b/cscript
@@ -59,7 +59,7 @@ def package(target, version):
return debs
elif target.platform == 'osx':
- target.command('bash platform/osx/make_dmg.sh')
+ target.command('bash platform/osx/make_dmg.sh %s' % target.work_dir_cscript())
return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
def make_pot(target):
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index ad53b8801..5554249f2 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -1,4 +1,8 @@
#!/bin/bash
+#
+# Syntax: make_dmg.sh <builddir>
+#
+# e.g. make_dmg.sh /Users/carl/cdist
set -e
@@ -8,7 +12,7 @@ version=`cat wscript | egrep ^VERSION | awk '{print $3}' | sed -e "s/'//g"`
DMG_SIZE=256
WORK=build/platform/osx
ENV=/Users/carl/Environments/osx
-ROOT=/Users/carl/cdist
+ROOT=$1
appdir="DCP-o-matic.app"
approot=$appdir/Contents