X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=4afb54700b77fb4d85bef22f2caf046740922a3f;hb=36971ecc260b46a4092a4ba3099c3e52e2d1b916;hp=a83857d0924aeb4860512eb842c19735f602eeed;hpb=bc26b3553f97ddb69998faa5f6d54c8c845f68a6;p=dcpomatic.git

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index a83857d09..4afb54700 100644
--- 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.
 
-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
@@ -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 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"
@@ -121,17 +118,27 @@ 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/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/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/fonts/fonts.conf.osx "$dest"/fonts.conf
     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; do
+    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 $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"
@@ -183,6 +190,20 @@ function make_dmg {
     mkdir -p $vol_name
     cp -a "$appdir" $vol_name
     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
 
     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
@@ -197,12 +218,14 @@ function make_dmg {
            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, 650, 370}
+           set the bounds of container window to {400, 200, 940, 300}
            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 "Applications" of container window to {220, 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