Formatting tweaks to unmount dialogue.

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

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 5e44fc56d773503e3b599111dcc7e9535b274180..1cff3b5bbafd9579e10e4709d68efc88ee977189 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -124,6 +124,7 @@ function copy_libs {
     copy_lib_root libswresample "$dest"
     copy_lib_root liblwext4 "$dest"
     copy_lib_root libblockdev "$dest"
+    copy_lib_root libleqm_nrt "$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"
@@ -506,6 +507,7 @@ make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" com.dcpomatic.playlist
 # DCP-o-matic Disk Writer .app
 setup "DCP-o-matic 2 Disk Writer.app"
 copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$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_relative "${rl[@]}"
@@ -535,16 +537,21 @@ cat > $pkgroot/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist <<EOF
         <key>DYLD_LIBRARY_PATH</key>
         <string><![CDATA[/Library/Application Support/com.dcpomatic]]></string>
     </dict>
-    <key>KeepAlive</key>
-    <true/>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>Debug</key>
-    <true/>
     <key>StandardOutPath</key>
-    <string>/Users/carl/damon.out.log</string>
+    <string>/var/log/dcpomatic_disk_writer_out.log</string>
     <key>StandardErrorPath</key>
-    <string>/Users/carl/damon.err.log</string>
+    <string>/var/log/dcpomatic_disk_writer_err.log</string>
+    <key>LaunchEvents</key>
+    <dict>
+        <key>com.apple.notifyd.matching</key>
+        <dict>
+            <key>com.dcpomatic.disk.writer.start</key>
+            <dict>
+                <key>Notification</key>
+                <string>com.dcpomatic.disk.writer.start</string>
+            </dict>
+        </dict>
+    </dict>
 </dict>
 </plist>
 EOF
@@ -562,6 +569,7 @@ relink_absolute "/Library/Application Support/com.dcpomatic" "${rl[@]}"
 mkdir $pkgbase/scripts
 cat > $pkgbase/scripts/postinstall <<EOF
 #!/bin/sh
+/bin/launchctl unload "/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist"
 /bin/launchctl load "/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist"
 exit 0
 EOF