diff options
Diffstat (limited to 'platform')
21 files changed, 289 insertions, 231 deletions
diff --git a/platform/linux/dcpomatic_verifier.desktop.in b/platform/linux/dcpomatic_verifier.desktop.in new file mode 100644 index 000000000..b52a6fc3d --- /dev/null +++ b/platform/linux/dcpomatic_verifier.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@INSTALL_PREFIX@/bin/dcpomatic2_verifier +Name=DCP-o-matic 2 Verifier +Icon=dcpomatic2_verifier +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/wscript b/platform/linux/wscript index 98aff905d..4a3516fd0 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -16,6 +16,7 @@ def build(bld): desktop(bld, '_playlist'), desktop(bld, '_combiner'), desktop(bld, '_editor'), + desktop(bld, '_verifier'), ] if bld.env.ENABLE_DISK: diff --git a/platform/osx/dcpomatic2.Info.plist.in b/platform/osx/dcpomatic2.Info.plist.in index 00a7d99aa..a5550572b 100644 --- a/platform/osx/dcpomatic2.Info.plist.in +++ b/platform/osx/dcpomatic2.Info.plist.in @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>dcpomatic2</string> <key>CFBundleGetInfoString</key> - <string>DCP-o-matic 2</string> + <string>@NAME@</string> <key>CFBundleIconFile</key> <string>dcpomatic2.icns</string> <key>CFBundleIdentifier</key> @@ -15,7 +15,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>DCP-o-matic 2</string> + <string>@NAME@</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersions</key> diff --git a/platform/osx/dcpomatic2_kdm.Info.plist.in b/platform/osx/dcpomatic2_kdm.Info.plist.in index 95016a972..151d20718 100644 --- a/platform/osx/dcpomatic2_kdm.Info.plist.in +++ b/platform/osx/dcpomatic2_kdm.Info.plist.in @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>dcpomatic2_kdm</string> <key>CFBundleGetInfoString</key> - <string>DCP-o-matic 2 KDM creator</string> + <string>@NAME@</string> <key>CFBundleIconFile</key> <string>dcpomatic2_kdm.icns</string> <key>CFBundleIdentifier</key> @@ -15,7 +15,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>DCP-o-matic 2 KDM Creator</string> + <string>@NAME@</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersions</key> diff --git a/platform/osx/dcpomatic2_player.Info.plist.in b/platform/osx/dcpomatic2_player.Info.plist.in index 0a10e3727..54e688eaf 100644 --- a/platform/osx/dcpomatic2_player.Info.plist.in +++ b/platform/osx/dcpomatic2_player.Info.plist.in @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>dcpomatic2_player</string> <key>CFBundleGetInfoString</key> - <string>DCP-o-matic 2 Player</string> + <string>@NAME@</string> <key>CFBundleIconFile</key> <string>dcpomatic2_player.icns</string> <key>CFBundleIdentifier</key> @@ -15,7 +15,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>DCP-o-matic 2 Player</string> + <string>@NAME@</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersions</key> diff --git a/platform/osx/dcpomatic2_verifier.Info.plist.in b/platform/osx/dcpomatic2_verifier.Info.plist.in new file mode 100644 index 000000000..28dba8f9b --- /dev/null +++ b/platform/osx/dcpomatic2_verifier.Info.plist.in @@ -0,0 +1,36 @@ +<?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>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>dcpomatic2_verifier</string> + <key>CFBundleGetInfoString</key> + <string>@NAME@</string> + <key>CFBundleIconFile</key> + <string>dcpomatic2_verifier.icns</string> + <key>CFBundleIdentifier</key> + <string>com.dcpomatic.verifier</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>@NAME@</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersions</key> + <string>@VERSION@</string> + <key>CFBundleSignature</key> + <string>DOMC</string> + <key>CFBundleVersion</key> + <string>@VERSION@</string> + <key>CFBundleAllowMixedLocalizations</key> + <true/> + <key>LSUIElement</key> + <string>0</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> +</dict> +</plist> diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index bebd089bd..da7c38812 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,14 +1,14 @@ #!/bin/bash # -SYNTAX="make_dmg.sh -e <environment> -r <builddir> -i <apple-id> -p <apple-password> -a <arch1> [-a <arch2>] [-b <id>]" +SYNTAX="make_dmg.sh -e <environment> -r <builddir> -i <apple-id> -p <apple-password> -a <arch1> [-a <arch2>] [-b <id>] [-v <variant>]" # # 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. -BUILD="main kdm server batch player playlist combiner editor disk" -while getopts "e:r:i:p:a:b:" o; do +BUILD="main kdm server batch player playlist combiner editor disk verifier" +while getopts "e:r:i:p:a:b:v:" o; do case "${o}" in e) ENV=${OPTARG} @@ -28,9 +28,23 @@ while getopts "e:r:i:p:a:b:" o; do b) BUILD=${OPTARG} ;; + v) + VARIANT=${OPTARG} + ;; esac done +VOLUME_PREFIX="DCP-o-matic-" +GENERAL_NAME="DCP-o-matic" +DCPOMATIC_APP="DCP-o-matic 2.app" +KDM_CREATOR_NAME="DCP-o-matic KDM Creator" +KDM_CREATOR_APP="DCP-o-matic 2 KDM Creator.app" +PLAYER_APP="DCP-o-matic 2 Player.app" +PLAYER_NAME="DCP-o-matic Player" +VERIFIER_APP="DCP-o-matic 2 Verifier.app" +VERIFIER_NAME="DCP-o-matic Verifier" +SOURCE_NAME="dcpomatic" + # 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 @@ -141,8 +155,8 @@ function copy_libs { local dest="$1" 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 libasdcp-dcpomatic "$dest" + copy_lib_root libkumu-dcpomatic "$dest" copy_lib_root libsub "$dest" copy_lib_root libopenjp2 "$dest" copy_lib_root libavdevice "$dest" @@ -156,8 +170,9 @@ function copy_libs { 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 $ROOT src/$SOURCE_NAME/build/src/lib/libdcpomatic2.dylib "$dest" + copy $ROOT src/$SOURCE_NAME/build/src/wx/libdcpomatic2-wx.dylib "$dest" + copy_lib_env libboost_atomic "$dest" copy_lib_env libboost_system "$dest" copy_lib_env libboost_filesystem "$dest" copy_lib_env libboost_thread "$dest" @@ -167,7 +182,7 @@ function copy_libs { 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 libglibmm "$dest" copy_lib_env libgobject "$dest" copy_lib_env libgthread "$dest" copy_lib_env libgmodule "$dest" @@ -205,6 +220,7 @@ function copy_libs { copy_lib_env libgio "$dest" copy_lib_env libz "$dest" copy_lib_env libdav1d "$dest" + copy_lib_env libsqlite "$dest" } # @param #1 directory to copy to @@ -215,45 +231,48 @@ function copy_resources { 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/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/me.jpg "$dest" - cp $prefix/src/dcpomatic/graphics/link*.png "$dest" - cp $prefix/src/dcpomatic/graphics/add*.png "$dest" - cp $prefix/src/dcpomatic/graphics/pause*.png "$dest" + source=$prefix/src/$SOURCE_NAME + cp $source/graphics/osx/dcpomatic_small_white.png "$dest" + cp $source/graphics/osx/dcpomatic_small_black.png "$dest" + cp $source/graphics/osx/dcpomatic2.icns "$dest" + cp $source/graphics/osx/dcpomatic2_kdm.icns "$dest" + cp $source/graphics/osx/dcpomatic2_server.icns "$dest" + cp $source/graphics/osx/dcpomatic2_player.icns "$dest" + cp $source/graphics/osx/dcpomatic2_batch.icns "$dest" + cp $source/graphics/osx/dcpomatic2_playlist.icns "$dest" + cp $source/graphics/osx/dcpomatic2_disk.icns "$dest" + cp $source/graphics/osx/dcpomatic2_combiner.icns "$dest" + cp $source/graphics/osx/dcpomatic2_editor.icns "$dest" + cp $source/graphics/osx/dcpomatic2_verifier.icns "$dest" + cp $source/graphics/osx/preferences/defaults*.png "$dest" + cp $source/graphics/osx/preferences/kdm_email*.png "$dest" + cp $source/graphics/osx/preferences/email*.png "$dest" + cp $source/graphics/osx/preferences/servers*.png "$dest" + cp $source/graphics/osx/preferences/tms*.png "$dest" + cp $source/graphics/osx/preferences/keys*.png "$dest" + cp $source/graphics/osx/preferences/cover_sheet*.png "$dest" + cp $source/graphics/osx/preferences/notifications*.png "$dest" + cp $source/graphics/osx/preferences/sound*.png "$dest" + cp $source/graphics/osx/preferences/identifiers*.png "$dest" + cp $source/graphics/osx/preferences/general*.png "$dest" + cp $source/graphics/osx/preferences/advanced*.png "$dest" + cp $source/graphics/osx/preferences/locations*.png "$dest" + cp $source/graphics/osx/preferences/non_standard*.png "$dest" + cp $source/fonts/LiberationSans-Regular.ttf "$dest" + cp $source/fonts/LiberationSans-Italic.ttf "$dest" + cp $source/fonts/LiberationSans-Bold.ttf "$dest" + cp $source/fonts/fonts.conf.osx "$dest"/fonts.conf + cp $source/graphics/splash.png "$dest" + cp $source/graphics/zoom*.png "$dest" + cp $source/graphics/zoom_all*.png "$dest" + cp $source/graphics/select*.png "$dest" + cp $source/graphics/snap*.png "$dest" + cp $source/graphics/sequence*.png "$dest" + cp $source/graphics/me.jpg "$dest" + cp $source/graphics/link*.png "$dest" + cp $source/graphics/add*.png "$dest" + cp $source/graphics/pause*.png "$dest" + cp -r $source/web "$dest" cp -r $prefix/share/libdcp/xsd "$dest" cp -r $prefix/share/libdcp/tags "$dest" cp -r $prefix/share/libdcp/ratings "$dest" @@ -261,15 +280,15 @@ function copy_resources { # 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 sl_SI hu_HU ka_KA fa_IR; 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" - cp $prefix/src/dcpomatic/build/src/tools/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES" + cp $source/build/src/lib/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES" + cp $source/build/src/wx/mo/$lang/*.mo "$dest/$lang/LC_MESSAGES" + cp $source/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 sl; do mkdir "$dest/$lang" - cp $ENV/$ARCH1/share/locale/$lang/LC_MESSAGES/wxstd.mo "$dest/$lang" + cp $ENV/$ARCH1/share/locale/$lang/LC_MESSAGES/wxstd*.mo "$dest/$lang" done } @@ -341,7 +360,7 @@ function make_dmg { else dmg="$full_name $version macOS10.10+.dmg" fi - vol_name=DCP-o-matic-$version + vol_name=$VOLUME_PREFIX$version find "$appdir/Contents/Frameworks" -iname "*.dylib" -type f -print0 | while IFS= read -r -d '' f; do sign "$f" @@ -366,17 +385,17 @@ function make_dmg { 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 +Welcome to $GENERAL_NAME 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 +Beim erstmaligen Start der $GENERAL_NAME 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 +$GENERAL_NAME Anwendungen ab, bei weiteren Programmstarts wird sie nicht mehr auftreten. EOF @@ -463,8 +482,8 @@ function setup { 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) + mv "$approot/MacOS/dcpverify" "$approot/MacOS/dcpomatic2_verify_cli" + rl=("$approot/MacOS/dcpomatic2_verify_cli" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" } @@ -483,123 +502,136 @@ 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" + setup "$DCPOMATIC_APP" + copy $ROOT src/$SOURCE_NAME/build/src/tools/dcpomatic2 "$approot/MacOS" + copy $ROOT src/$SOURCE_NAME/build/src/tools/dcpomatic2_cli "$approot/MacOS" + copy $ROOT src/$SOURCE_NAME/build/src/tools/dcpomatic2_create "$approot/MacOS" + copy $ROOT src/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/build/platform/osx/dcpomatic2.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2" "$approot/MacOS/dcpomatic2_cli" "$approot/MacOS/dcpomatic2_create" "$approot/MacOS/dcpomatic2_map" "$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_map dcpomatic2" + make_dmg "$appdir" "" "$GENERAL_NAME" "dcpomatic2_verify_cli dcpomatic2_kdm_inspect openssl ffprobe dcpomatic2_cli dcpomatic2_create dcpomatic2_map 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" + setup "$KDM_CREATOR_APP" + copy $ROOT src/$SOURCE_NAME/build/src/tools/dcpomatic2_kdm "$approot/MacOS" + copy $ROOT src/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "$KDM_CREATOR_NAME" "dcpomatic2_verify_cli 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/$SOURCE_NAME/build/src/tools/dcpomatic2_server "$approot/MacOS" + copy $ROOT src/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "DCP-o-matic Encode Server" "dcpomatic2_verify_cli 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/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "DCP-o-matic Batch Converter" "dcpomatic2_verify_cli 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" + setup "$PLAYER_APP" + copy $ROOT src/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "$PLAYER_NAME" "dcpomatic2_verify_cli 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/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" "dcpomatic2_verify_cli 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/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "DCP-o-matic Combiner" "dcpomatic2_verify_cli 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/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/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" + make_dmg "$appdir" "" "DCP-o-matic Editor" "dcpomatic2_verify_cli dcpomatic2_kdm_inspect openssl dcpomatic2_editor" +fi + +if [[ "$BUILD" == *verifier* ]]; then + # DCP-o-matic Verifier + setup "$VERIFIER_APP" + copy $ROOT src/$SOURCE_NAME/build/src/tools/dcpomatic2_verifier "$approot/MacOS" + copy $ROOT src/openssl/apps/openssl "$approot/MacOS" + copy_verify + copy_kdm + cp $prefix/src/$SOURCE_NAME/build/platform/osx/dcpomatic2_verifier.Info.plist "$approot/Info.plist" + rl=("$approot/MacOS/dcpomatic2_verifier" "$approot/Frameworks/"*.dylib) + relink_relative "${rl[@]}" + make_dmg "$appdir" "" "$VERIFIER_NAME" "dcpomatic2_verify_cli dcpomatic2_kdm_inspect openssl dcpomatic2_verifier" 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/$SOURCE_NAME/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" + cp $prefix/src/$SOURCE_NAME/platform/osx/uninstall_disk.applescript "$approot/Resources" + cp $prefix/src/$SOURCE_NAME/build/platform/osx/dcpomatic2_disk.Info.plist "$approot/Info.plist" rl=("$approot/MacOS/dcpomatic2_disk" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" @@ -651,7 +683,7 @@ EOF # 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 $ROOT src/$SOURCE_NAME/build/src/tools/dcpomatic2_disk_writer "$pkgbin" copy_libs "$pkgbin" rl=("$pkgbin/dcpomatic2_disk_writer" "$pkgbin/"*.dylib) @@ -675,6 +707,6 @@ EOF 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 dcpomatic2_kdm_inspect openssl dcpomatic2_disk" + make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer" "dcpomatic2_verify_cli dcpomatic2_kdm_inspect openssl dcpomatic2_disk" fi diff --git a/platform/osx/wscript b/platform/osx/wscript index fd6733a66..39e8a5815 100644 --- a/platform/osx/wscript +++ b/platform/osx/wscript @@ -1,10 +1,11 @@ def build(bld): - obj = bld(features='subst', source='dcpomatic2.Info.plist.in', target='dcpomatic2.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_kdm.Info.plist.in', target='dcpomatic2_kdm.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_server.Info.plist.in', target='dcpomatic2_server.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_batch.Info.plist.in', target='dcpomatic2_batch.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_player.Info.plist.in', target='dcpomatic2_player.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_playlist.Info.plist.in', target='dcpomatic2_playlist.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_disk.Info.plist.in', target='dcpomatic2_disk.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_combiner.Info.plist.in', target='dcpomatic2_combiner.Info.plist', version=bld.env.VERSION) - obj = bld(features='subst', source='dcpomatic2_editor.Info.plist.in', target='dcpomatic2_editor.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2.Info.plist.in', target='dcpomatic2.Info.plist', version=bld.env.VERSION, NAME="DCP-o-matic 2") + bld(features='subst', source='dcpomatic2_kdm.Info.plist.in', target='dcpomatic2_kdm.Info.plist', version=bld.env.VERSION, NAME="DCP-o-matic 2 KDM Creator") + bld(features='subst', source='dcpomatic2_server.Info.plist.in', target='dcpomatic2_server.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2_batch.Info.plist.in', target='dcpomatic2_batch.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2_player.Info.plist.in', target='dcpomatic2_player.Info.plist', version=bld.env.VERSION, NAME="DCP-o-matic 2 Player") + bld(features='subst', source='dcpomatic2_playlist.Info.plist.in', target='dcpomatic2_playlist.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2_disk.Info.plist.in', target='dcpomatic2_disk.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2_combiner.Info.plist.in', target='dcpomatic2_combiner.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2_editor.Info.plist.in', target='dcpomatic2_editor.Info.plist', version=bld.env.VERSION) + bld(features='subst', source='dcpomatic2_verifier.Info.plist.in', target='dcpomatic2_verifier.Info.plist', version=bld.env.VERSION, NAME="DCP-o-matic 2 Verifier") diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc deleted file mode 100644 index e58e81b7f..000000000 --- a/platform/windows/dcpomatic.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic2_disk_writer.exe.manifest b/platform/windows/dcpomatic2_disk_writer.exe.manifest deleted file mode 100644 index 7d922a0db..000000000 --- a/platform/windows/dcpomatic2_disk_writer.exe.manifest +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="dcpomatic2_disk_writer" type="win32"/>
- <description>DCP-o-matic Disk Writer</description>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
diff --git a/platform/windows/dcpomatic2_verifier.bat b/platform/windows/dcpomatic2_verifier.bat new file mode 100644 index 000000000..d8850d9fe --- /dev/null +++ b/platform/windows/dcpomatic2_verifier.bat @@ -0,0 +1 @@ +gdb.exe -x gdb_script dcpomatic2_verifier.exe > %HOMEPATH%/Documents/dcpomatic_debug_log.txt diff --git a/platform/windows/dcpomatic_batch.rc b/platform/windows/dcpomatic_batch.rc deleted file mode 100644 index 9aea38110..000000000 --- a/platform/windows/dcpomatic_batch.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_batch.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_combiner.rc b/platform/windows/dcpomatic_combiner.rc deleted file mode 100644 index 700d85a8b..000000000 --- a/platform/windows/dcpomatic_combiner.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_combiner.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_disk.rc b/platform/windows/dcpomatic_disk.rc deleted file mode 100644 index eac76a0d5..000000000 --- a/platform/windows/dcpomatic_disk.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_disk.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_disk_writer.rc b/platform/windows/dcpomatic_disk_writer.rc deleted file mode 100644 index 70138ed12..000000000 --- a/platform/windows/dcpomatic_disk_writer.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "winuser.h"
-1 RT_MANIFEST "dcpomatic2_disk_writer.exe.manifest"
diff --git a/platform/windows/dcpomatic_editor.rc b/platform/windows/dcpomatic_editor.rc deleted file mode 100644 index 865590f51..000000000 --- a/platform/windows/dcpomatic_editor.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_editor.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_kdm.rc b/platform/windows/dcpomatic_kdm.rc deleted file mode 100644 index 057a42c01..000000000 --- a/platform/windows/dcpomatic_kdm.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_kdm.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_player.rc b/platform/windows/dcpomatic_player.rc deleted file mode 100644 index dd5e0d1fe..000000000 --- a/platform/windows/dcpomatic_player.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_player.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_playlist.rc b/platform/windows/dcpomatic_playlist.rc deleted file mode 100644 index 2bb457371..000000000 --- a/platform/windows/dcpomatic_playlist.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_playlist.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_server.rc b/platform/windows/dcpomatic_server.rc deleted file mode 100644 index fb9f4e811..000000000 --- a/platform/windows/dcpomatic_server.rc +++ /dev/null @@ -1,2 +0,0 @@ -id ICON "../../graphics/windows/dcpomatic2_server.ico" -#include "wx-3.1/wx/msw/wx.rc" diff --git a/platform/windows/wscript b/platform/windows/wscript index 17965d54c..fb235ecba 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -2,20 +2,52 @@ from __future__ import print_function import os -def start_menu_shortcut(file, link, target, debug=False): +def start_menu_shortcut_folder(variant): + return 'DCP-o-matic 2' + +def long_name(variant): + return 'DCP-o-matic 2' + +def short_name(variant): + return 'DCP-o-matic' + +def kdm_creator_name(variant): + return 'KDM Creator' + +def player_name(variant): + return 'Player' + +def verifier_name(variant): + return 'Verifier' + +def tool_name(variant, debug, tool): + name = 'DCP-o-matic 2 %s' % tool if debug: - print(f'CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\{link}.lnk" "$INSTDIR\\{target}"', file=file) - else: - print(f'CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\{link}.lnk" "$INSTDIR\\{target}"', file=file) + name += ' debug' + return name + + + +def start_menu_shortcut(file, link, target, variant, debug=False): + folder = start_menu_shortcut_folder(variant) + if debug: + folder += ' debug' + print('CreateShortCut "$SMPROGRAMS\\%s\\%s.lnk" "$INSTDIR\\%s"' % (folder, link, target), file=file) -def write_installer(bits, dcpomatic_version, debug, disk): +def write_installer(bits, dcpomatic_version, debug, disk, variant): + long_name_with_debug = long_name(variant) + short_name_with_debug = short_name(variant) + if debug: + long_name_with_debug += ' debug' + short_name_with_debug += ' debug' tools = [ + ('kdm', kdm_creator_name(variant)), + ('player', player_name(variant)), + ('verifier', verifier_name(variant)), ('batch', 'Batch Converter'), - ('kdm', 'KDM Creator'), ('kdm_cli', 'KDM Creator CLI'), - ('player', 'Player'), ('cli', 'CLI'), ('create', 'Creator'), ('playlist', 'Playlist Editor'), @@ -40,19 +72,11 @@ def write_installer(bits, dcpomatic_version, debug, disk): if bits == 64: print('!include "x64.nsh"', file=f) - if debug: - print('Name "DCP-o-matic debug"', file=f) - else: - print('Name "DCP-o-matic"', file=f) - + print('Name "%s"' % short_name_with_debug, file=f) print('RequestExecutionLevel admin', file=f) print('Unicode true', file=f) - outfile = 'DCP-o-matic ' - if debug: - outfile += 'Debug ' - outfile += '%s %d-bit Installer.exe' % (dcpomatic_version, bits) - + outfile = '%s %s %d-bit Installer.exe' % (short_name_with_debug, dcpomatic_version, bits) print('outFile "%s"' % outfile, file=f) print(""" @@ -67,10 +91,7 @@ def write_installer(bits, dcpomatic_version, debug, disk): else: program_files = "$PROGRAMFILES" - if debug: - print('InstallDir "%s\\DCP-o-matic 2 debug"' % program_files, file=f) - else: - print('InstallDir "%s\\DCP-o-matic 2"' % program_files, file=f) + print('InstallDir "%s\\%s"' % (program_files, long_name_with_debug), file=f) print(""" !insertmacro MUI_PAGE_WELCOME @@ -116,14 +137,14 @@ File "%static_deps%/bin/libssh.dll" File "%static_deps%/bin/libstdc++-6.dll" File "%static_deps%/bin/zlib1.dll" File "%static_deps%/bin/libjpeg-9.dll" -File "%static_deps%/bin/wxbase314u_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_core_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_adv_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_richtext_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_html_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_gl_gcc_custom.dll" -File "%static_deps%/bin/wxmsw314u_propgrid_gcc_custom.dll" -File "%static_deps%/bin/wxbase314u_xml_gcc_custom.dll" +File "%static_deps%/bin/wxbase317u_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_core_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_html_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_gl_gcc_custom.dll" +File "%static_deps%/bin/wxmsw317u_propgrid_gcc_custom.dll" +File "%static_deps%/bin/wxbase317u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" @@ -131,7 +152,8 @@ File "%static_deps%/bin/libpango-1.0-0.dll" File "%static_deps%/bin/libgmodule-2.0-0.dll" File "%static_deps%/bin/libpangocairo-1.0-0.dll" File "%static_deps%/bin/libpangowin32-1.0-0.dll" -File "%static_deps%/bin/libtiff-5.dll" +File "%static_deps%/bin/libpangoft2-1.0-0.dll" +File "%static_deps%/bin/libtiff-6.dll" File "%static_deps%/bin/libglibmm-2.4-1.dll" File "%static_deps%/bin/libxml++-2.6-2.dll" File "%static_deps%/bin/libxml2-2.dll" @@ -143,7 +165,7 @@ File "%static_deps%/bin/libxmlsec1.dll" File "%static_deps%/bin/libxmlsec1-openssl.dll" File "%static_deps%/bin/libexslt-0.dll" File "%static_deps%/bin/libxslt-1.dll" -File "%static_deps%/bin/libffi-6.dll" +File "%static_deps%/bin/libffi-7.dll" File "%static_deps%/bin/openssl.exe" File "%static_deps%/bin/libcurl-4.dll" File "%static_deps%/bin/libzip.dll" @@ -166,11 +188,15 @@ File "%static_deps%/bin/libunistring-2.dll" File "%static_deps%/bin/libssh2-1.dll" File "%static_deps%/bin/libgcrypt-20.dll" File "%static_deps%/bin/libgpg-error-0.dll" -File "%static_deps%/bin/libpangoft2-1.0-0.dll" File "%static_deps%/bin/libx264-155.dll" File "%static_deps%/bin/libwebp-7.dll" File "%static_deps%/bin/GLEW.dll" File "%static_deps%/bin/libdav1d.dll" +File "%static_deps%/bin/libbrotlidec.dll" +File "%static_deps%/bin/libbrotlicommon.dll" +File "%static_deps%/bin/libfribidi-0.dll" +File "%static_deps%/bin/libsharpyuv-0.dll" +File "%static_deps%/bin/libsqlite3-0.dll" """, file=f) if bits == 32: @@ -181,11 +207,11 @@ File "%static_deps%/bin/libdav1d.dll" print(""" File "%static_deps%/bin/libltdl-7.dll" File "%static_deps%/bin/libdl.dll" -File /oname=dcpomatic2_verify.exe "%cdist_deps%/bin/dcpverify.exe" +File /oname=dcpomatic2_verify_cli.exe "%cdist_deps%/bin/dcpverify.exe" File /oname=dcpomatic2_kdm_inspect.exe "%cdist_deps%/bin/dcpkdm.exe" File "%cdist_deps%/bin/leqm_nrt.dll" -File "%cdist_deps%/bin/asdcp-carl.dll" -File "%cdist_deps%/bin/kumu-carl.dll" +File "%cdist_deps%/bin/asdcp-dcpomatic.dll" +File "%cdist_deps%/bin/kumu-dcpomatic.dll" """, file=f) if disk: @@ -196,14 +222,14 @@ File "%cdist_deps%/lib/liblwext4.dll" """, file=f) print(""" -File "%cdist_deps%/bin/avcodec-58.dll" -File "%cdist_deps%/bin/avfilter-7.dll" -File "%cdist_deps%/bin/avformat-58.dll" -File "%cdist_deps%/bin/avutil-56.dll" -File "%cdist_deps%/bin/avdevice-58.dll" -File "%cdist_deps%/bin/postproc-55.dll" -File "%cdist_deps%/bin/swresample-3.dll" -File "%cdist_deps%/bin/swscale-5.dll" +File "%cdist_deps%/bin/avcodec-61.dll" +File "%cdist_deps%/bin/avfilter-10.dll" +File "%cdist_deps%/bin/avformat-61.dll" +File "%cdist_deps%/bin/avutil-59.dll" +File "%cdist_deps%/bin/avdevice-61.dll" +File "%cdist_deps%/bin/postproc-58.dll" +File "%cdist_deps%/bin/swresample-5.dll" +File "%cdist_deps%/bin/swscale-8.dll" File "%cdist_deps%/bin/dcp-1.0.dll" File "%cdist_deps%/bin/cxml-0.dll" File "%cdist_deps%/bin/sub-1.0.dll" @@ -232,47 +258,47 @@ SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES" File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo" File "%binaries%/src/wx/mo/fr_FR/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/fr_FR/dcpomatic2.mo" -File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES" File "%binaries%/src/lib/mo/it_IT/libdcpomatic2.mo" File "%binaries%/src/wx/mo/it_IT/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/it_IT/dcpomatic2.mo" -File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES" File "%binaries%/src/lib/mo/es_ES/libdcpomatic2.mo" File "%binaries%/src/wx/mo/es_ES/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/es_ES/dcpomatic2.mo" -File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES" File "%binaries%/src/lib/mo/sv_SE/libdcpomatic2.mo" File "%binaries%/src/wx/mo/sv_SE/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dcpomatic2.mo" -File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES" File "%binaries%/src/lib/mo/de_DE/libdcpomatic2.mo" File "%binaries%/src/wx/mo/de_DE/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/de_DE/dcpomatic2.mo" -File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES" File "%binaries%/src/lib/mo/nl_NL/libdcpomatic2.mo" File "%binaries%/src/wx/mo/nl_NL/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/nl_NL/dcpomatic2.mo" -File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\ru\\LC_MESSAGES" File "%binaries%/src/lib/mo/ru_RU/libdcpomatic2.mo" File "%binaries%/src/wx/mo/ru_RU/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/ru_RU/dcpomatic2.mo" -File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/ru/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\pl\\LC_MESSAGES" File "%binaries%/src/lib/mo/pl_PL/libdcpomatic2.mo" File "%binaries%/src/wx/mo/pl_PL/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/pl_PL/dcpomatic2.mo" -File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/pl/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\da\\LC_MESSAGES" File "%binaries%/src/lib/mo/da_DK/libdcpomatic2.mo" File "%binaries%/src/wx/mo/da_DK/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/da_DK/dcpomatic2.mo" -File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\pt_PT\\LC_MESSAGES" File "%binaries%/src/lib/mo/pt_PT/libdcpomatic2.mo" File "%binaries%/src/wx/mo/pt_PT/libdcpomatic2-wx.mo" @@ -289,7 +315,7 @@ SetOutPath "$INSTDIR\\locale\\cs\\LC_MESSAGES" File "%binaries%/src/lib/mo/cs_CZ/libdcpomatic2.mo" File "%binaries%/src/wx/mo/cs_CZ/libdcpomatic2-wx.mo" File "%binaries%/src/tools/mo/cs_CZ/dcpomatic2.mo" -File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd.mo" +File "%static_deps%/share/locale/cs/LC_MESSAGES/wxstd-3.1.mo" SetOutPath "$INSTDIR\\locale\\uk\\LC_MESSAGES" File "%binaries%/src/lib/mo/uk_UA/libdcpomatic2.mo" File "%binaries%/src/wx/mo/uk_UA/libdcpomatic2-wx.mo" @@ -342,6 +368,8 @@ File "%graphics%/add_black.png" File "%graphics%/add_white.png" File "%graphics%/pause_black.png" File "%graphics%/pause_white.png" +SetOutPath "$INSTDIR\\web" +File "%web%/index.html" SetOutPath "$INSTDIR\\xsd" File "%cdist_deps%/share/libdcp/xsd/DCDMSubtitle-2010.xsd" File "%cdist_deps%/share/libdcp/xsd/DCDMSubtitle-2014.xsd" @@ -379,18 +407,12 @@ File "%cdist_deps%/share/libdcp/ratings" SectionEnd """, file=f) - if debug: - print('Section "DCP-o-matic 2 debug" SEC_MASTER', file=f) - else: - print('Section "DCP-o-matic 2" SEC_MASTER', file=f) + print('Section "%s" SEC_MASTER' % long_name_with_debug, file=f) print('SetOutPath "$INSTDIR\\bin"', file=f) print("SetShellVarContext all", file=f) - if debug: - print('CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2 debug"', file=f) - else: - print('CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"', file=f) + print('CreateDirectory "$SMPROGRAMS\\%s"' % long_name_with_debug, file=f) print('File "%binaries%/src/tools/dcpomatic2.exe"', file=f) for s, l in tools: @@ -399,36 +421,23 @@ SectionEnd if disk: print(""" File "%binaries%/src/tools/dcpomatic2_disk_writer.exe" -File "%resources%/dcpomatic2_disk_writer.exe.manifest" +File "%binaries%/src/tools/dcpomatic2_disk_writer.exe.manifest" """, file=f) - if debug: - start_menu_shortcut(f, 'DCP-o-matic 2 debug', 'bin\\dcpomatic2_debug.bat', debug=True) - for s, l in tools: - start_menu_shortcut(f, f'DCP-o-matic 2 {l} debug', f'bin\\dcpomatic2_{s}_debug.bat', debug=True) - start_menu_shortcut(f, 'Uninstall DCP-o-matic 2 debug', 'Uninstall.exe', debug=True) - print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "DisplayName" "DCP-o-matic 2 debug (remove only)"', file=f) - print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) - else: - start_menu_shortcut(f, 'DCP-o-matic 2', 'bin\\dcpomatic2.exe') - for s, l in tools: - start_menu_shortcut(f, f'DCP-o-matic 2 {l}', f'bin\\dcpomatic2_{s}.exe') - start_menu_shortcut(f, 'Uninstall DCP-o-matic 2', 'Uninstall.exe') - print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f) - print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) + suffix = '_debug.bat' if debug else '.exe' + start_menu_shortcut(f, long_name_with_debug, 'bin\\dcpomatic2%s' % suffix, variant, debug=True) + for s, l in tools: + start_menu_shortcut(f, tool_name(variant, debug, l), 'bin\\dcpomatic2_%s%s' % (s, suffix), variant, debug=True) + start_menu_shortcut(f, 'Uninstall %s' % long_name_with_debug, 'Uninstall.exe', variant, debug=True) + print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%s" "DisplayName" "%s (remove only)"' % (long_name_with_debug, long_name_with_debug), file=f) + print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%s" "UninstallString" "$INSTDIR\\Uninstall.exe"' % long_name_with_debug, file=f) print("SectionEnd", file=f) - if debug: - print('Section "DCP-o-matic 2 debug desktop shortcuts" SEC_MASTER_DESKTOP', file=f) - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f) - for s, l in tools: - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 %s debug.lnk" "$INSTDIR\\bin\\dcpomatic2_%s_debug.bat" ""' % (l, s), file=f) - else: - print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f) - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f) - for s, l in tools: - print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 %s.lnk" "$INSTDIR\\bin\\dcpomatic2_%s.exe"' % (l, s), file=f) + print('Section "%s desktop shortcuts" SEC_MASTER_DESKTOP' % long_name_with_debug, file=f) + print('CreateShortCut "$DESKTOP\\%s.lnk" "$INSTDIR\\bin\\dcpomatic2%s" ""' % (long_name_with_debug, suffix), file=f) + for s, l in tools: + print('CreateShortCut "$DESKTOP\\%s.lnk" "$INSTDIR\\bin\\dcpomatic2_%s%s" ""' % (tool_name(variant, debug, l), s, suffix), file=f) print("SectionEnd", file=f) @@ -440,8 +449,8 @@ File "%binaries%/src/tools/dcpomatic2_server_cli.exe" File "%binaries%/src/tools/dcpomatic2_server.exe" """, file=f) - start_menu_shortcut(f, 'DCP-o-matic 2 Encode Server', 'bin\\dcpomatic2_server.exe') - start_menu_shortcut(f, 'Uninstall DCP-o-matic 2', 'Uninstall.exe') + start_menu_shortcut(f, 'DCP-o-matic 2 Encode Server', 'bin\\dcpomatic2_server.exe', variant) + start_menu_shortcut(f, 'Uninstall DCP-o-matic 2', 'Uninstall.exe', variant) print(""" SectionEnd @@ -512,5 +521,5 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U def build(bld): - write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK) - write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK) + write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK, bld.env.VARIANT) + write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK, bld.env.VARIANT) |