#include <magick/MagickCore.h>
#include <magick/version.h>
#include <libssh/libssh.h>
+#include <libdcp/version.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
<< "libpostproc " << ffmpeg_version_to_string (postproc_version()) << ", "
<< "libswscale " << ffmpeg_version_to_string (swscale_version()) << ", "
<< MagickVersion << ", "
- << "libssh " << ssh_version (0);
+ << "libssh " << ssh_version (0) << ", "
+ << "libdcp " << libdcp::version << " git " << libdcp::git_commit;
return s.str ();
}
#include <iostream>
#include <iomanip>
#include <getopt.h>
+#include <libdcp/test_mode.h>
+#include <libdcp/version.h>
#include "format.h"
#include "film.h"
#include "filter.h"
#include "ab_transcode_job.h"
#include "util.h"
#include "scaler.h"
+#include "version.h"
using namespace std;
using namespace boost;
static void
help (string n)
{
- cerr << "Syntax: " << n << " [--help] [--deps] [--film <film>]\n";
+ cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
+ << " -h, --help show this help\n"
+ << " -d, --deps list DVD-o-matic dependency details and quit\n"
+ << " -t, --test run in test mode (repeatable UUID generation and timestamps)\n"
+ << " -n, --no-progress do not print progress to stdout\n"
+ << "\n"
+ << "<FILM> is the film directory.\n";
}
int
main (int argc, char* argv[])
{
string film_dir;
+ bool test_mode = false;
+ bool progress = true;
+ int option_index = 0;
while (1) {
static struct option long_options[] = {
{ "help", no_argument, 0, 'h'},
{ "deps", no_argument, 0, 'd'},
- { "film", required_argument, 0, 'f'},
+ { "test", no_argument, 0, 't'},
+ { "no-progress", no_argument, 0, 'n'},
{ 0, 0, 0, 0 }
};
- int option_index = 0;
- int c = getopt_long (argc, argv, "hdf:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "hdtn", long_options, &option_index);
if (c == -1) {
break;
case 'd':
cout << dependency_version_summary () << "\n";
exit (EXIT_SUCCESS);
- case 'f':
- film_dir = optarg;
+ case 't':
+ test_mode = true;
+ break;
+ case 'n':
+ progress = false;
break;
}
}
- if (film_dir.empty ()) {
+ if (optind >= argc) {
help (argv[0]);
exit (EXIT_FAILURE);
}
+
+ film_dir = argv[optind];
dvdomatic_setup ();
+ cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
+ char buf[256];
+ if (gethostname (buf, 256) == 0) {
+ cout << " on " << buf;
+ }
+ cout << "\n";
+
+ if (test_mode) {
+ libdcp::enable_test_mode ();
+ cout << dependency_version_summary() << "\n";
+ }
+
Film* film = 0;
try {
film = new Film (film_dir, true);
cout << "A/B ";
}
cout << "DCP for " << film->name() << "\n";
+ cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
cout << "Content: " << film->content() << "\n";
pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
cout << "Filters: " << f.first << " " << f.second << "\n";
while (!all_done) {
sleep (5);
-
- if (!first) {
+
+ if (!first && progress) {
cout << "\033[" << jobs.size() << "A";
cout.flush ();
}
all_done = true;
for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
- cout << (*i)->name() << ": ";
-
- float const p = (*i)->overall_progress ();
-
- if (p >= 0) {
- cout << (*i)->status() << " \n";
- } else {
- cout << ": Running \n";
+ if (progress) {
+ cout << (*i)->name() << ": ";
+
+ float const p = (*i)->overall_progress ();
+
+ if (p >= 0) {
+ cout << (*i)->status() << " \n";
+ } else {
+ cout << ": Running \n";
+ }
}
if (!(*i)->finished ()) {
+import subprocess
+
APPNAME = 'dvdomatic'
-VERSION = '0.26'
+VERSION = '0.27pre'
def options(opt):
opt.load('compiler_cxx')
conf.recurse('test')
def build(bld):
+ create_version_cc(VERSION)
+
bld.recurse('src')
bld.recurse('test')
for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
-
def dist(ctx):
ctx.excl = 'TODO core *~ src/gtk/*~ src/lib/*~ .waf* build .git'
+
+def create_version_cc(version):
+ cmd = "LANG= git log --abbrev HEAD^..HEAD ."
+ output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+ o = output[0].decode('utf-8')
+ commit = o.replace ("commit ", "")[0:10]
+
+ try:
+ text = '#include "version.h"\n'
+ text += 'char const * dvdomatic_git_commit = \"%s\";\n' % commit
+ text += 'char const * dvdomatic_version = \"%s\";\n' % version
+ print('Writing version information to src/lib/version.cc')
+ o = open('src/lib/version.cc', 'w')
+ o.write(text)
+ o.close()
+ except IOError:
+ print('Could not open src/lib/version.cc for writing\n')
+ sys.exit(-1)