Change internal name dist -> disk.

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

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6877d577a0a3fc76b1eeb5539eb1dacd71705517..a052128443183f8d2953484a1d8263ae031e4949 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -123,6 +123,7 @@ function copy_libs {
     copy_lib_root libpostproc "$dest"
     copy_lib_root libswresample "$dest"
     copy_lib_root liblwext4 "$dest"
+    copy_lib_root libblockdev "$dest"
     copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$dest"
     copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$dest"
     copy_lib_env libboost_system "$dest"
@@ -168,7 +169,7 @@ function copy_libs {
     copy_lib_env libvorbis "$dest"
     copy_lib_env libogg "$dest"
     copy_lib_env libxerces-c "$dest"
-    copy_liv_env libnanomsg "$dest"
+    copy_lib_env libnanomsg "$dest"
 }
 
 # @param #1 directory to copy to
@@ -189,7 +190,7 @@ function copy_resources {
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_player.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_playlist.icns "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_dist.icns "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/colour_conversions.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest"
@@ -450,11 +451,11 @@ make_dmg "$appdir" "DCP-o-matic Playlist Editor" com.dcpomatic.playlist
 
 # DCP-o-matic Disk Writer
 setup "DCP-o-matic 2 Disk Writer.app"
-copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_dist "$approot/MacOS"
-copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_dist_writer "$approot/MacOS"
-cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_dist.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2_dist" "$approot/Frameworks/"*.dylib)
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk_writer "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_disk.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_disk" "$approot/Frameworks/"*.dylib)
 relink "${rl[@]}"
-rl=("$approot/MacOS/dcpomatic2_dist_writer" "$approot/Frameworks/"*.dylib)
+rl=("$approot/MacOS/dcpomatic2_disk_writer" "$approot/Frameworks/"*.dylib)
 relink "${rl[@]}"
-make_dmg "$appdir" "DCP-o-matic Disk Writer" com.dcpomatic.dist
+make_dmg "$appdir" "DCP-o-matic Disk Writer" com.dcpomatic.disk