summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-08 19:43:26 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-09 13:45:05 +0100
commitfa76c85e0e880edec684e4da5c5477939a3ac78d (patch)
tree4e2af0fa1b029b678e47d62fd51ec2a4ad670cd3
parentf7676516c26a28557947311750583e0e0f6ac706 (diff)
More OS X fixes.
-rw-r--r--platform/osx/make_dmg.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 274a5cfc1..6656a26da 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -21,6 +21,10 @@ approot="$appdir/Contents"
libs="$approot/lib"
macos="$approot/MacOS"
resources="$approot/Resources"
+rm -rf "$WORK/$appdir"
+mkdir -p "$WORK/$macos"
+mkdir -p "$WORK/$libs"
+mkdir -p "$WORK/$resources"
# KDM creator
appdir_kdm="DCP-o-matic 2 KDM Creator.app"
@@ -28,11 +32,8 @@ approot_kdm="$appdir_kdm/Contents"
libs_kdm="$approot_kdm/lib"
macos_kdm="$approot_kdm/MacOS"
resources_kdm="$approot_kdm/Resources"
-
-rm -rf "$WORK/$appdir"
-mkdir -p "$WORK/$macos"
-mkdir -p "$WORK/$libs"
-mkdir -p "$WORK/$resources"
+rm -rf "$WORK/$appdir_kdm"
+mkdir -p "$WORK/$macos_kdm"
relink="dcpomatic"
@@ -186,11 +187,9 @@ approot_kdm="$appdir_kdm/Contents"
libs_kdm="$approot_kdm/lib"
macos_kdm="$approot_kdm/MacOS"
resources_kdm="$approot_kdm/Resources"
-rm -rf "$WORK/$appdir_kdm"
-mkdir -p "$WORK/$macos_kdm"
-ln -s "../../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
-ln -s "../../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot/Info.plist"
+ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
+ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
+cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot_kdm/Info.plist"
cp -a "$WORK/$appdir_kdm" $WORK/$vol_name
rm -f $tmp_dmg "$dmg"