The Disk Writer also needs openssl as creating its Config object

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

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 7b8ff8507ba8bdb09433f70a3cf6962d7f24e100..dfac33d4618f18f3b37d91d68c34b13a479b2329 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 #
-SYNTAX="make_dmg.sh <environment> <builddir> <type> <disk> <apple-id> <apple-password>"
+SYNTAX="make_dmg.sh <environment> <builddir> <type> <apple-id> <apple-password>"
 # where <type> is universal or thin
-#       <disk> is yes or no
 #
-# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal yes foo@bar.net opensesame
+# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal foo@bar.net opensesame
 
 # Don't set -e here as egrep (used a few times) returns 1 if no matches
 # were found.
@@ -16,9 +15,8 @@ DMG_SIZE=256
 ENV=$1
 ROOT=$2
 TYPE=$3
-DISK=$4
-APPLE_ID=$5
-APPLE_PASSWORD=$6
+APPLE_ID=$4
+APPLE_PASSWORD=$5
 
 if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then
     echo $SYNTAX
@@ -26,12 +24,6 @@ if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then
     exit 1
 fi
 
-if [ "$DISK" != "yes" -a "$DISK" != "no" ]; then
-    echo $SYNTAX
-    echo "where <disk> is yes or no"
-    exit 1
-fi
-
 # This is our work area for making up the .dmgs
 mkdir -p build/platform/osx
 cd build/platform/osx
@@ -132,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"
@@ -511,11 +504,10 @@ rl=("$approot/MacOS/dcpomatic2_playlist" "$approot/Frameworks/"*.dylib)
 relink_relative "${rl[@]}"
 make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" com.dcpomatic.playlist
 
-if [ "$DISK" == "yes" ]; then
-
 # 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[@]}"
@@ -552,9 +544,9 @@ cat > $pkgroot/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist <<EOF
     <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>
 </dict>
 </plist>
 EOF
@@ -588,5 +580,3 @@ pkgbuild --root $pkgroot --identifier com.dcpomatic.disk.writer --scripts $pkgba
 
 make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer" com.dcpomatic.disk
 
-fi
-