projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use edit rate not frame rate for displaying rate of DCPs.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 04929e2ffdfd142c36f70af8b6a6227a41ffd842..e65d1f5c133ed67ca045fc98fc1f30948b16858f 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-2,19
+2,20
@@
#
# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
#
#
# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
#
-# 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.
#
# 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
# 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 <http://www.gnu.org/licenses/>.
#
from __future__ import print_function
#
from __future__ import print_function
@@
-207,7
+208,7
@@
def make_spec(filename, version, target):
if target.distro == 'centos' and target.version == '5':
prefix = 'BUILDROOT/usr'
else:
if target.distro == 'centos' and target.version == '5':
prefix = 'BUILDROOT/usr'
else:
- prefix = '%
%
{buildroot}/usr'
+ prefix = '%{buildroot}/usr'
print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%s --install-prefix=/usr %s' %
(target.directory, target.directory, prefix, configure_options(target)), file=f)
print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%s --install-prefix=/usr %s' %
(target.directory, target.directory, prefix, configure_options(target)), file=f)
@@
-235,9
+236,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
cd922b8
', ffmpeg_options),
- ('libdcp', '
4e6b78d
'),
- ('libsub', '
b082fb6
'))
+ return (('ffmpeg-cdist', '
aab2fb1
', ffmpeg_options),
+ ('libdcp', '
8837fe7
'),
+ ('libsub', '
3e299e5
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-325,7
+326,7
@@
def package_rpm(target, cpu, version):
make_spec('build/platform/linux/dcpomatic2.spec', version, target)
cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir
if target.distro == 'centos' and target.version == '5':
make_spec('build/platform/linux/dcpomatic2.spec', version, target)
cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir
if target.distro == 'centos' and target.version == '5':
- cmd += ' --buildroot %s/BUILD/%s/BUILDROOT' % (topdir, version)
+ cmd += ' --buildroot %s/BUILD/
dcpomatic-
%s/BUILDROOT' % (topdir, version)
target.command(cmd)
rpms = []
target.command(cmd)
rpms = []
@@
-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')]
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')
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)