#!/bin/bash
#
-SYNTAX="make_dmg.sh <environment> <builddir> <type> <apple-id> <apple-password>"
-# where <type> is arm-intel-64, intel-32-64 or arm64
+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/osx-environment /Users/carl/cdist arm-intel-64 foo@bar.net opensesame
+# 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=`git describe --tags --abbrev=0 | sed -e "s/v//"`
+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=$1
-ROOT=$2
-TYPE=$3
-APPLE_ID=$4
-APPLE_PASSWORD=$5
-
-if [ "$TYPE" != "arm-intel-64" -a "$TYPE" != "intel-32-64" -a "$TYPE" != "arm64" ]; then
- echo $SYNTAX
- echo "where <type> is arm-intel-64, intel-32-64 or arm64"
- exit 1
-fi
+
+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
<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
- arm-intel-64)
- for f in $1/arm64/$2; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$3/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
- mkdir -p "$3"
- lipo -create $f $g -output "$3/`basename $f`"
- fi
- done
- ;;
- intel-32-64)
- for f in $1/i386/$2; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$3/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/i386\//\/x86_64\//g"`
- mkdir -p "$3"
- lipo -create $f $g -output "$3/`basename $f`"
- fi
- done
- ;;
- arm64)
- if [ -h $1/$2 ]; then
- ln -s $(readlink $1/$2) "$3/`basename $f`"
- else
- cp $1/$2 "$3"
- fi
- ;;
- esac
+ 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 copy_lib_root {
- case $TYPE in
- arm-intel-64)
- for f in $ROOT/arm64/lib/$1*.dylib; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
- mkdir -p "$2"
- lipo -create $f $g -output "$2/`basename $f`"
- fi
- done
- ;;
- intel-32-64)
- for f in $ROOT/intel-32-64/lib/$1*.dylib; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/i386\//\/x86_64\//g"`
- mkdir -p "$2"
- lipo -create $f $g -output "$2/`basename $f`"
- fi
- done
- ;;
- arm64)
- 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
+ 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 {
- case $TYPE in
- arm-intel-64)
- for f in $ENV/arm64/lib/$1*.dylib; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/arm64\//\/x86_64\//g"`
- mkdir -p "$2"
- lipo -create $f $g -output "$2/`basename $f`"
- fi
- done
- ;;
- intel-32-64)
- for f in $ENV/i386/lib/$1*.dylib; do
- if [ -h $f ]; then
- ln -s $(readlink $f) "$2/`basename $f`"
- else
- g=`echo $f | sed -e "s/\/i386\//\/x86_64\//g"`
- mkdir -p "$2"
- lipo -create $f $g -output "$2/`basename $f`"
- fi
- done
- ;;
- arm64)
- for f in $ENV/arm64/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
+ 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"
}
copy_lib_env libicui18n "$dest"
copy_lib_env libicudata "$dest"
copy_lib_env libicuio "$dest"
- copy_lib_env libicule "$dest"
- copy_lib_env libiculx "$dest"
copy_lib_env libicutest "$dest"
copy_lib_env libicutu "$dest"
copy_lib_env libicuuc "$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"
- case $TYPE in
- arm-intel-64)
- local prefix=$ROOT/x86_64
- ;;
- intel-32-64)
- local prefix=$ROOT/x86_64
- ;;
- arm64)
- local prefix=$ROOT
- ;;
- esac
- cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small.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_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/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/graphics/osx/dcpomatic2_editor.icns "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/email*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/servers*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/tms*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/keys*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/sound*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/general*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/locations*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/osx/preferences/non_standard*.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/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 $prefix/src/dcpomatic/graphics/add*.png "$dest"
+ cp $prefix/src/dcpomatic/graphics/pause*.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
+ 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 hu_HU; do
mkdir -p "$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"
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/x86_64/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
+ cp $ENV/$ARCH1/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang"
done
}
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`
- if [ "$TYPE" == "universal" ]; then
- # $dep will be a path within x86_64/; make i386 and arm64 paths too
- dep_i386=`echo $dep | sed -e "s/\/x86_64\//\/i386\//g"`
- changes="$changes -change $dep @executable_path/../Frameworks/$base -change $dep_i386 @executable_path/../Frameworks/$base"
- 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"
- else
- changes="$changes -change $dep @executable_path/../Frameworks/$base"
- fi
+ 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 -id `basename "$obj"` "$obj"
- fi
- done
}
# param $1 directory things should be relinked into
shift
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"
+ 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
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
+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 OS X Sicherheitsumgebung
+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
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
copy_resources "$approot/Resources"
}
-case $TYPE in
- arm-intel-64)
- # copy() writes the universal binary to arm64
- prefix=$ROOT/arm64
- ;;
- intel-32-64)
- # copy() writes the universal binary to i386
- prefix=$ROOT/i386
- ;;
- arm64)
+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[@]}"
+}
+
+function copy_kdm {
+ copy $ROOT src/libdcp/build/tools/dcpkdm "$approot/MacOS"
+ mv "$approot/MacOS/dcpkdm" "$approot/MacOS/dcpomatic2_kdm_inspect"
+ rl=("$approot/MacOS/dcpomatic2_kdm_inspect" "$approot/Frameworks/"*.dylib)
+ relink_relative "${rl[@]}"
+}
+
+if [ "$ARCH2" == "" ]; then
prefix=$ROOT
- ;;
-esac
-
-# 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"
-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"
-
-# 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"
-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"
-
-# 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"
-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"
-
-# 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"
-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"
-
-# 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"
-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"
-
-# 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"
-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"
-
-# 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[@]}"
-
-# 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
+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 src/dcpomatic/build/src/tools/dcpomatic2_map "$approot/MacOS"
+ copy $ROOT bin/ffprobe "$approot/MacOS"
+ copy $ROOT src/openssl/apps/openssl "$approot/MacOS"
+ copy_verify
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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 dcpomatic2_kdm_inspect 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
+ copy_kdm
+ 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">
</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
+ # 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"
+ 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[@]}"
+ rl=("$pkgbin/dcpomatic2_disk_writer" "$pkgbin/"*.dylib)
+ relink_absolute "/Library/Application Support/com.dcpomatic" "${rl[@]}"
-mkdir $pkgbase/scripts
-cat > $pkgbase/scripts/postinstall <<EOF
+ 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
+ chmod gou+x $pkgbase/scripts/postinstall
-find "$pkgbin" -iname "*.dylib" -print0 | while IFS= read -r -d '' f; do
- sign "$f"
-done
-sign "$pkgbin/dcpomatic2_disk_writer"
+ 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"
+ 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 dcpomatic2_kdm_inspect openssl dcpomatic2_disk"
+fi
projects / dcpomatic.git / blobdiff