Merge master.

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

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 7a5e8b2512bb9aa178f70efdd9124d302f325787..a14f3cf8c3ad41ccac515dd90c6b0aae0227ad78 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -109,15 +109,14 @@ universal_copy_lib $ENV libcairo "$WORK/$libs"
 relink=`echo $relink | sed -e "s/\+//g"`
 
 for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
-  deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)"`
+  deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
   changes=""
   for dep in $deps; do
-      if [ ! -h "$dep" ]; then
-          base=`basename $dep`
-          # $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"
-      fi
+      echo "Relinking $dep into $obj"
+      base=`basename $dep`
+      # $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"
@@ -135,10 +134,10 @@ cp icons/keys.png "$WORK/$resources"
 
 # i18n: DCP-o-matic .mo files
 for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
-  mkdir "$WORK/$resources/$lang"
-  cp build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang"
-  cp build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang"
-  cp build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang"
+  mkdir -p "$WORK/$resources/$lang/LC_MESSAGES"
+  cp build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
 done
 
 # i18n: wxWidgets .mo files
@@ -152,7 +151,7 @@ dmg="$WORK/DCP-o-matic $version.dmg"
 vol_name=DCP-o-matic-$version
 
 mkdir -p $WORK/$vol_name
-cp -ar "$WORK/$appdir" $WORK/$vol_name
+cp -a "$WORK/$appdir" $WORK/$vol_name
 ln -s /Applications "$WORK/$vol_name/Applications"
 
 rm -f $tmp_dmg "$dmg"