Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

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

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 766b9af91d04d132f025dc3a3dcfc1f6ab68a343..513ae75eae564d5df694a1a0bdb1fabbe33d872e 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -7,7 +7,7 @@
 # Don't set -e here as egrep (used a few times) returns 1 if no matches
 # were found.
 
 # 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
 
 # DMG size in megabytes
 DMG_SIZE=256


@@ -79,9 +79,6 @@ function copy_libs {
     universal_copy_lib $ENV libglib-2 "$dest"
     universal_copy_lib $ENV libintl "$dest"
     universal_copy_lib $ENV libsndfile "$dest"
     universal_copy_lib $ENV libglib-2 "$dest"
     universal_copy_lib $ENV libintl "$dest"
     universal_copy_lib $ENV libsndfile "$dest"

-    universal_copy_lib $ENV libMagick++ "$dest"
-    universal_copy_lib $ENV libMagickCore "$dest"
-    universal_copy_lib $ENV libMagickWand "$dest"

     universal_copy_lib $ENV libssh "$dest"
     universal_copy_lib $ENV libwx "$dest"
     universal_copy_lib $ENV libfontconfig "$dest"
     universal_copy_lib $ENV libssh "$dest"
     universal_copy_lib $ENV libwx "$dest"
     universal_copy_lib $ENV libfontconfig "$dest"


@@ -121,14 +118,23 @@ function copy_resources {
     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/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/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/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/graphics/osx/preferences/notifications.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/accounts.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/preferences/locations.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"
     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"

+    cp $ROOT/32/src/dcpomatic/graphics/zoom.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/zoom_all.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/select.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/snap.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/sequence.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 ar_LB fi_FI el_GR; do
 
     # 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 ar_LB fi_FI el_GR; do


@@ -187,6 +193,15 @@ function make_dmg {
 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!
 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
 
     rm -f $tmp_dmg "$dmg"
 EOF
 
     rm -f $tmp_dmg "$dmg"


@@ -197,7 +212,7 @@ EOF
 
     echo '
   tell application "Finder"
 
     echo '
   tell application "Finder"

-    tell disk "$vol_name"
+    tell disk "'$vol_name'"

            open
            set current view of container window to icon view
            set toolbar visible of container window to false
            open
            set current view of container window to icon view
            set toolbar visible of container window to false


@@ -206,9 +221,10 @@ EOF
            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 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 "$appdir" of container window to {90, 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 "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}

            close
            open
            update without registering applications
            close
            open
            update without registering applications