Seems over-complicated to use SDK-specific subdirectories.
[dcpomatic.git] / platform / osx / make_dmg.sh
index 5ebce17e11b3e93d51016df304a8b5d4ead7a241..9ba05ac96485846a00ecb7e303f6264a12f7edf3 100644 (file)
 #!/bin/bash
 #
-# Syntax: make_dmg.sh <builddir>
+SYNTAX="make_dmg.sh <environment> <builddir> <apple-id> <apple-password>"
 #
-# e.g. make_dmg.sh /Users/carl/cdist
+# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist foo@bar.net opensesame
 
 # Don't set -e here as egrep (used a few times) returns 1 if no matches
 # were found.
 
-version=`cat wscript | egrep ^VERSION | awk '{print $3}' | sed -e "s/'//g"`
+version=`git describe --tags --abbrev=0 | sed -e "s/v//"`
 
 # DMG size in megabytes
 DMG_SIZE=256
-WORK=build/platform/osx
-ENV=/Users/carl/Environments/osx/10.6
-ROOT=$1
-
-# Main application
-appdir="DCP-o-matic 2.app"
-approot="$appdir/Contents"
-libs="$approot/lib"
-macos="$approot/MacOS"
-resources="$approot/Resources"
-rm -rf "$WORK/$appdir"
-mkdir -p "$WORK/$macos"
-mkdir -p "$WORK/$libs"
-mkdir -p "$WORK/$resources"
-
-# KDM creator
-appdir_kdm="DCP-o-matic 2 KDM Creator.app"
-approot_kdm="$appdir_kdm/Contents"
-libs_kdm="$approot_kdm/lib"
-macos_kdm="$approot_kdm/MacOS"
-resources_kdm="$approot_kdm/Resources"
-rm -rf "$WORK/$appdir_kdm"
-mkdir -p "$WORK/$macos_kdm"
-
-# Server
-appdir_server="DCP-o-matic 2 Server.app"
-approot_server="$appdir_server/Contents"
-libs_server="$approot_server/lib"
-macos_server="$approot_server/MacOS"
-resources_server="$approot_server/Resources"
-rm -rf "$WORK/$appdir_server"
-mkdir -p "$WORK/$macos_server"
-
-# Batch converter
-appdir_batch="DCP-o-matic 2 Batch Converter.app"
-approot_batch="$appdir_batch/Contents"
-libs_batch="$approot_batch/lib"
-macos_batch="$approot_batch/MacOS"
-resources_batch="$approot_batch/Resources"
-rm -rf "$WORK/$appdir_batch"
-mkdir -p "$WORK/$macos_batch"
-
-relink="dcpomatic"
-
-function universal_copy {
-    for f in $1/32/$2; do
-        if [ -h $f ]; then
-           ln -s $(readlink $f) "$3/`basename $f`"
-        else
-            g=`echo $f | sed -e "s/\/32\//\/64\//g"`
-           mkdir -p "$3"
-            lipo -create $f $g -output "$3/`basename $f`"
-        fi
+ENV=$1
+ROOT=$2
+APPLE_ID=$3
+APPLE_PASSWORD=$4
+
+# This is our work area for making up the .dmgs
+mkdir -p build/platform/osx
+cd build/platform/osx
+
+cat <<EOF > entitlements.plist
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>com.apple.security.cs.disable-library-validation</key>
+  <true/>
+  <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+  <true/>
+</dict>
+</plist>
+EOF
+
+function copy {
+       for f in $1/arm64/$2; do
+               if [ -h $f ]; then
+                       ln -s $(readlink $f) "$3/`basename $f`"
+               else
+                       g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
+                       mkdir -p "$3"
+                       lipo -create $f $g -output "$3/`basename $f`"
+               fi
+       done
+}
+
+function copy_lib_root {
+       for f in $ROOT/arm64/lib/$1*.dylib; do
+               if [ -h $f ]; then
+                       ln -s $(readlink $f) "$2/`basename $f`"
+               else
+                       g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
+                       mkdir -p "$2"
+                       lipo -create $f $g -output "$2/`basename $f`"
+               fi
+       done
+    to_relink="$to_relink|$1"
+}
+
+function copy_lib_env {
+       for f in $ENV/arm64/lib/$1*.dylib; do
+               if [ -h $f ]; then
+                       ln -s $(readlink $f) "$2/`basename $f`"
+               else
+                       g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
+                       mkdir -p "$2"
+                       lipo -create $f $g -output "$2/`basename $f`"
+               fi
+       done
+    to_relink="$to_relink|$1"
+}
+
+# @param #1 directory to copy to
+function copy_libs {
+    local dest="$1"
+    copy_lib_root libcxml "$dest"
+    copy_lib_root libdcp-1.0 "$dest"
+    copy_lib_root libasdcp-carl "$dest"
+    copy_lib_root libkumu-carl "$dest"
+    copy_lib_root libsub "$dest"
+    copy_lib_root libopenjp2 "$dest"
+    copy_lib_root libavdevice "$dest"
+    copy_lib_root libavformat "$dest"
+    copy_lib_root libavfilter "$dest"
+    copy_lib_root libavutil "$dest"
+    copy_lib_root libavcodec "$dest"
+    copy_lib_root libswscale "$dest"
+    copy_lib_root libpostproc "$dest"
+    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"
+    copy_lib_env libboost_filesystem "$dest"
+    copy_lib_env libboost_thread "$dest"
+    copy_lib_env libboost_date_time "$dest"
+    copy_lib_env libboost_locale "$dest"
+    copy_lib_env libboost_regex "$dest"
+    copy_lib_env libxml++ "$dest"
+    copy_lib_env libxslt "$dest"
+    copy_lib_env libxml2 "$dest"
+    copy_lib_env libglibmm-2.4 "$dest"
+    copy_lib_env libgobject "$dest"
+    copy_lib_env libgthread "$dest"
+    copy_lib_env libgmodule "$dest"
+    copy_lib_env libsigc "$dest"
+    copy_lib_env libglib-2 "$dest"
+    copy_lib_env libintl "$dest"
+    copy_lib_env libsndfile "$dest"
+    copy_lib_env libssh "$dest"
+    copy_lib_env libwx "$dest"
+    copy_lib_env libfontconfig "$dest"
+    copy_lib_env libfreetype "$dest"
+    copy_lib_env libexpat "$dest"
+    copy_lib_env libltdl "$dest"
+    copy_lib_env libxmlsec1 "$dest"
+    copy_lib_env libcurl "$dest"
+    copy_lib_env libffi "$dest"
+    copy_lib_env libpango "$dest"
+    copy_lib_env libcairo "$dest"
+    copy_lib_env libpixman "$dest"
+    copy_lib_env libharfbuzz "$dest"
+    copy_lib_env libsamplerate "$dest"
+    copy_lib_env libicui18n "$dest"
+    copy_lib_env libicudata "$dest"
+    copy_lib_env libicuio "$dest"
+    copy_lib_env libicule "$dest"
+    copy_lib_env libiculx "$dest"
+    copy_lib_env libicutest "$dest"
+    copy_lib_env libicutu "$dest"
+    copy_lib_env libicuuc "$dest"
+    copy_lib_env libFLAC "$dest"
+    copy_lib_env libvorbis "$dest"
+    copy_lib_env libogg "$dest"
+    copy_lib_env libxerces-c "$dest"
+    copy_lib_env libcrypto "$dest"
+    copy_lib_env libssl "$dest"
+    copy_lib_env libfribidi "$dest"
+    copy_lib_env libgio "$dest"
+    copy_lib_env libz "$dest"
+}
+
+# @param #1 directory to copy to
+function copy_resources {
+    local dest="$1"
+       local prefix=$ROOT/x86_64
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
+    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_disk.icns "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/email.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/email@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/servers.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/servers@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/tms.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/tms@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/keys@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/sound@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/general.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/general@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/locations@2x.png "$dest"
+    cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
+    cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
+    cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"
+    cp $prefix/src/dcpomatic/fonts/fonts.conf.osx "$dest"/fonts.conf
+    cp $prefix/src/dcpomatic/graphics/splash.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/zoom.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/zoom_all.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/select.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/snap.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/sequence.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/me.jpg "$dest"
+    cp $prefix/src/dcpomatic/graphics/link.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/tick.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/no_tick.png "$dest"
+    cp -r $prefix/share/libdcp/xsd "$dest"
+    cp -r $prefix/share/libdcp/tags "$dest"
+
+    # i18n: DCP-o-matic .mo files
+    for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA zh_CN tr_TR; do
+       mkdir -p "$dest/$lang/LC_MESSAGES"
+       cp $prefix/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+       cp $prefix/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+       cp $prefix/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+    done
+
+    # i18n: wxWidgets .mo files
+    for lang in de es fr it sv nl ru pl da cs; do
+       mkdir "$dest/$lang"
+       cp $ENV/x86_64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
     done
 }
 
-function universal_copy_lib {
-    for f in $1/32/lib/$2*.dylib; do
-        if [ -h $f ]; then
-           ln -s $(readlink $f) "$3/`basename $f`"
-        else
-            g=`echo $f | sed -e "s/\/32\//\/64\//g"`
-           mkdir -p "$3"
-            lipo -create $f $g -output "$3/`basename $f`"
-        fi
+# param $1 list of things that link to other things
+function relink_relative {
+    to_relink=`echo $to_relink | sed -e "s/\+//g"`
+    local linkers=("$@")
+
+    for obj in "${linkers[@]}"; do
+       deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"`
+       changes=""
+       for dep in $deps; do
+           base=`basename $dep`
+               # $dep will be a path within x86_64; make arm64 path too
+               dep_arm64=`echo $dep | sed -e "s/\/x86_64\//\/arm64\//g"`
+               changes="$changes -change $dep @executable_path/../Frameworks/$base -change $dep_arm64 @executable_path/../Frameworks/$base"
+       done
+       if test "x$changes" != "x"; then
+           install_name_tool $changes -id `basename "$obj"` "$obj"
+       fi
     done
-    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_create "$WORK/$macos"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$WORK/$macos_kdm"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$WORK/$macos_server"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$WORK/$macos_batch"
-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_lib $ROOT libcxml "$WORK/$libs"
-universal_copy_lib $ROOT libdcp-1.0 "$WORK/$libs"
-universal_copy_lib $ROOT libasdcp-cth "$WORK/$libs"
-universal_copy_lib $ROOT libkumu-cth "$WORK/$libs"
-universal_copy_lib $ROOT libsub "$WORK/$libs"
-universal_copy_lib $ROOT libopenjp2 "$WORK/$libs"
-universal_copy_lib $ROOT libavdevice "$WORK/$libs"
-universal_copy_lib $ROOT libavformat "$WORK/$libs"
-universal_copy_lib $ROOT libavfilter "$WORK/$libs"
-universal_copy_lib $ROOT libavutil "$WORK/$libs"
-universal_copy_lib $ROOT libavcodec "$WORK/$libs"
-universal_copy_lib $ROOT libswscale "$WORK/$libs"
-universal_copy_lib $ROOT libpostproc "$WORK/$libs"
-universal_copy_lib $ROOT libswresample "$WORK/$libs"
-universal_copy $ROOT bin/ffprobe "$WORK/$macos"
-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 libboost_regex "$WORK/$libs"
-universal_copy_lib $ENV libxml++ "$WORK/$libs"
-universal_copy_lib $ENV libxslt "$WORK/$libs"
-universal_copy_lib $ENV libxml2 "$WORK/$libs"
-universal_copy_lib $ENV libglibmm-2.4 "$WORK/$libs"
-universal_copy_lib $ENV libgobject "$WORK/$libs"
-universal_copy_lib $ENV libgthread "$WORK/$libs"
-universal_copy_lib $ENV libgmodule "$WORK/$libs"
-universal_copy_lib $ENV libsigc "$WORK/$libs"
-universal_copy_lib $ENV libglib-2 "$WORK/$libs"
-universal_copy_lib $ENV libintl "$WORK/$libs"
-universal_copy_lib $ENV libsndfile "$WORK/$libs"
-universal_copy_lib $ENV libMagick++ "$WORK/$libs"
-universal_copy_lib $ENV libMagickCore "$WORK/$libs"
-universal_copy_lib $ENV libMagickWand "$WORK/$libs"
-universal_copy_lib $ENV libssh "$WORK/$libs"
-universal_copy_lib $ENV libwx "$WORK/$libs"
-universal_copy_lib $ENV libfontconfig "$WORK/$libs"
-universal_copy_lib $ENV libfreetype "$WORK/$libs"
-universal_copy_lib $ENV libexpat "$WORK/$libs"
-universal_copy_lib $ENV libltdl "$WORK/$libs"
-universal_copy_lib $ENV libxmlsec1 "$WORK/$libs"
-universal_copy_lib $ENV libzip "$WORK/$libs"
-universal_copy_lib $ENV libquickmail "$WORK/$libs"
-universal_copy_lib $ENV libcurl "$WORK/$libs"
-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"
-universal_copy_lib $ENV libsamplerate "$WORK/$libs"
-universal_copy_lib $ENV libicui18n "$WORK/$libs"
-universal_copy_lib $ENV libicudata "$WORK/$libs"
-universal_copy_lib $ENV libicuio "$WORK/$libs"
-universal_copy_lib $ENV libicule "$WORK/$libs"
-universal_copy_lib $ENV libiculx "$WORK/$libs"
-universal_copy_lib $ENV libicutest "$WORK/$libs"
-universal_copy_lib $ENV libicutu "$WORK/$libs"
-universal_copy_lib $ENV libicuuc "$WORK/$libs"
-universal_copy_lib $ENV libFLAC "$WORK/$libs"
-universal_copy_lib $ENV libvorbis "$WORK/$libs"
-universal_copy_lib $ENV libogg "$WORK/$libs"
-
-relink=`echo $relink | sed -e "s/\+//g"`
-
-for obj in \
-    "$WORK/$macos/dcpomatic2" \
-    "$WORK/$macos/dcpomatic2_cli" \
-    "$WORK/$macos/dcpomatic2_server_cli" \
-    "$WORK/$macos_kdm/dcpomatic2_kdm" \
-    "$WORK/$macos_server/dcpomatic2_server" \
-    "$WORK/$macos_batch/dcpomatic2_batch" \
-    "$WORK/$macos/ffprobe" \
-    "$WORK/$libs/"*.dylib; do
-  deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost|libicu)"`
-  changes=""
-  for dep in $deps; do
-      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
+# param $1 directory things should be relinked into
+#       $2 list of things that link to other things
+function relink_absolute {
+    to_relink=`echo $to_relink | sed -e "s/\+//g"`
+    target=$1
+    shift
+    local linkers=("$@")
 
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$WORK/$approot/Info.plist"
-cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2.icns "$WORK/$resources/dcpomatic2.icns"
-cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_kdm.icns "$WORK/$resources/dcpomatic2_kdm.icns"
-cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server.icns "$WORK/$resources/dcpomatic2_server.icns"
-cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_batch.icns "$WORK/$resources/dcpomatic2_batch.icns"
-cp $ROOT/32/src/dcpomatic/graphics/colour_conversions.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/defaults.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/servers.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/tms.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/keys.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/splash.png "$WORK/$resources"
-cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server_small.png "$WORK/$resources"
-
-# i18n: DCP-o-matic .mo files
-for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA zh_CN; do
-  mkdir -p "$WORK/$resources/$lang/LC_MESSAGES"
-  cp $ROOT/32/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
-  cp $ROOT/32/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
-  cp $ROOT/32/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
-done
+    for obj in "${linkers[@]}"; do
+               deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu|libssh)"`
+               for dep in $deps; do
+                       base=`basename $dep`
+                       install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj"
+               done
+    done
+}
 
-# i18n: wxWidgets .mo files
-for lang in de es fr it sv nl ru pl da cs; do
-  mkdir "$WORK/$resources/$lang"
-  cp $ENV/64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$WORK/$resources/$lang"
-done
+function sign {
+    codesign --deep --force --verify --verbose --options runtime --entitlements entitlements.plist --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$1"
+    if [ "$?" != "0" ]; then
+       echo "Failed to sign $1"
+       exit 1
+    fi
+}
+
+
+# @param #1 .app directory
+# @param #2 .pkg or ""
+# @param #3 full name e.g. DCP-o-matic Batch Converter
+function make_dmg {
+    local appdir="$1"
+    local pkg="$2"
+    local full_name="$3"
+    tmp_dmg=dcpomatic_tmp.dmg
+    dmg="$full_name $version.dmg"
+    vol_name=DCP-o-matic-$version
+
+    sign "$appdir"
+
+    if [ "$pkg" != "" ]; then
+       productsign --sign "Developer ID Installer: Carl Hetherington (R82DXSR997)" "$pkg" "signed_temp.pkg"
+       if [ "$?" != "0" ]; then
+           echo "Failed to sign .pkg"
+           exit 1
+       fi
+       mv signed_temp.pkg "$pkg"
+    fi
+
+    mkdir -p $vol_name
+    cp -a "$appdir" $vol_name
+    if [ "$pkg" != "" ]; then
+        cp -a "$pkg" $vol_name
+    fi
+    ln -s /Applications "$vol_name/Applications"
+    cat<<EOF > "$vol_name/READ ME.txt"
+Welcome to DCP-o-matic!  The first time you run the program there may be
+a long (several-minute) delay while OS X checks the code for viruses and
+other malware.  Please be patient!
+EOF
+    cat<<EOF > "$vol_name/READ ME.de_DE.txt"
+Beim erstmaligen Start der DCP-o-matic Anwendungen kann ein längerer
+Verifikationsvorgang auftreten.  Dies ist von der OS X Sicherheitsumgebung
+'Gatekeeper' verursacht.  Dieser je nach Rechner teils minutenlange
+Verifikationsvorgang ist gegenwärtig normal und nicht zu umgehen,
+es ist kein Programmfehler.  Warten sie die Verifikation für jede der
+DCP-o-matic Anwendungen ab, bei weiteren Programmstarts wird sie nicht
+mehr auftreten.
+EOF
+
+    if [ "$pkg" != "" ]; then
+        cat<<EOF > "$vol_name/READ ME.txt"
+
+To run this software successfully you must install $pkg before running
+the .app
+EOF
+    fi
+
+    if [ "$pkg" != "" ]; then
+        cat<<EOF > "$vol_name/READ ME.de_DE.txt"
 
-tmp_dmg=$WORK/dcpomatic_tmp.dmg
-dmg="$WORK/DCP-o-matic $version.dmg"
-vol_name=DCP-o-matic-$version
-
-mkdir -p $WORK/$vol_name
-cp -a "$WORK/$appdir" $WORK/$vol_name
-ln -s /Applications "$WORK/$vol_name/Applications"
-
-# KDM creator
-appdir_kdm="DCP-o-matic 2 KDM Creator.app"
-approot_kdm="$appdir_kdm/Contents"
-libs_kdm="$approot_kdm/lib"
-macos_kdm="$approot_kdm/MacOS"
-resources_kdm="$approot_kdm/Resources"
-ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
-ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot_kdm/Info.plist"
-cp -a "$WORK/$appdir_kdm" $WORK/$vol_name
-
-# Server
-appdir_server="DCP-o-matic 2 Server.app"
-approot_server="$appdir_server/Contents"
-libs_server="$approot_server/lib"
-macos_server="$approot_server/MacOS"
-resources_server="$approot_server/Resources"
-ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_server"
-ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_server"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_server.Info.plist "$WORK/$approot_server/Info.plist"
-cp -a "$WORK/$appdir_server" $WORK/$vol_name
-
-# Batch converter
-appdir_batch="DCP-o-matic 2 Batch Converter.app"
-approot_batch="$appdir_batch/Contents"
-libs_batch="$approot_batch/lib"
-macos_batch="$approot_batch/MacOS"
-resources_batch="$approot_batch/Resources"
-ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_batch"
-ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_batch"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$WORK/$approot_batch/Info.plist"
-cp -a "$WORK/$appdir_batch" $WORK/$vol_name
-
-rm -f $tmp_dmg "$dmg"
-hdiutil create -srcfolder $WORK/$vol_name -volname $vol_name -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size $DMG_SIZE $tmp_dmg
-attach=$(hdiutil attach -readwrite -noverify -noautoopen $tmp_dmg)
-device=`echo $attach | egrep '^/dev/' | sed 1q | awk '{print $5}'`
-sleep 5
-
-echo '
+To run this software successfully you must install $pkg before running
+the .app
+EOF
+
+    fi
+    rm -f $tmp_dmg "$dmg"
+    hdiutil create -srcfolder $vol_name -volname $vol_name -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size $DMG_SIZE $tmp_dmg
+    attach=$(hdiutil attach -readwrite -noverify -noautoopen $tmp_dmg)
+    device=`echo $attach | egrep '^/dev/' | sed 1q | awk '{print $5}'`
+    sleep 5
+
+    echo '
   tell application "Finder"
     tell disk "'$vol_name'"
            open
            set current view of container window to icon view
            set toolbar visible of container window to false
            set statusbar visible of container window to false
-           set the bounds of container window to {400, 200, 930, 610}
+           set the bounds of container window to {400, 200, 1160, 600}
+           set the bounds of container window to {400, 200, 1160, 600}
+           set the bounds of container window to {400, 200, 1160, 600}
            set theViewOptions to the icon view options of container window
            set arrangement of theViewOptions to not arranged
            set icon size of theViewOptions to 64
-           set position of item "DCP-o-matic 2.app" of container window to {90, 80}
-           set position of item "DCP-o-matic 2 KDM Creator.app" of container window to {270, 80}
-           set position of item "DCP-o-matic 2 Server.app" of container window to {90, 200}
-           set position of item "DCP-o-matic 2 Batch Converter.app" of container window to {270, 200}
-           set position of item "Applications" of container window to {450, 80}
+           set position of item "'$appdir'" of container window to {90, 80}
+           set position of item "Applications" of container window to {265, 80}
+           set position of item "READ ME.txt" of container window to {430, 80}
+           set position of item "READ ME.de_DE.txt" of container window to {595, 80}
+           set position of item "DCP-o-matic Disk Writer.pkg" of container window to {90, 255}
            close
            open
            update without registering applications
@@ -280,12 +351,189 @@ echo '
    end tell
 ' | osascript
 
-chmod -Rf go-w /Volumes/"$vol_name"/"$appdir"
-sync
+    chmod -Rf go-w /Volumes/"$vol_name"/"$appdir"
+    sync
+
+    hdiutil eject $device
+    hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg"
+    sips -i "$appdir/Contents/Resources/dcpomatic2.icns"
+    DeRez -only icns "$appdir/Contents/Resources/dcpomatic2.icns" > "$appdir/Contents/Resources/DCP-o-matic.rsrc"
+    Rez -append "$appdir/Contents/Resources/DCP-o-matic.rsrc" -o "$dmg"
+    SetFile -a C "$dmg"
+    xattr -c "$dmg"
+
+    set -e
+    codesign --verify --verbose --options runtime --entitlements entitlements.plist --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg"
+    set +e
+
+    rm $tmp_dmg
+    rm -rf $vol_name
+}
+
+# @param #1 appdir
+function setup {
+    appdir="$1"
+    approot="$appdir/Contents"
+    rm -rf "$appdir"
+    mkdir -p "$approot/MacOS"
+    mkdir -p "$approot/Frameworks"
+    mkdir -p "$approot/Resources"
+
+    to_relink="dcpomatic"
+    copy_libs "$approot/Frameworks"
+    copy_resources "$approot/Resources"
+}
+
+prefix=$ROOT/arm64
+
+# DCP-o-matic main
+setup "DCP-o-matic 2.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$approot/MacOS"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$approot/MacOS"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_create "$approot/MacOS"
+copy $ROOT bin/ffprobe "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2" "$approot/MacOS/dcpomatic2_cli" "$approot/MacOS/dcpomatic2_create" "$approot/MacOS/ffprobe" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic"
+
+# DCP-o-matic KDM Creator
+setup "DCP-o-matic 2 KDM Creator.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$approot/MacOS"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_kdm" "$approot/MacOS/dcpomatic2_kdm_cli" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic KDM Creator"
+
+# DCP-o-matic Encode Server
+setup "DCP-o-matic 2 Encode Server.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$approot/MacOS"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_server.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_server" "$approot/MacOS/dcpomatic2_server_cli" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic Encode Server"
+
+# DCP-o-matic Batch Converter
+setup "DCP-o-matic 2 Batch converter.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_batch" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic Batch Converter"
+
+# DCP-o-matic Player
+setup "DCP-o-matic 2 Player.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_player.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_player" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic Player"
+
+# DCP-o-matic Playlist Editor
+setup "DCP-o-matic 2 Playlist Editor.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_playlist "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_playlist.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_playlist" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic Playlist Editor"
+
+# DCP-o-matic Combiner
+setup "DCP-o-matic 2 Combiner.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_combiner "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_combiner.Info.plist "$approot/Info.plist"
+rl=("$approot/MacOS/dcpomatic2_combiner" "$approot/Frameworks/"*.dylib)
+relink_relative "${rl[@]}"
+make_dmg "$appdir" "" "DCP-o-matic Combiner"
+
+# 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/platform/osx/uninstall_disk.applescript "$approot/Resources"
+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[@]}"
+
+# DCP-o-matic Disk Writer daemon .pkg
+
+pkgbase=tmp-disk-writer
+rm -rf $pkgbase
+mkdir $pkgbase
+pkgbin=$pkgbase/bin
+pkgroot=$pkgbase/root
+
+mkdir -p $pkgroot/Library/LaunchDaemons
+cat > $pkgroot/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.dcpomatic.disk.writer</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>/Library/Application Support/com.dcpomatic/dcpomatic2_disk_writer</string>
+    </array>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>DYLD_LIBRARY_PATH</key>
+        <string><![CDATA[/Library/Application Support/com.dcpomatic]]></string>
+    </dict>
+    <key>StandardOutPath</key>
+    <string>/var/log/dcpomatic_disk_writer_out.log</string>
+    <key>StandardErrorPath</key>
+    <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
+
+# Get the binaries together in $pkgbin then move them to the
+# place with spaces in the filename to avoid some of the pain of escaping
+
+mkdir $pkgbin
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk_writer "$pkgbin"
+copy_libs "$pkgbin"
+
+rl=("$pkgbin/dcpomatic2_disk_writer" "$pkgbin/"*.dylib)
+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
+chmod gou+x $pkgbase/scripts/postinstall
+
+find "$pkgbin" -iname "*.dylib" -print0 | while IFS= read -r -d '' f; do
+    sign "$f"
+done
+sign "$pkgbin/dcpomatic2_disk_writer"
+
+mkdir -p "$pkgroot/Library/Application Support/com.dcpomatic"
+mv $pkgbin/* "$pkgroot/Library/Application Support/com.dcpomatic/"
+pkgbuild --root $pkgroot --identifier com.dcpomatic.disk.writer --scripts $pkgbase/scripts "DCP-o-matic Disk Writer.pkg"
+
+make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer"
 
-hdiutil eject $device
-hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg"
-sips -i "$WORK/$resources/dcpomatic2.icns"
-DeRez -only icns "$WORK/$resources/dcpomatic2.icns" > "$WORK/$resources/DCP-o-matic.rsrc"
-Rez -append "$WORK/$resources/DCP-o-matic.rsrc" -o "$dmg"
-SetFile -a C "$dmg"