X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=6f36839f77a10683000e3fcdbba754f63e532eb7;hb=47d83b296248119d04b9226fd51a67e2fd3faac5;hp=ee5cd3019a904311d2451b649e7dcaebabbeccf5;hpb=c432ef98c4cf3b2bda32734983eec3b42b8c3d1e;p=dcpomatic.git diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index ee5cd3019..6f36839f7 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -7,7 +7,14 @@ SYNTAX="make_dmg.sh # Don't set -e here as egrep (used a few times) returns 1 if no matches # were found. -version=`git describe --tags --abbrev=0 | sed -e "s/v//"` +# Use a tag if what we've built is exactly on one +version=$(git describe --tags --abbrev=0 --match=v2.*.* --exact-match 2> /dev/null) +if [ "$?" == "0" ]; then + version=$(echo $version | sed -e "s/^v//") +else + # Otherwise use - + version="$(basename $(git name-rev --name-only HEAD))-$(git rev-parse --short HEAD)" +fi # DMG size in megabytes DMG_SIZE=256 @@ -18,6 +25,9 @@ APPLE_PASSWORD=$4 ARCH1=$5 ARCH2=$6 +APPLICATION_IDENTITY="Developer ID Application: Carl Hetherington (R82DXSR997)" +INSTALLER_IDENTITY="Developer ID Installer: Carl Hetherington (R82DXSR997)" + # This is our work area for making up the .dmgs mkdir -p build/platform/osx cd build/platform/osx @@ -45,13 +55,13 @@ function copy { fi done else - for f in $1/$ARCH1/$2; do + for f in $1/$ARCH2/$2; do if [ -h $f ]; then ln -s $(readlink $f) "$3/`basename $f`" else - g=`echo $f | sed -e "s@/$ARCH1/@/$ARCH2/@g"` + g=`echo $f | sed -e "s@/$ARCH2/@/$ARCH1/@g"` mkdir -p "$3" - lipo -create $f $g -output "$3/`basename $f`" + lipo -create $f $g -output "$3/$(basename $f)" fi done fi @@ -67,13 +77,13 @@ function copy_lib_root { fi done else - for f in $ROOT/$ARCH1/lib/$1*.dylib; do + for f in $ROOT/$ARCH2/lib/$1*.dylib; do if [ -h $f ]; then ln -s $(readlink $f) "$2/`basename $f`" else - g=`echo $f | sed -e "s@/$ARCH1/@/$ARCH2/@g"` + g=`echo $f | sed -e "s@/$ARCH2/@/$ARCH1/@g"` mkdir -p "$2" - lipo -create $f $g -output "$2/`basename $f`" + lipo -create $f $g -output "$2/$(basename $f)" fi done fi @@ -81,19 +91,25 @@ function copy_lib_root { } function copy_lib_env { - for f in $ENV/$ARCH1/lib/$1*.dylib; do - if [ -h $f ]; then - ln -s $(readlink $f) "$2/`basename $f`" - else - if [ "$ARCH2" == "" ]; then + if [ "$ARCH2" == "" ]; then + for f in $ENV/$ARCH1/lib/$1*.dylib; do + if [ -h $f ]; then + ln -s $(readlink $f) "$2/`basename $f`" + else cp $f "$2/`basename $f`" + fi + done + else + for f in $ENV/$ARCH2/lib/$1*.dylib; do + if [ -h $f ]; then + ln -s $(readlink $f) "$2/`basename $f`" else - g=`echo $f | sed -e "s@/$ARCH1/@/$ARCH2/@g"` + g=`echo $f | sed -e "s@/$ARCH2/@/$ARCH1/@g"` mkdir -p "$2" - lipo -create $f $g -output "$2/`basename $f`" + lipo -create $f $g -output "$2/$(basename $f)" fi - fi - done + done + fi to_relink="$to_relink|$1" } @@ -165,6 +181,7 @@ function copy_libs { copy_lib_env libfribidi "$dest" copy_lib_env libgio "$dest" copy_lib_env libz "$dest" + copy_lib_env libdav1d "$dest" } # @param #1 directory to copy to @@ -175,7 +192,8 @@ function copy_resources { else local prefix=$ROOT/$ARCH1 fi - cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small_white.png "$dest" + cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small_black.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" @@ -226,6 +244,7 @@ function copy_resources { cp $prefix/src/dcpomatic/graphics/no_tick.png "$dest" cp -r $prefix/share/libdcp/xsd "$dest" cp -r $prefix/share/libdcp/tags "$dest" + cp -r $prefix/share/libdcp/ratings "$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 @@ -247,16 +266,21 @@ 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` - changes="$changes -change $dep @executable_path/../Frameworks/$base" + arch1_name=$(echo $ARCH1 | sed -e s@/.*@@) + arch2_name=$(echo $ARCH2 | sed -e s@/.*@@) + + for arch in $arch1_name $arch2_name; do + for obj in "${linkers[@]}"; do + deps=`otool -arch $arch -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|@rpath|boost|libicu|libssh)"` + changes="" + for dep in $deps; do + base=`basename $dep` + changes="$changes -change $dep @executable_path/../Frameworks/$base" + done + if test "x$changes" != "x"; then + install_name_tool $changes -id `basename "$obj"` "$obj" + fi done - if test "x$changes" != "x"; then - install_name_tool $changes -id `basename "$obj"` "$obj" - fi done } @@ -268,39 +292,54 @@ function relink_absolute { shift local linkers=("$@") - 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" + arch1_name=$(echo $ARCH1 | sed -e s@/.*@@) + arch2_name=$(echo $ARCH2 | sed -e s@/.*@@) + + for arch in $arch1_name $arch2_name; do + for obj in "${linkers[@]}"; do + deps=`otool -arch $arch -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 - done + 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 + codesign --verify --verbose=4 --options runtime --entitlements entitlements.plist --sign "$APPLICATION_IDENTITY" "$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 +# @param #4 list of executables function make_dmg { local appdir="$1" local pkg="$2" local full_name="$3" - tmp_dmg=dcpomatic_tmp.dmg - dmg="$full_name $version.dmg" + local exes="$4" + tmp_dmg=dcpomatic_tmp.dmg + if [ "$ARCH2" == "" ]; then + dmg="$full_name $version macOS10.8+.dmg" + else + dmg="$full_name $version macOS10.10+.dmg" + fi vol_name=DCP-o-matic-$version - sign "$appdir" + find "$appdir/Contents/Frameworks" -iname "*.dylib" -type f -print0 | while IFS= read -r -d '' f; do + sign "$f" + done + for f in $exes; do + sign "$appdir/Contents/MacOS/$f" + done if [ "$pkg" != "" ]; then - productsign --sign "Developer ID Installer: Carl Hetherington (R82DXSR997)" "$pkg" "signed_temp.pkg" + productsign --sign "$INSTALLER_IDENTITY" "$pkg" "signed_temp.pkg" if [ "$?" != "0" ]; then echo "Failed to sign .pkg" exit 1 @@ -389,7 +428,7 @@ EOF xattr -c "$dmg" set -e - codesign --verify --verbose --options runtime --entitlements entitlements.plist --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg" + codesign --timestamp --verify --verbose --options runtime --entitlements entitlements.plist --sign "$APPLICATION_IDENTITY" "$dmg" set +e rm $tmp_dmg @@ -420,7 +459,7 @@ function copy_verify { if [ "$ARCH2" == "" ]; then prefix=$ROOT else - prefix=$ROOT/$ARCH1 + prefix=$ROOT/$ARCH2 fi # DCP-o-matic main @@ -434,7 +473,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic" "dcpomatic2_verify openssl ffprobe dcpomatic2_cli dcpomatic2_create dcpomatic2" # DCP-o-matic KDM Creator setup "DCP-o-matic 2 KDM Creator.app" @@ -445,7 +484,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic KDM Creator" "dcpomatic2_verify openssl dcpomatic2_kdm_cli dcpomatic2_kdm" # DCP-o-matic Encode Server setup "DCP-o-matic 2 Encode Server.app" @@ -456,7 +495,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic Encode Server" "dcpomatic2_verify openssl dcpomatic2_server_cli dcpomatic2_server" # DCP-o-matic Batch Converter setup "DCP-o-matic 2 Batch converter.app" @@ -466,7 +505,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic Batch Converter" "dcpomatic2_verify openssl dcpomatic2_batch" # DCP-o-matic Player setup "DCP-o-matic 2 Player.app" @@ -476,7 +515,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic Player" "dcpomatic2_verify openssl dcpomatic2_player" # DCP-o-matic Playlist Editor setup "DCP-o-matic 2 Playlist Editor.app" @@ -486,7 +525,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" "dcpomatic2_verify openssl dcpomatic2_playlist" # DCP-o-matic Combiner setup "DCP-o-matic 2 Combiner.app" @@ -496,7 +535,7 @@ copy_verify 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" +make_dmg "$appdir" "" "DCP-o-matic Combiner" "dcpomatic2_verify openssl dcpomatic2_combiner" # DCP-o-matic Disk Writer .app setup "DCP-o-matic 2 Disk Writer.app" @@ -571,7 +610,7 @@ exit 0 EOF chmod gou+x $pkgbase/scripts/postinstall -find "$pkgbin" -iname "*.dylib" -print0 | while IFS= read -r -d '' f; do +find "$pkgbin" -iname "*.dylib" -type f -print0 | while IFS= read -r -d '' f; do sign "$f" done sign "$pkgbin/dcpomatic2_disk_writer" @@ -580,5 +619,5 @@ 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" +make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer" "dcpomatic2_verify openssl dcpomatic2_disk"