#!/bin/bash
#
-SYNTAX="make_dmg.sh <environment> <builddir> <type> <apple-id> <apple-password>"
-# where <type> is universal or thin
+SYNTAX="make_dmg.sh <environment> <builddir> <apple-id> <apple-password>"
#
-# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal foo@bar.net opensesame
+# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist foo@bar.net opensesame
# Don't set -e here as egrep (used a few times) returns 1 if no matches
# were found.
DMG_SIZE=256
ENV=$1
ROOT=$2
-TYPE=$3
-APPLE_ID=$4
-APPLE_PASSWORD=$5
-
-if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then
- echo $SYNTAX
- echo "where <type> is universal or thin"
- exit 1
-fi
+APPLE_ID=$3
+APPLE_PASSWORD=$4
# This is our work area for making up the .dmgs
mkdir -p build/platform/osx
cd build/platform/osx
+cat <<EOF > entitlements.plist
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+ <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+ <true/>
+</dict>
+</plist>
+EOF
+
function copy {
- case $TYPE in
- universal)
- for f in $1/32/$2; do
+ for f in $1/arm64/$2; do
if [ -h $f ]; then
- ln -s $(readlink $f) "$3/`basename $f`"
+ ln -s $(readlink $f) "$3/`basename $f`"
else
- g=`echo $f | sed -e "s/\/32\//\/64\//g"`
- mkdir -p "$3"
- lipo -create $f $g -output "$3/`basename $f`"
+ g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
+ mkdir -p "$3"
+ lipo -create $f $g -output "$3/`basename $f`"
fi
- done
- ;;
- thin)
- if [ -h $1/$2 ]; then
- ln -s $(readlink $1/$2) "$3/`basename $f`"
- else
- cp $1/$2 "$3"
- fi
- ;;
- esac
+ done
}
function copy_lib_root {
- case $TYPE in
- universal)
- for f in $ROOT/32/lib/$1*.dylib; do
+ for f in $ROOT/arm64/lib/$1*.dylib; do
if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
+ ln -s $(readlink $f) "$2/`basename $f`"
else
- g=`echo $f | sed -e "s/\/32\//\/64\//g"`
- mkdir -p "$2"
- lipo -create $f $g -output "$2/`basename $f`"
+ g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
+ mkdir -p "$2"
+ lipo -create $f $g -output "$2/`basename $f`"
fi
- done
- ;;
- thin)
- for f in $ROOT/lib/$1*.dylib; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
- else
- mkdir -p "$2"
- cp $f "$2"
- fi
- done
- ;;
- esac
+ done
to_relink="$to_relink|$1"
}
function copy_lib_env {
- case $TYPE in
- universal)
- for f in $ENV/32/lib/$1*.dylib; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/32\//\/64\//g"`
- mkdir -p "$2"
- lipo -create $f $g -output "$2/`basename $f`"
- fi
- done
- ;;
- thin)
- for f in $ENV/64/lib/$1*.dylib; do
+ for f in $ENV/arm64/lib/$1*.dylib; do
if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
+ ln -s $(readlink $f) "$2/`basename $f`"
else
- mkdir -p "$2"
- cp $f "$2"
+ g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
+ mkdir -p "$2"
+ lipo -create $f $g -output "$2/`basename $f`"
fi
- done
- ;;
- esac
+ done
to_relink="$to_relink|$1"
}
copy_lib_env libvorbis "$dest"
copy_lib_env libogg "$dest"
copy_lib_env libxerces-c "$dest"
+ copy_lib_env libcrypto "$dest"
+ copy_lib_env libssl "$dest"
+ copy_lib_env libfribidi "$dest"
+ copy_lib_env libgio "$dest"
+ copy_lib_env libz "$dest"
}
# @param #1 directory to copy to
function copy_resources {
local dest="$1"
- case $TYPE in
- universal)
- local prefix=$ROOT/32
- ;;
- thin)
- local prefix=$ROOT
- ;;
- esac
+ local prefix=$ROOT/x86_64
cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small.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_batch.icns "$dest"
cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_playlist.icns "$dest"
cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest"
- cp $prefix/src/dcpomatic/graphics/osx/preferences/colour_conversions.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/email.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/email@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/servers.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/servers@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/tms.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/tms@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/keys@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest"
- cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/sound@2x.png "$dest"
cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers@2x.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/general.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/general@2x.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced@2x.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/locations@2x.png "$dest"
cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"
cp $prefix/src/dcpomatic/graphics/sequence.png "$dest"
cp $prefix/src/dcpomatic/graphics/me.jpg "$dest"
cp $prefix/src/dcpomatic/graphics/link.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/tick.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/no_tick.png "$dest"
cp -r $prefix/share/libdcp/xsd "$dest"
+ cp -r $prefix/share/libdcp/tags "$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
# 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"
+ cp $ENV/x86_64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
done
}
local linkers=("$@")
for obj in "${linkers[@]}"; do
- deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"`
+ 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`
- if [ "$TYPE" == "universal" ]; then
- # $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/../Frameworks/$base -change $dep32 @executable_path/../Frameworks/$base"
- else
- changes="$changes -change $dep @executable_path/../Frameworks/$base"
- fi
+ # $dep will be a path within x86_64; make arm64 path too
+ dep_arm64=`echo $dep | sed -e "s/\/x86_64\//\/arm64\//g"`
+ changes="$changes -change $dep @executable_path/../Frameworks/$base -change $dep_arm64 @executable_path/../Frameworks/$base"
done
if test "x$changes" != "x"; then
install_name_tool $changes -id `basename "$obj"` "$obj"
local linkers=("$@")
for obj in "${linkers[@]}"; do
- deps=`otool -L "$obj" | awk '{print $1}' | egrep "($to_relink)" | egrep "($ENV|$ROOT|boost|libicu)"`
- for dep in $deps; do
- base=`basename $dep`
- install_name_tool -change "$dep" "$target"/$base -id `basename "$obj"` "$obj"
- done
+ 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"
+ done
done
}
function sign {
- codesign --deep --force --verify --verbose --options runtime --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$1"
+ 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
# @param #1 .app directory
# @param #2 .pkg or ""
# @param #3 full name e.g. DCP-o-matic Batch Converter
-# @param #4 bundle id e.g. com.dcpomatic.batch
function make_dmg {
local appdir="$1"
local pkg="$2"
local full_name="$3"
- local bundle_id="$4"
tmp_dmg=dcpomatic_tmp.dmg
dmg="$full_name $version.dmg"
vol_name=DCP-o-matic-$version
xattr -c "$dmg"
set -e
- codesign --verify --verbose --options runtime --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg"
-
- # We only notarize thin builds, as if we're building universal binaries we must be on an OS
- # sufficiently old that it can't notarize anyway
- if [ "$TYPE" == "thin" ]; then
-
- id=$(xcrun altool --notarize-app -t osx -f "$dmg" --primary-bundle-id $bundle_id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml | grep -C1 RequestUUID | tail -n 1 | sed -e "s/<string>//g" | sed -e "s/<\/string>//g")
- N=0
- while [ 1 ]; do
- echo "Checking up on $id"
- set +e
- status=$(xcrun altool --notarization-info $id -u $APPLE_ID -p $APPLE_PASSWORD --output-format xml)
- set -e
- summary=$(echo "$status" | grep -C1 "<key>Status</key>" | tail -n 1 | sed -e "s/ .//g")
- echo "Got $summary"
- if [ "$summary" == "<string>invalid</string>" ]; then
- echo "Notarization failed."
- echo $status
- exit 1
- fi
- if [ "$summary" == "<string>success</string>" ]; then
- break
- fi
- sleep 30
- N=$((N+1))
- if [ "$N" == "30" ]; then
- echo "Timed out waiting for notarization"
- exit 1
- fi
- done
-
- xcrun stapler staple "$dmg"
- fi
+ codesign --verify --verbose --options runtime --entitlements entitlements.plist --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg"
set +e
rm $tmp_dmg
copy_resources "$approot/Resources"
}
-case $TYPE in
- universal)
- prefix=$ROOT/32
- ;;
- thin)
- prefix=$ROOT
- ;;
-esac
+prefix=$ROOT/arm64
# DCP-o-matic main
setup "DCP-o-matic 2.app"
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" com.dcpomatic
+make_dmg "$appdir" "" "DCP-o-matic"
# DCP-o-matic KDM Creator
setup "DCP-o-matic 2 KDM Creator.app"
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" com.dcpomatic.kdm
+make_dmg "$appdir" "" "DCP-o-matic KDM Creator"
# DCP-o-matic Encode Server
setup "DCP-o-matic 2 Encode Server.app"
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" com.dcpomatic.server
+make_dmg "$appdir" "" "DCP-o-matic Encode Server"
# DCP-o-matic Batch Converter
setup "DCP-o-matic 2 Batch converter.app"
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" com.dcpomatic.batch
+make_dmg "$appdir" "" "DCP-o-matic Batch Converter"
# DCP-o-matic Player
setup "DCP-o-matic 2 Player.app"
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" com.dcpomatic.player
+make_dmg "$appdir" "" "DCP-o-matic Player"
# DCP-o-matic Playlist Editor
setup "DCP-o-matic 2 Playlist Editor.app"
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" com.dcpomatic.playlist
+make_dmg "$appdir" "" "DCP-o-matic Playlist Editor"
+
+# DCP-o-matic Combiner
+setup "DCP-o-matic 2 Combiner.app"
+copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_combiner "$approot/MacOS"
+copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+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"
# DCP-o-matic Disk Writer .app
setup "DCP-o-matic 2 Disk Writer.app"
copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS"
copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+cp $prefix/src/dcpomatic/platform/osx/uninstall_disk.applescript "$approot/Resources"
cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_disk.Info.plist "$approot/Info.plist"
rl=("$approot/MacOS/dcpomatic2_disk" "$approot/Frameworks/"*.dylib)
relink_relative "${rl[@]}"
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" com.dcpomatic.disk
+make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer"
projects / dcpomatic.git / blobdiff