Merge branch '1.0' into 1.0-seek

[dcpomatic.git] / platform / osx / make_dmg.sh

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 19f42816b1b91d38746f4b0bece75621b1b056fb..6d0ce484c5cfaff8df38557a9194dea77fbef99c 100644 (file)
--- 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
@@ -77,13 +81,19 @@ universal_copy $ENV lib/libfreetype*.dylib $WORK/$libs
 universal_copy $ENV lib/libexpat*.dylib $WORK/$libs
 universal_copy $ENV lib/libltdl*.dylib $WORK/$libs
 universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs
+universal_copy $ENV lib/libzip*.dylib $WORK/$libs
+universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs
+universal_copy $ENV lib/libcurl*.dylib $WORK/$libs
+universal_copy $ENV lib/libffi*.dylib $WORK/$libs
 
 for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do
   deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl)"`
   changes=""
   for dep in $deps; do
     base=`basename $dep`
-    changes="$changes -change $dep @executable_path/../lib/$base"
+    # $dep will be a path within 64/; make a 32/ path too
+    dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
+    changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base"
   done
   if test "x$changes" != "x"; then
     install_name_tool $changes $obj
@@ -131,7 +141,6 @@ echo '
 chmod -Rf go-w /Volumes/"$vol_name"/$appdir
 sync
 
-umount -f $device
 hdiutil eject $device
 hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg"
 sips -i $WORK/$resources/DCP-o-matic.icns