#!/bin/bash
#
-# Syntax: make_dmg.sh <builddir>
+SYNTAX="make_dmg.sh -e <environment> -r <builddir> -i <apple-id> -p <apple-password> -a <arch1> [-a <arch2>] [-b <id>]"
#
-# e.g. make_dmg.sh /Users/carl/cdist
+# e.g. make_dmg.sh -e /Users/carl/osx-environment -r /Users/carl/cdist -i foo@bar.net -p opensesame -a x86_64/10.10 -a arm64/11.0 [-b dcpomatic2_player]
# 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"`
+BUILD="main kdm server batch player playlist combiner editor disk"
+while getopts "e:r:i:p:a:b:" o; do
+ case "${o}" in
+ e)
+ ENV=${OPTARG}
+ ;;
+ r)
+ ROOT=${OPTARG}
+ ;;
+ i)
+ APPLE_ID=${OPTARG}
+ ;;
+ p)
+ APPLE_PASSWORD=${OPTARG}
+ ;;
+ a)
+ ARCHS+=("$OPTARG")
+ ;;
+ b)
+ BUILD=${OPTARG}
+ ;;
+ esac
+done
+
+# 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 <branch>-<commit>
+ version="$(basename $(git name-rev --name-only HEAD))-$(git rev-parse --short HEAD)"
+fi
# DMG size in megabytes
DMG_SIZE=256
-ENV=/Users/carl/Environments/osx/10.6
-ROOT=$1
+
+ARCH1=${ARCHS[0]}
+ARCH2=${ARCHS[1]}
+
+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
-function universal_copy {
- for f in $1/32/$2; do
- if [ -h $f ]; then
- 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`"
- fi
- done
+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 {
+ if [ "$ARCH2" == "" ]; then
+ for f in $1/$2; do
+ if [ -h $f ]; then
+ ln -s $(readlink $f) "$3/`basename $f`"
+ else
+ cp $f "$3/`basename $f`"
+ fi
+ done
+ else
+ 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@/$ARCH2/@/$ARCH1/@g"`
+ mkdir -p "$3"
+ lipo -create $f $g -output "$3/$(basename $f)"
+ fi
+ done
+ fi
}
-function universal_copy_lib {
- for f in $1/32/lib/$2*.dylib; do
- if [ -h $f ]; then
- 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`"
- fi
- done
- to_relink="$to_relink|$2"
+function copy_lib_root {
+ if [ "$ARCH2" == "" ]; then
+ for f in $ROOT/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 $ROOT/$ARCH2/lib/$1*.dylib; do
+ if [ -h $f ]; then
+ ln -s $(readlink $f) "$2/`basename $f`"
+ else
+ g=`echo $f | sed -e "s@/$ARCH2/@/$ARCH1/@g"`
+ mkdir -p "$2"
+ lipo -create $f $g -output "$2/$(basename $f)"
+ fi
+ done
+ fi
+ to_relink="$to_relink|$1"
+}
+
+function copy_lib_env {
+ 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@/$ARCH2/@/$ARCH1/@g"`
+ mkdir -p "$2"
+ lipo -create $f $g -output "$2/$(basename $f)"
+ fi
+ done
+ fi
+ to_relink="$to_relink|$1"
}
# @param #1 directory to copy to
function copy_libs {
local dest="$1"
- universal_copy_lib $ROOT libcxml "$dest"
- universal_copy_lib $ROOT libdcp-1.0 "$dest"
- universal_copy_lib $ROOT libasdcp-cth "$dest"
- universal_copy_lib $ROOT libkumu-cth "$dest"
- universal_copy_lib $ROOT libsub "$dest"
- universal_copy_lib $ROOT libopenjp2 "$dest"
- universal_copy_lib $ROOT libavdevice "$dest"
- universal_copy_lib $ROOT libavformat "$dest"
- universal_copy_lib $ROOT libavfilter "$dest"
- universal_copy_lib $ROOT libavutil "$dest"
- universal_copy_lib $ROOT libavcodec "$dest"
- universal_copy_lib $ROOT libswscale "$dest"
- universal_copy_lib $ROOT libpostproc "$dest"
- universal_copy_lib $ROOT libswresample "$dest"
- universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$dest"
- universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$dest"
- universal_copy_lib $ENV libboost_system "$dest"
- universal_copy_lib $ENV libboost_filesystem "$dest"
- universal_copy_lib $ENV libboost_thread "$dest"
- universal_copy_lib $ENV libboost_date_time "$dest"
- universal_copy_lib $ENV libboost_locale "$dest"
- universal_copy_lib $ENV libboost_regex "$dest"
- universal_copy_lib $ENV libxml++ "$dest"
- universal_copy_lib $ENV libxslt "$dest"
- universal_copy_lib $ENV libxml2 "$dest"
- universal_copy_lib $ENV libglibmm-2.4 "$dest"
- universal_copy_lib $ENV libgobject "$dest"
- universal_copy_lib $ENV libgthread "$dest"
- universal_copy_lib $ENV libgmodule "$dest"
- universal_copy_lib $ENV libsigc "$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 libfreetype "$dest"
- universal_copy_lib $ENV libexpat "$dest"
- universal_copy_lib $ENV libltdl "$dest"
- universal_copy_lib $ENV libxmlsec1 "$dest"
- universal_copy_lib $ENV libcurl "$dest"
- universal_copy_lib $ENV libffi "$dest"
- universal_copy_lib $ENV libpango "$dest"
- universal_copy_lib $ENV libcairo "$dest"
- universal_copy_lib $ENV libpixman "$dest"
- universal_copy_lib $ENV libharfbuzz "$dest"
- universal_copy_lib $ENV libsamplerate "$dest"
- universal_copy_lib $ENV libicui18n "$dest"
- universal_copy_lib $ENV libicudata "$dest"
- universal_copy_lib $ENV libicuio "$dest"
- universal_copy_lib $ENV libicule "$dest"
- universal_copy_lib $ENV libiculx "$dest"
- universal_copy_lib $ENV libicutest "$dest"
- universal_copy_lib $ENV libicutu "$dest"
- universal_copy_lib $ENV libicuuc "$dest"
- universal_copy_lib $ENV libFLAC "$dest"
- universal_copy_lib $ENV libvorbis "$dest"
- universal_copy_lib $ENV libogg "$dest"
+ copy_lib_root libcxml "$dest"
+ copy_lib_root libdcp-1.0 "$dest"
+ copy_lib_root libasdcp-carl "$dest"
+ copy_lib_root libkumu-carl "$dest"
+ copy_lib_root libsub "$dest"
+ copy_lib_root libopenjp2 "$dest"
+ copy_lib_root libavdevice "$dest"
+ copy_lib_root libavformat "$dest"
+ copy_lib_root libavfilter "$dest"
+ copy_lib_root libavutil "$dest"
+ copy_lib_root libavcodec "$dest"
+ copy_lib_root libswscale "$dest"
+ copy_lib_root libpostproc "$dest"
+ copy_lib_root libswresample "$dest"
+ copy_lib_root liblwext4 "$dest"
+ copy_lib_root libblockdev "$dest"
+ copy_lib_root libleqm_nrt "$dest"
+ copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$dest"
+ copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$dest"
+ copy_lib_env libboost_system "$dest"
+ copy_lib_env libboost_filesystem "$dest"
+ copy_lib_env libboost_thread "$dest"
+ copy_lib_env libboost_date_time "$dest"
+ copy_lib_env libboost_locale "$dest"
+ copy_lib_env libboost_regex "$dest"
+ copy_lib_env libxml++ "$dest"
+ copy_lib_env libxslt "$dest"
+ copy_lib_env libxml2 "$dest"
+ copy_lib_env libglibmm-2.4 "$dest"
+ copy_lib_env libgobject "$dest"
+ copy_lib_env libgthread "$dest"
+ copy_lib_env libgmodule "$dest"
+ copy_lib_env libsigc "$dest"
+ copy_lib_env libglib-2 "$dest"
+ copy_lib_env libintl "$dest"
+ copy_lib_env libsndfile "$dest"
+ copy_lib_env libssh "$dest"
+ copy_lib_env libwx "$dest"
+ copy_lib_env libfontconfig "$dest"
+ copy_lib_env libfreetype "$dest"
+ copy_lib_env libexpat "$dest"
+ copy_lib_env libltdl "$dest"
+ copy_lib_env libxmlsec1 "$dest"
+ copy_lib_env libcurl "$dest"
+ copy_lib_env libffi "$dest"
+ copy_lib_env libpango "$dest"
+ copy_lib_env libcairo "$dest"
+ copy_lib_env libpixman "$dest"
+ copy_lib_env libharfbuzz "$dest"
+ copy_lib_env libsamplerate "$dest"
+ copy_lib_env libicui18n "$dest"
+ copy_lib_env libicudata "$dest"
+ copy_lib_env libicuio "$dest"
+ copy_lib_env libicutest "$dest"
+ copy_lib_env libicutu "$dest"
+ copy_lib_env libicuuc "$dest"
+ copy_lib_env libFLAC "$dest"
+ 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"
+ copy_lib_env libdav1d "$dest"
}
# @param #1 directory to copy to
function copy_resources {
local dest="$1"
- cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
- cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
- cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
- cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
- cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_player.icns "$dest"
- cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$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/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/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"
+ if [ "$ARCH2" == "" ]; then
+ local prefix=$ROOT
+ else
+ local prefix=$ROOT/$ARCH1
+ fi
+ 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"
+ cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_player.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/dcpomatic2_combiner.icns "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_editor.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/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/fonts/fonts.conf.osx "$dest"/fonts.conf
+ cp $prefix/src/dcpomatic/graphics/splash.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/zoom.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/zoom_all.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/select.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/snap.png "$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"
+ 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; 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 sl_SI; 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"
- cp $ROOT/32/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+ cp $prefix/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+ cp $prefix/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
+ cp $prefix/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES"
done
# i18n: wxWidgets .mo files
- for lang in de es fr it sv nl ru pl da cs; do
+ for lang in de es fr it sv nl ru pl da cs sl; do
mkdir "$dest/$lang"
- cp $ENV/64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
+ cp $ENV/$ARCH1/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
done
}
# param $1 list of things that link to other things
-function relink {
+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)"`
- changes=""
- for dep in $deps; do
- base=`basename $dep`
- # $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"
+ 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
done
- if test "x$changes" != "x"; then
- install_name_tool $changes "$obj"
+}
+
+# param $1 directory things should be relinked into
+# $2 list of things that link to other things
+function relink_absolute {
+ to_relink=`echo $to_relink | sed -e "s/\+//g"`
+ target=$1
+ shift
+ local linkers=("$@")
+
+ 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
+}
+
+function sign {
+ codesign --verify --verbose=4 --options runtime --entitlements entitlements.plist --sign "$APPLICATION_IDENTITY" "$1"
+ if [ "$?" != "0" ]; then
+ echo "Failed to sign $1"
+ exit 1
fi
- done
}
# @param #1 .app directory
-# @param #2 full name e.g. DCP-o-matic Batch Converter
+# @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 full_name="$2"
- tmp_dmg=dcpomatic_tmp.dmg
- dmg="$full_name $version.dmg"
+ local pkg="$2"
+ local full_name="$3"
+ 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
- codesign --deep --force --verify --verbose --sign "3rd Party Mac Developer Application: Carl Hetherington (R82DXSR997)" $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 "$INSTALLER_IDENTITY" "$pkg" "signed_temp.pkg"
+ if [ "$?" != "0" ]; then
+ echo "Failed to sign .pkg"
+ exit 1
+ fi
+ mv signed_temp.pkg "$pkg"
+ fi
mkdir -p $vol_name
cp -a "$appdir" $vol_name
+ if [ "$pkg" != "" ]; then
+ cp -a "$pkg" $vol_name
+ fi
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 macOS 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 macOS 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
+
+ if [ "$pkg" != "" ]; then
+ cat<<EOF > "$vol_name/READ ME.txt"
+To run this software successfully you must install $pkg before running
+the .app
+EOF
+ fi
+
+ if [ "$pkg" != "" ]; then
+ cat<<EOF > "$vol_name/READ ME.de_DE.txt"
+
+To run this software successfully you must install $pkg before running
+the .app
+EOF
+
+ fi
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
attach=$(hdiutil attach -readwrite -noverify -noautoopen $tmp_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, 1160, 600}
+ set the bounds of container window to {400, 200, 1160, 600}
+ set the bounds of container window to {400, 200, 1160, 600}
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}
+ set position of item "DCP-o-matic Disk Writer.pkg" of container window to {90, 255}
close
open
update without registering applications
DeRez -only icns "$appdir/Contents/Resources/dcpomatic2.icns" > "$appdir/Contents/Resources/DCP-o-matic.rsrc"
Rez -append "$appdir/Contents/Resources/DCP-o-matic.rsrc" -o "$dmg"
SetFile -a C "$dmg"
+ xattr -c "$dmg"
+
+ set -e
+ codesign --timestamp --verify --verbose --options runtime --entitlements entitlements.plist --sign "$APPLICATION_IDENTITY" "$dmg"
+ set +e
+
rm $tmp_dmg
rm -rf $vol_name
}
approot="$appdir/Contents"
rm -rf "$appdir"
mkdir -p "$approot/MacOS"
- mkdir -p "$approot/lib"
+ mkdir -p "$approot/Frameworks"
mkdir -p "$approot/Resources"
to_relink="dcpomatic"
- copy_libs "$approot/lib"
+ copy_libs "$approot/Frameworks"
copy_resources "$approot/Resources"
}
-# DCP-o-matic main
-setup "DCP-o-matic 2.app"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$approot/MacOS"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$approot/MacOS"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_create "$approot/MacOS"
-universal_copy $ROOT bin/ffprobe "$approot/MacOS"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2" "$approot/MacOS/dcpomatic2_cli" "$approot/MacOS/ffprobe" "$approot/lib/"*.dylib)
-relink "${rl[@]}"
-make_dmg "$appdir" "DCP-o-matic"
-
-# DCP-o-matic KDM Creator
-setup "DCP-o-matic 2 KDM Creator.app"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$approot/MacOS"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2_kdm" "$approot/MacOS/dcpomatic2_kdm_cli" "$approot/lib/"*.dylib)
-relink "${rl[@]}"
-make_dmg "$appdir" "DCP-o-matic KDM Creator"
-
-# DCP-o-matic Encode Server
-setup "DCP-o-matic 2 Encode Server.app"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$approot/MacOS"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$approot/MacOS"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_server.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2_server" "$approot/MacOS/dcpomatic2_server_cli" "$approot/lib/"*.dylib)
-relink "${rl[@]}"
-make_dmg "$appdir" "DCP-o-matic Encode Server"
-
-# DCP-o-matic Batch Converter
-setup "DCP-o-matic 2 Batch converter.app"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$approot/MacOS"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2_batch" "$approot/lib/"*.dylib)
-relink "${rl[@]}"
-make_dmg "$appdir" "DCP-o-matic Batch Converter"
-
-# DCP-o-matic Player
-setup "DCP-o-matic 2 Player.app"
-universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_player.Info.plist "$approot/Info.plist"
-rl=("$approot/MacOS/dcpomatic2_player" "$approot/lib/"*.dylib)
-relink "${rl[@]}"
-make_dmg "$appdir" "DCP-o-matic Player"
+function copy_verify {
+ copy $ROOT src/libdcp/build/tools/dcpverify "$approot/MacOS"
+ mv "$approot/MacOS/dcpverify" "$approot/MacOS/dcpomatic2_verify"
+ rl=("$approot/MacOS/dcpomatic2_verify" "$approot/Frameworks/"*.dylib)
+ relink_relative "${rl[@]}"
+}
+
+if [ "$ARCH2" == "" ]; then
+ prefix=$ROOT
+else
+ prefix=$ROOT/$ARCH2
+fi
+
+if [[ "$BUILD" == *main* ]]; then
+ # DCP-o-matic main
+ setup "DCP-o-matic 2.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$approot/MacOS"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$approot/MacOS"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_create "$approot/MacOS"
+ copy $ROOT bin/ffprobe "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ 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" "dcpomatic2_verify openssl ffprobe dcpomatic2_cli dcpomatic2_create dcpomatic2"
+fi
+
+if [[ "$BUILD" == *kdm* ]]; then
+ # DCP-o-matic KDM Creator
+ setup "DCP-o-matic 2 KDM Creator.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$approot/MacOS"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm_cli "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ 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" "dcpomatic2_verify openssl dcpomatic2_kdm_cli dcpomatic2_kdm"
+fi
+
+if [[ "$BUILD" == *server* ]]; then
+ # DCP-o-matic Encode Server
+ setup "DCP-o-matic 2 Encode Server.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$approot/MacOS"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ 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" "dcpomatic2_verify openssl dcpomatic2_server_cli dcpomatic2_server"
+fi
+
+if [[ "$BUILD" == *batch* ]]; then
+ # DCP-o-matic Batch Converter
+ setup "DCP-o-matic 2 Batch converter.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ 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" "dcpomatic2_verify openssl dcpomatic2_batch"
+fi
+
+if [[ "$BUILD" == *player* ]]; then
+ # DCP-o-matic Player
+ setup "DCP-o-matic 2 Player.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_player "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ 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" "dcpomatic2_verify openssl dcpomatic2_player"
+fi
+
+if [[ "$BUILD" == *playlist* ]]; then
+ # DCP-o-matic Playlist Editor
+ setup "DCP-o-matic 2 Playlist Editor.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_playlist "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ 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" "dcpomatic2_verify openssl dcpomatic2_playlist"
+fi
+
+if [[ "$BUILD" == *combiner* ]]; then
+ # 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"
+ 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" "dcpomatic2_verify openssl dcpomatic2_combiner"
+fi
+
+if [[ "$BUILD" == *editor* ]]; then
+ # DCP-o-matic Editor
+ setup "DCP-o-matic 2 Editor.app"
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_editor "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ copy_verify
+ cp $prefix/src/dcpomatic/build/platform/osx/dcpomatic2_editor.Info.plist "$approot/Info.plist"
+ rl=("$approot/MacOS/dcpomatic2_editor" "$approot/Frameworks/"*.dylib)
+ relink_relative "${rl[@]}"
+ make_dmg "$appdir" "" "DCP-o-matic Editor" "dcpomatic2_verify openssl dcpomatic2_editor"
+fi
+
+if [[ "$BUILD" == *disk* ]]; then
+ # 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"
+ copy_verify
+ 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[@]}"
+
+ # DCP-o-matic Disk Writer daemon .pkg
+
+ pkgbase=tmp-disk-writer
+ rm -rf $pkgbase
+ mkdir $pkgbase
+ pkgbin=$pkgbase/bin
+ pkgroot=$pkgbase/root
+
+ mkdir -p $pkgroot/Library/LaunchDaemons
+ cat > $pkgroot/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>Label</key>
+ <string>com.dcpomatic.disk.writer</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>/Library/Application Support/com.dcpomatic/dcpomatic2_disk_writer</string>
+ </array>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_LIBRARY_PATH</key>
+ <string><![CDATA[/Library/Application Support/com.dcpomatic]]></string>
+ </dict>
+ <key>StandardOutPath</key>
+ <string>/var/log/dcpomatic_disk_writer_out.log</string>
+ <key>StandardErrorPath</key>
+ <string>/var/log/dcpomatic_disk_writer_err.log</string>
+ <key>LaunchEvents</key>
+ <dict>
+ <key>com.apple.notifyd.matching</key>
+ <dict>
+ <key>com.dcpomatic.disk.writer.start</key>
+ <dict>
+ <key>Notification</key>
+ <string>com.dcpomatic.disk.writer.start</string>
+ </dict>
+ </dict>
+ </dict>
+</dict>
+</plist>
+EOF
+
+ # Get the binaries together in $pkgbin then move them to the
+ # place with spaces in the filename to avoid some of the pain of escaping
+
+ mkdir $pkgbin
+ copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk_writer "$pkgbin"
+ copy_libs "$pkgbin"
+
+ rl=("$pkgbin/dcpomatic2_disk_writer" "$pkgbin/"*.dylib)
+ relink_absolute "/Library/Application Support/com.dcpomatic" "${rl[@]}"
+
+ mkdir $pkgbase/scripts
+ cat > $pkgbase/scripts/postinstall <<EOF
+#!/bin/sh
+/bin/launchctl unload "/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist"
+/bin/launchctl load "/Library/LaunchDaemons/com.dcpomatic.disk.writer.plist"
+exit 0
+EOF
+ chmod gou+x $pkgbase/scripts/postinstall
+
+ find "$pkgbin" -iname "*.dylib" -type f -print0 | while IFS= read -r -d '' f; do
+ sign "$f"
+ done
+ sign "$pkgbin/dcpomatic2_disk_writer"
+
+ 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" "dcpomatic2_verify openssl dcpomatic2_disk"
+fi
+
projects / dcpomatic.git / blobdiff