X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=93af4f3342e75d155d6fd9ab8a1ebbc68f6d47e4;hb=449227ac8c0314ed2484f2f311628bb2828c0884;hp=1289ac574b8dc16b3585c2211f5409af503bb84e;hpb=8b2d460f1b76d3d1122cfdb2a6a33e6eab7cece4;p=dcpomatic.git diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 1289ac574..93af4f334 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,4 +1,8 @@ #!/bin/bash +# +# Syntax: make_dmg.sh +# +# e.g. make_dmg.sh /Users/carl/cdist set -e @@ -7,8 +11,8 @@ version=`cat wscript | egrep ^VERSION | awk '{print $3}' | sed -e "s/'//g"` # DMG size in megabytes DMG_SIZE=256 WORK=build/platform/osx -ENV=/Users/carl/Environments/osx -ROOT=/Users/carl/cdist +ENV=/Users/carl/Environments/osx/10.6 +ROOT=$1 appdir="DCP-o-matic.app" approot=$appdir/Contents @@ -34,11 +38,12 @@ function universal_copy { done } -universal_copy $ROOT src/dvdomatic/build/src/tools/dcpomatic $WORK/$macos -universal_copy $ROOT src/dvdomatic/build/src/tools/dcpomatic_cli $WORK/$macos -universal_copy $ROOT src/dvdomatic/build/src/tools/dcpomatic_server_cli $WORK/$macos -universal_copy $ROOT src/dvdomatic/build/src/lib/libdcpomatic.dylib $WORK/$libs -universal_copy $ROOT src/dvdomatic/build/src/wx/libdcpomatic-wx.dylib $WORK/$libs +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic $WORK/$macos +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_cli $WORK/$macos +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_server_cli $WORK/$macos +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic_batch $WORK/$macos +universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic.dylib $WORK/$libs +universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic-wx.dylib $WORK/$libs universal_copy $ROOT lib/libcxml.dylib $WORK/$libs universal_copy $ROOT lib/libdcp.dylib $WORK/$libs universal_copy $ROOT lib/libasdcp-libdcp.dylib $WORK/$libs @@ -50,7 +55,6 @@ universal_copy $ROOT lib/libavfilter*.dylib $WORK/$libs universal_copy $ROOT lib/libavutil*.dylib $WORK/$libs universal_copy $ROOT lib/libavcodec*.dylib $WORK/$libs universal_copy $ROOT lib/libswscale*.dylib $WORK/$libs -universal_copy $ROOT lib/libpostproc*.dylib $WORK/$libs universal_copy $ROOT lib/libswresample*.dylib $WORK/$libs universal_copy $ROOT bin/ffprobe $WORK/$macos universal_copy $ENV lib/libboost_system.dylib $WORK/$libs @@ -77,14 +81,20 @@ universal_copy $ENV lib/libfreetype*.dylib $WORK/$libs universal_copy $ENV lib/libexpat*.dylib $WORK/$libs universal_copy $ENV lib/libltdl*.dylib $WORK/$libs universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs -universal_copy $ENV lib/libltdl*.dylib $WORK/$libs - -for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do - deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh)"` +universal_copy $ENV lib/libzip*.dylib $WORK/$libs +universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs +universal_copy $ENV lib/libcurl*.dylib $WORK/$libs +universal_copy $ENV lib/libffi*.dylib $WORK/$libs +universal_copy $ENV lib/libiconv*.dylib $WORK/$libs + +for obj in $WORK/$macos/dcpomatic $WORK/$macos/dcpomatic_batch $WORK/$macos/dcpomatic_cli $WORK/$macos/dcpomatic_server_cli $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do + deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl|libxmlsec)"` changes="" for dep in $deps; do base=`basename $dep` - changes="$changes -change $dep @executable_path/../lib/$base" + # $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 @@ -93,20 +103,33 @@ 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 + +# i18n: .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 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 -r $WORK/$appdir $WORK/$vol_name +ln -s /Applications $WORK/$vol_name/Applications rm -f $tmp_dmg "$dmg" -hdiutil create -megabytes $DMG_SIZE $tmp_dmg -device=$(hdid -nomount $tmp_dmg | grep Apple_HFS | cut -f 1 -d ' ') -newfs_hfs -v ${vol_name} $device -mount -t hfs "$device" $WORK/$vol_name - -cp -r $WORK/$appdir $WORK/$vol_name +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 ' tell application "Finder" @@ -119,21 +142,19 @@ echo ' set theViewOptions to the icon view options of container window set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 64 - make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} set position of item "DCP-o-matic.app" of container window to {90, 80} set position of item "Applications" of container window to {310, 80} close open update without registering applications delay 5 - eject end tell end tell ' | osascript +chmod -Rf go-w /Volumes/"$vol_name"/$appdir sync -umount -f $device hdiutil eject $device hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg" sips -i $WORK/$resources/DCP-o-matic.icns