-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_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 libopenjpeg "$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 libswresample "$WORK/$libs"
-universal_copy_lib $ROOT libpostproc "$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 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"
-
-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)" | egrep ($ENV|$ROOT)`
- 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
-
-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"
-
-# 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"
-done
-
-# i18n: wxWidgets .mo files
-for lang in de es fr it sv nl; do
- mkdir "$WORK/$resources/$lang"
- cp $ENV/64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$WORK/$resources/$lang"
-done
-
-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"
-
-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 '
+# @param #1 directory to copy to
+function copy_resources {
+ local dest="$1"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/colour_conversions.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/servers.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/tms.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/keys.png "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest"
+ cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
+ cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
+ cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"
+ cp $ROOT/32/src/dcpomatic/graphics/splash.png "$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; do
+ mkdir -p "$dest/$lang/LC_MESSAGES"
+ cp $ROOT/32/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+ cp $ROOT/32/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+ cp $ROOT/32/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/64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
+ done
+}
+
+# param $1 list of things that link to other things
+function relink {
+ 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)"`
+ changes=""
+ for dep in $deps; do
+ 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 .app directory
+# @param #2 full name e.g. DCP-o-matic Batch Converter
+function make_dmg {
+ local appdir="$1"
+ local full_name="$2"
+ tmp_dmg=dcpomatic_tmp.dmg
+ dmg="$full_name $version.dmg"
+ vol_name=DCP-o-matic-$version
+
+ mkdir -p $vol_name
+ cp -a "$appdir" $vol_name
+ ln -s /Applications "$vol_name/Applications"
+
+ 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 '