X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=7221349f83e2fde0b6ba270272473e82b15d5b91;hb=3b9508cc17908cb51ac3ceaa9d72246ccfb6836e;hp=92d707d80e2685b2bed2fab67d3b0a7543927810;hpb=11b5c27024e0f03bd6d5026c12f0e151babd910d;p=dcpomatic.git

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 92d707d80..7221349f8 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -53,16 +53,19 @@ function universal_copy_lib {
     relink="$relink|$2"
 }
 
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$WORK/$macos"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$WORK/$macos"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$WORK/$macos"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$WORK/$macos"
-universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$WORK/$libs"
-universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$WORK/$libs"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2 "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2_cli "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2_server_cli "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/tools/dcpomatic2_batch "$WORK/$macos"
+universal_copy $ROOT src/dcpomatic2/build/src/lib/libdcpomatic2.dylib "$WORK/$libs"
+universal_copy $ROOT src/dcpomatic2/build/src/wx/libdcpomatic2-wx.dylib "$WORK/$libs"
 universal_copy_lib $ROOT libcxml "$WORK/$libs"
 universal_copy_lib $ROOT libdcp-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libasdcp-libdcp-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libkumu-libdcp-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libsub "$WORK/$libs"
+universal_copy_lib $ROOT libasdcp-libsub-1.0 "$WORK/$libs"
+universal_copy_lib $ROOT libkumu-libsub-1.0 "$WORK/$libs"
 universal_copy_lib $ROOT libopenjpeg "$WORK/$libs"
 universal_copy_lib $ROOT libavdevice "$WORK/$libs"
 universal_copy_lib $ROOT libavformat "$WORK/$libs"
@@ -77,6 +80,7 @@ universal_copy_lib $ENV libboost_system "$WORK/$libs"
 universal_copy_lib $ENV libboost_filesystem "$WORK/$libs"
 universal_copy_lib $ENV libboost_thread "$WORK/$libs"
 universal_copy_lib $ENV libboost_date_time "$WORK/$libs"
+universal_copy_lib $ENV libboost_locale "$WORK/$libs"
 universal_copy_lib $ENV libxml++ "$WORK/$libs"
 universal_copy_lib $ENV libxslt "$WORK/$libs"
 universal_copy_lib $ENV libxml2 "$WORK/$libs"
@@ -105,43 +109,42 @@ universal_copy_lib $ENV libffi "$WORK/$libs"
 universal_copy_lib $ENV libiconv "$WORK/$libs"
 universal_copy_lib $ENV libpango "$WORK/$libs"
 universal_copy_lib $ENV libcairo "$WORK/$libs"
+universal_copy_lib $ENV libpixman "$WORK/$libs"
+universal_copy_lib $ENV libharfbuzz "$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
-	  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"
-      else
-	  echo "Not relinking symlink $dep"
-      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"
   fi
 done
 
-cp build/platform/osx/Info.plist "$WORK/$approot"
-cp icons/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
-cp icons/colour_conversions.png "$WORK/$resources"
-cp icons/defaults.png "$WORK/$resources"
-cp icons/kdm_email.png "$WORK/$resources"
-cp icons/servers.png "$WORK/$resources"
-cp icons/tms.png "$WORK/$resources"
-cp icons/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/build/platform/osx/Info.plist "$WORK/$approot"
+cp $ROOT/32/src/dcpomatic2/icons/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns"
+cp $ROOT/32/src/dcpomatic2/icons/colour_conversions.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/defaults.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/kdm_email.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/servers.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/tms.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/icons/keys.png "$WORK/$resources"
+cp $ROOT/32/src/dcpomatic2/LiberationSans-Regular.ttf "$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 $ROOT/32/src/dcpomatic2/build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic2/build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
+  cp $ROOT/32/src/dcpomatic2/build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
 done
 
 # i18n: wxWidgets .mo files