X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e65d1f5c133ed67ca045fc98fc1f30948b16858f;hb=131f0327b8e2fcd07c54201b6e7d4f60591811ba;hp=cef56434b1103c66d5096176c463a29c643fd525;hpb=1b0dfb12c7e5b5b01a35f3c4a810edae27bce3d0;p=dcpomatic.git diff --git a/cscript b/cscript index cef56434b..e65d1f5c1 100644 --- a/cscript +++ b/cscript @@ -2,19 +2,20 @@ # # Copyright (C) 2012-2016 Carl Hetherington # -# This program is free software; you can redistribute it and/or modify +# This file is part of DCP-o-matic. +# +# DCP-o-matic is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, +# DCP-o-matic is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# along with DCP-o-matic. If not, see . # from __future__ import print_function @@ -235,9 +236,9 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options), - ('libdcp', 'f028e8a'), - ('libsub', 'b082fb6')) + return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options), + ('libdcp', '8837fe7'), + ('libsub', '3e299e5')) def configure_options(target): opt = '' @@ -370,7 +371,10 @@ def make_manual(target): target.command('pdflatex colour.tex') return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')] -def test(target): +def test(target, test): if target.platform != 'windows': target.set('LC_ALL', 'C') - target.command('run/tests') + if test is None: + target.command('run/tests') + else: + target.command('run/tests --run_test=%s' % test)