From 2df5e3ab3636e0c38c3003631d0d6acdb5bd23c6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 7 May 2019 11:35:07 +0100 Subject: [PATCH] Fix manual build. --- doc/manual/.gitignore | 3 --- doc/manual/Makefile | 3 +++ doc/manual/dcpomatic_cli.xml | 17 +++++++++++++++++ doc/manual/dcpomatic_create.xml | 24 ++++++++++++++++++++++++ doc/manual/dcpomatic_kdm_cli.xml | 22 ++++++++++++++++++++++ run/dcpomatic_kdm_cli | 2 ++ 6 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 doc/manual/dcpomatic_cli.xml create mode 100644 doc/manual/dcpomatic_create.xml create mode 100644 doc/manual/dcpomatic_kdm_cli.xml diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore index 8b8714fbf..e69de29bb 100644 --- a/doc/manual/.gitignore +++ b/doc/manual/.gitignore @@ -1,3 +0,0 @@ -dcpomatic_create.xml -dcpomatic_kdm_cli.xml -dcpomatic_cli.xml \ No newline at end of file diff --git a/doc/manual/Makefile b/doc/manual/Makefile index 8e19040b7..f7120493e 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -68,6 +68,9 @@ diagrams/%.pdf: diagrams/%.svg config.xml: ../../src/lib/config.cc config.py python3 config.py ../../src/lib/config.cc > config.xml +# These require the tools to be runnable, so make needs to be run +# in a built tree to update them. The .xml files are committed +# to git to avoid this always being necessary. dcpomatic_create.xml: ../../src/tools/dcpomatic_create.cc cli.py python3 cli.py dcpomatic_create > dcpomatic_create.xml diff --git a/doc/manual/dcpomatic_cli.xml b/doc/manual/dcpomatic_cli.xml new file mode 100644 index 000000000..531ca813b --- /dev/null +++ b/doc/manual/dcpomatic_cli.xml @@ -0,0 +1,17 @@ + + +-v, --version — show DCP-o-matic version +-h, --help — show this help +-f, --flags — show flags passed to C++ compiler on build +-n, --no-progress — do not print progress to stdout +-r, --no-remote — do not use any remote servers +-t, --threads — specify number of local encoding threads (overriding configuration) +-j, --json <port> — run a JSON server on the specified port +-k, --keep-going — keep running even when the job is complete +-s, --servers <file> — specify servers to use in a text file +-l, --list-servers — just display a list of encoding servers that DCP-o-matic is configured to use; don't encode +-d, --dcp-path — echo DCP's path to stdout on successful completion (implies -n) +-c, --config <dir> — directory containing config.xml and cinemas.xml +--dump — just dump a summary of the film's settings; don't encode + + \ No newline at end of file diff --git a/doc/manual/dcpomatic_create.xml b/doc/manual/dcpomatic_create.xml new file mode 100644 index 000000000..215a131d9 --- /dev/null +++ b/doc/manual/dcpomatic_create.xml @@ -0,0 +1,24 @@ + + +-v, --version — show DCP-o-matic version +-h, --help — show this help +-n, --name <name> — film name +-t, --template <name> — template name +-e, --encrypt — make an encrypted DCP +-c, --dcp-content-type <type> — FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV +-f, --dcp-frame-rate <rate> — set DCP video frame rate (otherwise guessed from content) +--container-ratio <ratio> — 119, 133, 137, 138, 166, 178, 185 or 239 +--content-ratio <ratio> — 119, 133, 137, 138, 166, 178, 185 or 239 +-s, --still-length <n> — number of seconds that still content should last +--standard <standard> — SMPTE or interop (default SMPTE) +--no-use-isdcf-name — do not use an ISDCF name; use the specified name unmodified +--no-sign — do not sign the DCP +--config <dir> — directory containing config.xml and cinemas.xml +--fourk — make a 4K DCP rather than a 2K one +-o, --output <dir> — output directory +--threed — make a 3D DCP +--j2k-bandwidth <Mbit/s> — J2K bandwidth in Mbit/s +--left-eye — next piece of content is for the left eye +--right-eye — next piece of content is for the right eye + + \ No newline at end of file diff --git a/doc/manual/dcpomatic_kdm_cli.xml b/doc/manual/dcpomatic_kdm_cli.xml new file mode 100644 index 000000000..283763a34 --- /dev/null +++ b/doc/manual/dcpomatic_kdm_cli.xml @@ -0,0 +1,22 @@ + + +-h, --help — show this help +-o, --output — output file or directory +-K, --filename-format — filename format for KDMs +-Z, --container-name-format — filename format for ZIP containers +-f, --valid-from — valid from time (in local time zone of the cinema) (e.g. “2013-09-28 01:41:51”) or “now” +-t, --valid-to — valid to time (in local time zone of the cinema) (e.g. “2014-09-28 01:41:51”) +-d, --valid-duration — valid duration (e.g. “1 day”, “4 hours”, “2 weeks”) +-F, --formulation — modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1] +-a, --disable-forensic-marking-picture — disable forensic marking of pictures essences +-a, --disable-forensic-marking-audio — disable forensic marking of audio essences (optionally above a given channel, e.g 12) +-z, --zip — ZIP each cinema's KDMs into its own file +-v, --verbose — be verbose +-c, --cinema — specify a cinema, either by name or email address +-S, --screen — screen description +-C, --certificate — file containing projector certificate +-T, --trusted-device — file containing a trusted device's certificate +--list-cinemas — list known cinemas from the DCP-o-matic settings +--list-dkdm-cpls — list CPLs for which DCP-o-matic has DKDMs + + \ No newline at end of file diff --git a/run/dcpomatic_kdm_cli b/run/dcpomatic_kdm_cli index ce32ef555..0f75232cb 100755 --- a/run/dcpomatic_kdm_cli +++ b/run/dcpomatic_kdm_cli @@ -1,5 +1,7 @@ #!/bin/bash +cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/.. + export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH:build/src if [ "$1" == "--debug" ]; then shift -- 2.30.2